~ubuntu-branches/ubuntu/maverick/vice/maverick

« back to all changes in this revision

Viewing changes to src/arch/unix/x11/xaw/x11ui.c

  • Committer: Bazaar Package Importer
  • Author(s): Zed Pobre
  • Date: 2005-02-01 11:30:26 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050201113026-3eyakzsmmheclvjg
Tags: 1.16-1
* New upstream version
* Fixes crash on 64-bit architectures (closes: #287640)
* x128 working again (closes: #286767)
* Works fine with /dev/dsp in use (not in the main changelog, but tested
  on my local machine as working).  Presumably, this also takes care of
  the issue with dsp being held.  I'm not sure if this is because I'm
  testing it on a 2.6 kernel now -- if you are still having problems
  with /dev/dsp, please reopen the bugs. (closes: #152952, #207942)
* Don't kill Makefile.in on clean

Show diffs side-by-side

added added

removed removed

Lines of Context:
76
76
#include "types.h"
77
77
#include "ui.h"
78
78
#include "uicolor.h"
 
79
#include "uifliplist.h"
79
80
#include "uihotkey.h"
80
81
#include "uimenu.h"
81
82
#include "uisettings.h"
151
152
    }
152
153
}
153
154
 
154
 
static void ui_restore_mouse(void)
 
155
void ui_restore_mouse(void)
155
156
{
156
157
#ifdef USE_XF86_EXTENSIONS
157
158
    if (fullscreen_is_enabled)
427
428
    wm_delete_window = XInternAtom(display, "WM_DELETE_WINDOW", False);
428
429
    XtAppAddActions(app_context, actions, XtNumber(actions));
429
430
 
 
431
    ui_common_init();
 
432
 
430
433
    ui_hotkey_init();
431
434
 
432
435
    enabled_drives = UI_DRIVE_ENABLE_NONE;
449
452
    lib_free(filesel_dir);
450
453
 
451
454
    ui_common_shutdown();
 
455
 
 
456
    uimenu_shutdown();
452
457
}
453
458
 
454
459
typedef struct {
1245
1250
 
1246
1251
    /* update drive mapping */
1247
1252
    ui_enable_drive_status(enabled_drives, drive_active_led);
1248
 
    ui_update_flip_menus(drive_number + 8, drive_number + 8);
 
1253
    uifliplist_update_menus(drive_number + 8, drive_number + 8);
1249
1254
}
1250
1255
 
1251
1256
static void ui_display_drive_current_image2 (void)
1305
1310
{
1306
1311
}
1307
1312
 
1308
 
void ui_display_playback(int playback_status)
 
1313
void ui_display_playback(int playback_status, char *version)
1309
1314
{
1310
1315
}
1311
1316
 
1665
1670
                ui_show_text(fs_status.file, contents, 250, 240);
1666
1671
                lib_free(contents);
1667
1672
            } else {
1668
 
                ui_error(_("Unknown image type."));
 
1673
                ui_error(_("Unknown image type"));
1669
1674
            }
1670
1675
        }
1671
1676
    } while ((!fs_status.file_selected && button != UI_BUTTON_CANCEL)
2053
2058
    video_canvas_t *canvas = (video_canvas_t *)client_data;
2054
2059
 
2055
2060
    /*�XVideo must be refreshed when the shell window is moved. */
2056
 
    if (canvas && use_xvideo
 
2061
    if (canvas && canvas->videoconfig->hwscale
2057
2062
        && (canvas->videoconfig->rendermode == VIDEO_RENDER_PAL_1X1
2058
2063
            || canvas->videoconfig->rendermode == VIDEO_RENDER_PAL_2X2))
2059
2064
    {
2070
2075
    }
2071
2076
 
2072
2077
    /* No resize for XVideo. */
2073
 
    if (use_xvideo
 
2078
    if (canvas->videoconfig->hwscale
2074
2079
        && (canvas->videoconfig->rendermode == VIDEO_RENDER_PAL_1X1
2075
2080
            || canvas->videoconfig->rendermode == VIDEO_RENDER_PAL_2X2))
2076
2081
    {