XQuartz: Added option for setting quartz-wm click-through preference
This commit is contained in:
parent
656aaab957
commit
bf54c267cb
|
@ -98,5 +98,6 @@ extern int quartzHasRoot, quartzEnableRootless;
|
|||
#define PREFS_XP_OPTIONS "xp_options"
|
||||
#define PREFS_ENABLE_STEREO "enable_stereo"
|
||||
#define PREFS_LOGIN_SHELL "login_shell"
|
||||
#define PREFS_QUARTZ_WM_CLICK_THROUGH "wm_click_through"
|
||||
|
||||
#endif /* X11APPLICATION_H */
|
||||
|
|
|
@ -37,29 +37,30 @@
|
|||
|
||||
@interface X11Controller : NSObject
|
||||
{
|
||||
NSPanel *prefs_panel;
|
||||
IBOutlet NSPanel *prefs_panel;
|
||||
|
||||
NSButton *fake_buttons;
|
||||
NSButton *enable_fullscreen;
|
||||
NSButton *use_sysbeep;
|
||||
NSButton *enable_keyequivs;
|
||||
NSButton *sync_keymap;
|
||||
NSButton *enable_auth;
|
||||
NSButton *enable_tcp;
|
||||
NSPopUpButton *depth;
|
||||
IBOutlet NSButton *fake_buttons;
|
||||
IBOutlet NSButton *enable_fullscreen;
|
||||
IBOutlet NSButton *use_sysbeep;
|
||||
IBOutlet NSButton *enable_keyequivs;
|
||||
IBOutlet NSButton *sync_keymap;
|
||||
IBOutlet NSButton *click_through;
|
||||
IBOutlet NSButton *enable_auth;
|
||||
IBOutlet NSButton *enable_tcp;
|
||||
IBOutlet NSPopUpButton *depth;
|
||||
|
||||
NSMenuItem *x11_about_item;
|
||||
NSMenuItem *window_separator;
|
||||
NSMenuItem *dock_window_separator;
|
||||
NSMenuItem *apps_separator;
|
||||
NSMenuItem *toggle_fullscreen_item;
|
||||
NSMenu *dock_apps_menu;
|
||||
NSTableView *apps_table;
|
||||
IBOutlet NSMenuItem *x11_about_item;
|
||||
IBOutlet NSMenuItem *window_separator;
|
||||
IBOutlet NSMenuItem *dock_window_separator;
|
||||
IBOutlet NSMenuItem *apps_separator;
|
||||
IBOutlet NSMenuItem *toggle_fullscreen_item;
|
||||
IBOutlet NSMenu *dock_apps_menu;
|
||||
IBOutlet NSTableView *apps_table;
|
||||
|
||||
NSArray *apps;
|
||||
NSMutableArray *table_apps;
|
||||
|
||||
NSMenu *dock_menu;
|
||||
IBOutlet NSMenu *dock_menu;
|
||||
|
||||
int checked_window_item;
|
||||
x_list *pending_apps;
|
||||
|
@ -74,6 +75,25 @@
|
|||
- (void) set_can_quit:(BOOL)state;
|
||||
- (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
|
||||
|
||||
#endif /* __OBJC__ */
|
||||
|
|
|
@ -613,7 +613,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
|
|||
quartzUseSysBeep = [use_sysbeep intValue];
|
||||
X11EnableKeyEquivalents = [enable_keyequivs intValue];
|
||||
darwinSyncKeymap = [sync_keymap intValue];
|
||||
|
||||
|
||||
/* after adding prefs here, also add to [X11Application read_defaults]
|
||||
and below */
|
||||
|
||||
|
@ -621,6 +621,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
|
|||
[NSApp prefs_set_boolean:@PREFS_SYSBEEP value:quartzUseSysBeep];
|
||||
[NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value:X11EnableKeyEquivalents];
|
||||
[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_TCP value:![enable_tcp intValue]];
|
||||
[NSApp prefs_set_integer:@PREFS_DEPTH value:[depth selectedTag]];
|
||||
|
@ -635,6 +636,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
|
|||
[enable_keyequivs setIntValue:X11EnableKeyEquivalents];
|
||||
[sync_keymap setIntValue:darwinSyncKeymap];
|
||||
[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_tcp setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_TCP default:NO]];
|
||||
|
|
4673
hw/xquartz/bundle/English.lproj/main.nib/designable.nib
generated
4673
hw/xquartz/bundle/English.lproj/main.nib/designable.nib
generated
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Loading…
Reference in New Issue
Block a user