XQuartz: Added option for setting quartz-wm click-through preference

(cherry picked from commit bf54c267cba97b2b3b9a621da0575776a388b2cb)
This commit is contained in:
Jeremy Huddleston 2008-02-10 18:27:52 -08:00
parent 8004e160fa
commit 3570ca1cb7
5 changed files with 2374 additions and 2358 deletions

View File

@ -98,5 +98,6 @@ extern int quartzHasRoot, quartzEnableRootless;
#define PREFS_XP_OPTIONS "xp_options" #define PREFS_XP_OPTIONS "xp_options"
#define PREFS_ENABLE_STEREO "enable_stereo" #define PREFS_ENABLE_STEREO "enable_stereo"
#define PREFS_LOGIN_SHELL "login_shell" #define PREFS_LOGIN_SHELL "login_shell"
#define PREFS_QUARTZ_WM_CLICK_THROUGH "wm_click_through"
#endif /* X11APPLICATION_H */ #endif /* X11APPLICATION_H */

View File

@ -37,29 +37,30 @@
@interface X11Controller : NSObject @interface X11Controller : NSObject
{ {
NSPanel *prefs_panel; IBOutlet NSPanel *prefs_panel;
NSButton *fake_buttons; IBOutlet NSButton *fake_buttons;
NSButton *enable_fullscreen; IBOutlet NSButton *enable_fullscreen;
NSButton *use_sysbeep; IBOutlet NSButton *use_sysbeep;
NSButton *enable_keyequivs; IBOutlet NSButton *enable_keyequivs;
NSButton *sync_keymap; IBOutlet NSButton *sync_keymap;
NSButton *enable_auth; IBOutlet NSButton *click_through;
NSButton *enable_tcp; IBOutlet NSButton *enable_auth;
NSPopUpButton *depth; IBOutlet NSButton *enable_tcp;
IBOutlet NSPopUpButton *depth;
NSMenuItem *x11_about_item; IBOutlet NSMenuItem *x11_about_item;
NSMenuItem *window_separator; IBOutlet NSMenuItem *window_separator;
NSMenuItem *dock_window_separator; IBOutlet NSMenuItem *dock_window_separator;
NSMenuItem *apps_separator; IBOutlet NSMenuItem *apps_separator;
NSMenuItem *toggle_fullscreen_item; IBOutlet NSMenuItem *toggle_fullscreen_item;
NSMenu *dock_apps_menu; IBOutlet NSMenu *dock_apps_menu;
NSTableView *apps_table; IBOutlet NSTableView *apps_table;
NSArray *apps; NSArray *apps;
NSMutableArray *table_apps; NSMutableArray *table_apps;
NSMenu *dock_menu; IBOutlet NSMenu *dock_menu;
int checked_window_item; int checked_window_item;
x_list *pending_apps; x_list *pending_apps;
@ -74,6 +75,25 @@
- (void) set_can_quit:(BOOL)state; - (void) set_can_quit:(BOOL)state;
- (void) server_ready; - (void) server_ready;
- (IBAction) apps_table_show:(id)sender;
- (IBAction) apps_table_cancel:(id)sender;
- (IBAction) apps_table_done:(id)sender;
- (IBAction) apps_table_new:(id)sender;
- (IBAction) apps_table_duplicate:(id)sender;
- (IBAction) apps_table_delete:(id)sender;
- (IBAction) bring_to_front:(id)sender;
- (IBAction) close_window:(id)sender;
- (IBAction) minimize_window:(id)sender;
- (IBAction) zoom_window:(id)sender;
- (IBAction) next_window:(id)sender;
- (IBAction) previous_window:(id)sender;
- (IBAction) enable_fullscreen_changed:(id)sender;
- (IBAction) toggle_fullscreen:(id)sender;
- (IBAction) prefs_changed:(id)sender;
- (IBAction) prefs_show:(id)sender;
- (IBAction) quit:(id)sender;
- (IBAction) x11_help:(id)sender;
@end @end
#endif /* __OBJC__ */ #endif /* __OBJC__ */

View File

@ -621,6 +621,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
[NSApp prefs_set_boolean:@PREFS_SYSBEEP value:quartzUseSysBeep]; [NSApp prefs_set_boolean:@PREFS_SYSBEEP value:quartzUseSysBeep];
[NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value:X11EnableKeyEquivalents]; [NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value:X11EnableKeyEquivalents];
[NSApp prefs_set_boolean:@PREFS_SYNC_KEYMAP value:darwinSyncKeymap]; [NSApp prefs_set_boolean:@PREFS_SYNC_KEYMAP value:darwinSyncKeymap];
[NSApp prefs_set_boolean:@PREFS_QUARTZ_WM_CLICK_THROUGH value:[click_through intValue]];
[NSApp prefs_set_boolean:@PREFS_NO_AUTH value:![enable_auth intValue]]; [NSApp prefs_set_boolean:@PREFS_NO_AUTH value:![enable_auth intValue]];
[NSApp prefs_set_boolean:@PREFS_NO_TCP value:![enable_tcp intValue]]; [NSApp prefs_set_boolean:@PREFS_NO_TCP value:![enable_tcp intValue]];
[NSApp prefs_set_integer:@PREFS_DEPTH value:[depth selectedTag]]; [NSApp prefs_set_integer:@PREFS_DEPTH value:[depth selectedTag]];
@ -635,6 +636,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
[enable_keyequivs setIntValue:X11EnableKeyEquivalents]; [enable_keyequivs setIntValue:X11EnableKeyEquivalents];
[sync_keymap setIntValue:darwinSyncKeymap]; [sync_keymap setIntValue:darwinSyncKeymap];
[sync_keymap setEnabled:darwinKeymapFile == NULL]; [sync_keymap setEnabled:darwinKeymapFile == NULL];
[click_through setIntValue:[NSApp prefs_get_boolean:@PREFS_QUARTZ_WM_CLICK_THROUGH default:NO]];
[enable_auth setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_AUTH default:NO]]; [enable_auth setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_AUTH default:NO]];
[enable_tcp setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_TCP default:NO]]; [enable_tcp setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_TCP default:NO]];

File diff suppressed because it is too large Load Diff