← Back to branch summary

~ubuntu-branches/debian/sid/mame/sid

« back to all changes in this revision

Viewing changes to src/osd/windows/input.c

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach, Emmanuel Kasper, Jordi Mallach
  • Date: 2012-06-05 20:02:23 UTC
  • mfrom: (0.3.1) (0.1.4)
  • Revision ID: package-import@ubuntu.com-20120605200223-gnlpogjrg6oqe9md
Tags: 0.146-1
[ Emmanuel Kasper ]
* New upstream release
* Drop patch to fix man pages section and patches to link with flac 
  and jpeg system lib: all this has been pushed upstream by Cesare Falco
* Add DM-Upload-Allowed: yes field.

[ Jordi Mallach ]
* Create a "gnu" TARGETOS stanza that defines NO_AFFINITY_NP.
* Stop setting TARGETOS to "unix" in d/rules. It should be autodetected,
  and set to the appropriate value.
* mame_manpage_section.patch: Change mame's manpage section to 6 (games),
  in the TH declaration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/osd/windows/input.c
767
767
 
768
768
        // loop over the defaults
769
769
        for (entry = typelist.first(); entry != NULL; entry = entry->next())
770
 
                switch (entry->type)
 
770
                switch (entry->type())
771
771
                {
772
772
                        // disable the config menu if the ALT key is down
773
773
                        // (allows ALT-TAB to switch between windows apps)
774
774
                        case IPT_UI_CONFIGURE:
775
 
                                entry->defseq[SEQ_TYPE_STANDARD].set(KEYCODE_TAB, input_seq::not_code, KEYCODE_LALT, input_seq::not_code, KEYCODE_RALT);
 
775
                                entry->defseq(SEQ_TYPE_STANDARD).set(KEYCODE_TAB, input_seq::not_code, KEYCODE_LALT, input_seq::not_code, KEYCODE_RALT);
776
776
                                break;
777
777
 
778
778
                        // alt-enter for fullscreen
779
779
                        case IPT_OSD_1:
780
 
                                entry->token = "TOGGLE_FULLSCREEN";
781
 
                                entry->name = "Toggle Fullscreen";
782
 
                                entry->defseq[SEQ_TYPE_STANDARD].set(KEYCODE_LALT, KEYCODE_ENTER);
 
780
                                entry->configure_osd("TOGGLE_FULLSCREEN", "Toggle Fullscreen");
 
781
                                entry->defseq(SEQ_TYPE_STANDARD).set(KEYCODE_LALT, KEYCODE_ENTER);
783
782
                                break;
784
783
 
785
784
                        // alt-F12 for fullscreen snap
786
785
                        case IPT_OSD_2:
787
 
                                entry->token = "RENDER_SNAP";
788
 
                                entry->name = "Take Rendered Snapshot";
789
 
                                entry->defseq[SEQ_TYPE_STANDARD].set(KEYCODE_LALT, KEYCODE_F12);
 
786
                                entry->configure_osd("RENDER_SNAP", "Take Rendered Snapshot");
 
787
                                entry->defseq(SEQ_TYPE_STANDARD).set(KEYCODE_LALT, KEYCODE_F12);
790
788
                                break;
791
789
 
792
790
                        // alt-F11 for fullscreen video
793
791
                        case IPT_OSD_3:
794
 
                                entry->token = "RENDER_AVI";
795
 
                                entry->name = "Record Rendered Video";
796
 
                                entry->defseq[SEQ_TYPE_STANDARD].set(KEYCODE_LALT, KEYCODE_F11);
 
792
                                entry->configure_osd("RENDER_AVI", "Record Rendered Video");
 
793
                                entry->defseq(SEQ_TYPE_STANDARD).set(KEYCODE_LALT, KEYCODE_F11);
 
794
                                break;
 
795
 
 
796
                        // leave everything else alone
 
797
                        default:
797
798
                                break;
798
799
                }
799
800
}
1507
1508
 
1508
1509
static BOOL CALLBACK dinput_joystick_enum(LPCDIDEVICEINSTANCE instance, LPVOID ref)
1509
1510
{
1510
 
        DWORD cooperative_level = DISCL_FOREGROUND | DISCL_EXCLUSIVE;
 
1511
        DWORD cooperative_level = DISCL_FOREGROUND | DISCL_NONEXCLUSIVE;
1511
1512
        int axisnum, axiscount, povnum, butnum;
1512
1513
        running_machine &machine = *(running_machine *)ref;
1513
1514
        device_info *devinfo;
1514
1515
        HRESULT result;
1515
1516
 
1516
1517
        if (win_window_list != NULL && win_has_menu(win_window_list)) {
1517
 
                cooperative_level = DISCL_BACKGROUND | DISCL_EXCLUSIVE;
 
1518
                cooperative_level = DISCL_BACKGROUND | DISCL_NONEXCLUSIVE;
1518
1519
        }
1519
1520
        // allocate and link in a new device
1520
1521
        devinfo = dinput_device_create(machine, &joystick_list, instance, &c_dfDIJoystick, NULL, cooperative_level);