Previous 15994 Revisions Next

r2745 Sunday 25th May, 2008 at 12:25:18 UTC by Nathan Woods
[Windows] Proper fixes to regressions introduced in 0.125u2
[src/mess/osd/windows]dialog.c dialog.h menu.c

src/mess/osd/windows/dialog.c
r2744r2745
9797struct _seqselect_info
9898{
9999   WNDPROC oldwndproc;
100   input_seq *code;      // pointer to the input_seq
101   input_seq newcode;      // the new input_seq; committed to *code when we are done
100   const input_field_config *field;      // pointer to the field
101   input_field_user_settings settings;      // the new settings
102   input_seq *code;                  // the input_seq within settings
102103   WORD pos;
103104   BOOL is_analog;
104105   seqselect_state poll_state;
r2744r2745
10691070
10701071   // retrieve the seq name
10711072   seqstring = astring_alloc();
1072   input_seq_name(seqstring, &stuff->newcode);
1073   input_seq_name(seqstring, stuff->code);
10731074
10741075   // change the text - avoid calls to SetWindowText() if we can
10751076   win_get_window_text_utf8(editwnd, buffer, ARRAY_LENGTH(buffer));
r2744r2745
11351136   while(stuff->poll_state == SEQSELECT_STATE_POLLING)
11361137   {
11371138      // poll
1138      ret = input_seq_poll(&stuff->newcode);
1139      ret = input_seq_poll(stuff->code);
11391140      seqselect_settext(editwnd);
11401141   }
11411142
r2744r2745
12381239   seqselect_info *stuff = (seqselect_info *) lparam;
12391240   LONG_PTR lp;
12401241
1241   memcpy(&stuff->newcode, stuff->code, sizeof(stuff->newcode));
12421242   lp = SetWindowLongPtr(editwnd, GWLP_WNDPROC, (LONG_PTR) seqselect_wndproc);
12431243   stuff->oldwndproc = (WNDPROC) lp;
12441244   SetWindowLongPtr(editwnd, GWLP_USERDATA, lparam);
r2744r2745
12561256{
12571257   seqselect_info *stuff;
12581258   stuff = get_seqselect_info(editwnd);
1259   memcpy(stuff->code, &stuff->newcode, sizeof(*(stuff->code)));
1260   return 0;
1261}
12621259
1263//============================================================
1264//   input_port_mutable_seq
1265//============================================================
1260   // store the settings
1261   input_field_set_user_settings(stuff->field, &stuff->settings);
12661262
1267static input_seq *input_port_mutable_seq(input_field_config *field, int seqtype)
1268{
1269   input_seq *portseq;
1270
1271   // if field is disabled, return no key
1272   if (field->flags & FIELD_FLAG_UNUSED)
1273      return NULL;
1274
1275   // handle the various seq types
1276   portseq = &field->seq[seqtype];
1277
1278   // does this override the default? if not, find the default setting
1279   if (input_seq_get_1(portseq) == SEQCODE_DEFAULT)
1280   {
1281      const input_seq *default_portseq;
1282      default_portseq = input_type_seq(field->port->machine, field->type, field->player, seqtype);
1283      *portseq = *default_portseq;
1284   }
1285   return portseq;
1263   return 0;
12861264}
12871265
12881266//============================================================
r2744r2745
12901268//============================================================
12911269
12921270static int dialog_add_single_seqselect(struct _dialog_box *di, short x, short y,
1293   short cx, short cy, input_field_config *field, int is_analog, int seq)
1271   short cx, short cy, const input_field_config *field, int is_analog, int seq)
12941272{
12951273   seqselect_info *stuff;
1296   input_seq *code;
12971274
1298   code = input_port_mutable_seq(field, seq);
1299
1275   // write the dialog item
13001276   if (dialog_write_item(di, WS_CHILD | WS_VISIBLE | SS_ENDELLIPSIS | ES_CENTER | SS_SUNKEN,
13011277         x, y, cx, cy, NULL, DLGITEM_EDIT, NULL))
13021278      return 1;
1279
1280   // allocate a seqselect_info
13031281   stuff = (seqselect_info *) pool_malloc(di->mempool, sizeof(seqselect_info));
13041282   if (!stuff)
13051283      return 1;
1284
1285   // initialize the structure
13061286   memset(stuff, 0, sizeof(*stuff));
1307   stuff->code = code;
1287   input_field_get_user_settings(field, &stuff->settings);
1288   stuff->field = field;
13081289   stuff->pos = di->item_count;
13091290   stuff->is_analog = is_analog;
1291   stuff->code = &stuff->settings.seq[seq];
1292
13101293   if (dialog_add_trigger(di, di->item_count, TRIGGER_INITDIALOG, 0, seqselect_setup, di->item_count, (LPARAM) stuff, NULL, NULL))
13111294      return 1;
13121295   if (dialog_add_trigger(di, di->item_count, TRIGGER_APPLY, 0, seqselect_apply, 0, 0, NULL, NULL))
r2744r2745
13201303//   win_dialog_add_seqselect
13211304//============================================================
13221305
1323int win_dialog_add_portselect(dialog_box *dialog, input_field_config *field, const RECT *r)
1306int win_dialog_add_portselect(dialog_box *dialog, const input_field_config *field, const RECT *r)
13241307{
13251308   dialog_box *di = dialog;
13261309   short x;
src/mess/osd/windows/menu.c
r2744r2745
135135
136136   struct
137137   {
138      input_field_config *field;
138      const input_field_config *field;
139139      const RECT *pr;
140140   } portslots[256];
141141
r2744r2745
198198                  i = portslot_count++;
199199               if (i < (sizeof(portslots) / sizeof(portslots[0])))
200200               {
201                  portslots[i].field = (input_field_config *) field;
201                  portslots[i].field = field;
202202                  portslots[i].pr = pr;
203203               }
204204            }
r2744r2745
283283
284284static void storeval_inputport(void *param, int val)
285285{
286   input_field_config *field = (input_field_config *) param;
287   field->defvalue = (UINT16) val;
286   const input_field_config *field = (input_field_config *) param;
287   input_field_user_settings settings;
288
289   input_field_get_user_settings(field, &settings);
290   settings.value = (UINT16) val;
291   input_field_set_user_settings(field, &settings);
288292}
289293
290294
r2744r2745
315319         if (type == ipt_name)
316320         {
317321            switch_name = input_field_name(field);
318            if (win_dialog_add_combobox(dlg, switch_name, field->defvalue, storeval_inputport, (input_field_config *) field))
322            if (win_dialog_add_combobox(dlg, switch_name, field->defvalue, storeval_inputport, (void *) field))
319323               goto done;
320324
321325            for (setting = field->settinglist; setting != NULL; setting = setting->next)
r2744r2745
454458
455459            _snprintf(buf, sizeof(buf) / sizeof(buf[0]),
456460               "%s %s", name, ui_getstring(UI_keyjoyspeed));
457            if (win_dialog_add_adjuster(dlg, buf, settings.delta, 1, 255, FALSE, store_delta, (input_field_config *) field))
461            if (win_dialog_add_adjuster(dlg, buf, settings.delta, 1, 255, FALSE, store_delta, (void *) field))
458462               goto done;
459463
460464            _snprintf(buf, sizeof(buf) / sizeof(buf[0]),
461465               "%s %s", name, ui_getstring(UI_centerspeed));
462            if (win_dialog_add_adjuster(dlg, buf, settings.centerdelta, 1, 255, FALSE, store_centerdelta, (input_field_config *) field))
466            if (win_dialog_add_adjuster(dlg, buf, settings.centerdelta, 1, 255, FALSE, store_centerdelta, (void *) field))
463467               goto done;
464468
465469            _snprintf(buf, sizeof(buf) / sizeof(buf[0]),
466470               "%s %s", name, ui_getstring(UI_reverse));
467            if (win_dialog_add_combobox(dlg, buf, settings.reverse ? 1 : 0, store_reverse, (input_field_config *) field))
471            if (win_dialog_add_combobox(dlg, buf, settings.reverse ? 1 : 0, store_reverse, (void *) field))
468472               goto done;
469473            if (win_dialog_add_combobox_item(dlg, ui_getstring(UI_off), 0))
470474               goto done;
r2744r2745
473477
474478            _snprintf(buf, sizeof(buf) / sizeof(buf[0]),
475479               "%s %s", name, ui_getstring(UI_sensitivity));
476            if (win_dialog_add_adjuster(dlg, buf, settings.sensitivity, 1, 255, TRUE, store_sensitivity, (input_field_config *) field))
480            if (win_dialog_add_adjuster(dlg, buf, settings.sensitivity, 1, 255, TRUE, store_sensitivity, (void *) field))
477481               goto done;
478482         }
479483      }
src/mess/osd/windows/dialog.h
r2744r2745
5757   int min_value, int max_value,
5858   dialog_itemstoreval storeval, void *storeval_param);
5959
60int win_dialog_add_portselect(dialog_box *dialog, input_field_config *field, const RECT *r);
60int win_dialog_add_portselect(dialog_box *dialog, const input_field_config *field, const RECT *r);
6161
6262int win_dialog_add_standard_buttons(dialog_box *dialog);
6363int win_dialog_add_image(dialog_box *dialog, const png_info *png);

Previous 15994 Revisions Next


© 1998-2018 The MESS Team