Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-22 13:31:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27 from rakslice/prefs_double_fix

Browse Source 
add missing common prefs multiple values; remove duplicate unix platform prefs
This commit is contained in:
kanjitalk755 2020-02-05 08:52:55 +09:00 committed by GitHub
commit c23967b03b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BasiliskII/src/Unix/prefs_unix.cpp
View File

@ -31,11 +31,7 @@ using std::string;
// Platform-specific preferences items // Platform-specific preferences items
prefs_desc platform_prefs_items[] = { prefs_desc platform_prefs_items[] = {
{"keycodes", TYPE_BOOLEAN, false, "use keycodes rather than keysyms to decode keyboard"},
{"keycodefile", TYPE_STRING, false, "path of keycode translation file"},
{"fbdevicefile", TYPE_STRING, false, "path of frame buffer device specification file"}, {"fbdevicefile", TYPE_STRING, false, "path of frame buffer device specification file"},
{"mousewheelmode", TYPE_INT32, false, "mouse wheel support mode (0=page up/down, 1=cursor up/down)"},
{"mousewheellines", TYPE_INT32, false, "number of lines to scroll in mouse wheel mode 1"},
{"dsp", TYPE_STRING, false, "audio output (dsp) device name"}, {"dsp", TYPE_STRING, false, "audio output (dsp) device name"},
{"mixer", TYPE_STRING, false, "audio mixer device name"}, {"mixer", TYPE_STRING, false, "audio mixer device name"},
#ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION #ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION

8
BasiliskII/src/prefs_items.cpp
View File

@ -68,10 +68,10 @@ prefs_desc common_prefs_items[] = {
{"jitinline", TYPE_BOOLEAN, false, "enable translation through constant jumps"}, {"jitinline", TYPE_BOOLEAN, false, "enable translation through constant jumps"},
{"jitblacklist", TYPE_STRING, false, "blacklist opcodes from translation"}, {"jitblacklist", TYPE_STRING, false, "blacklist opcodes from translation"},
{"keyboardtype", TYPE_INT32, false, "hardware keyboard type"}, {"keyboardtype", TYPE_INT32, false, "hardware keyboard type"},
{"keycodes",TYPE_BOOLEAN,false,"use raw keycode"}, {"keycodes", TYPE_BOOLEAN, false, "use keycodes rather than keysyms to decode keyboard"},
{"keycodefile",TYPE_STRING,"Keycode file"}, {"keycodefile", TYPE_STRING, false, "path of keycode translation file"},
{"mousewheelmode",TYPE_BOOLEAN,"Use WheelMode"}, {"mousewheelmode", TYPE_INT32, false, "mouse wheel support (0=page up/down, 1=cursor up/down)"},
{"mousewheellines",TYPE_INT32,"wheel line nb"}, {"mousewheellines", TYPE_INT32, false, "number of lines to scroll in mouse wheel mode 1"},
{"hotkey",TYPE_INT32,false,"hotkey modifier"}, {"hotkey",TYPE_INT32,false,"hotkey modifier"},
{"scale_nearest",TYPE_BOOLEAN,false,"nearest neighbor scaling"}, {"scale_nearest",TYPE_BOOLEAN,false,"nearest neighbor scaling"},
{"scale_integer",TYPE_BOOLEAN,false,"integer scaling"}, {"scale_integer",TYPE_BOOLEAN,false,"integer scaling"},