← Back to branch summary

~ubuntu-branches/ubuntu/hardy/vice/hardy

« back to all changes in this revision

Viewing changes to src/arch/riscos/cbm2ui.c

  • Committer: Bazaar Package Importer
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2007-10-07 07:05:46 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20071007070546-81yy0twlka7p2t0e
Tags: 1.22-1
http://bugs.debian.org/428280
http://bugs.debian.org/409567
* New upstream version (closes: #428280).
* Correct link to HTML documentation in manpage (closes: #409567).
* Fix most packaging mistakes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/arch/riscos/cbm2ui.c
148
148
 
149
149
static const char *cbm2_get_keyboard_name(void)
150
150
{
151
 
  resource_value_t val;
152
151
  int idx;
153
152
 
154
 
  if (resources_get_value("KeymapIndex", (void *)&val) != 0) val = 0;
155
 
  idx = (int)val;
 
153
  if (resources_get_int("KeymapIndex", &idx) != 0) idx = 0;
156
154
  if ((idx & 2) == 0) return CBM2keyBusinessName;
157
155
  return CBM2keyGraphicName;
158
156
}
159
157
 
160
 
static int set_cbm2_model_by_name(const char *name, resource_value_t val)
 
158
static int set_cbm2_model_by_name(const char *name, const char *val)
161
159
{
162
 
  util_string_set(&CBM2ModelName, (char*)val);
 
160
  util_string_set(&CBM2ModelName, val);
163
161
  return cbm2_set_model(CBM2ModelName, NULL);
164
162
}
165
163
 
177
175
{
178
176
  if (wnum == CONF_MENU_C2MODEL)
179
177
  {
180
 
    ui_set_menu_display_core(ConfigMenus[CONF_MENU_C2MODEL].desc, set_cbm2_model_by_name, block[0]);
 
178
    ui_set_menu_display_core_string(ConfigMenus[CONF_MENU_C2MODEL].desc, set_cbm2_model_by_name, block[0]);
181
179
    ui_setup_menu_display(ConfigMenus[CONF_MENU_C2MEM].desc);
182
180
    ui_setup_menu_display(ConfigMenus[CONF_MENU_C2RAM].desc);
183
181
    ui_setup_menu_display(ConfigMenus[CONF_MENU_C2LINE].desc);
194
192
  {
195
193
    if (block[KeyPB_Icon] == Icon_ConfCBM_CBM2CartF)
196
194
    {
197
 
      ui_update_menu_disp_strshow(ConfigMenus[CONF_MENU_C2CART].desc, (resource_value_t)data);
 
195
      ui_update_menu_disp_strshow(ConfigMenus[CONF_MENU_C2CART].desc, data);
198
196
      return 0;
199
197
    }
200
198
  }
208
206
    if (block[6] == Icon_ConfCBM_CBM2CartF)
209
207
    {
210
208
      const char *name = ((const char*)block) + 44;
211
 
      ui_update_menu_disp_strshow(ConfigMenus[CONF_MENU_C2CART].desc, (resource_value_t)name);
 
209
      ui_update_menu_disp_strshow(ConfigMenus[CONF_MENU_C2CART].desc, name);
212
210
      return 0;
213
211
    }
214
212
  }