frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: More sanitization of the namespace 

(cherry picked from commit bc50d41f9d1aec04f0de0478cbd5036f1fe9b81e)
This commit is contained in:
Jeremy Huddleston 2008-04-18 20:25:38 -07:00
parent c2f0d020b5
commit 49f2bb4681
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xquartz/X11Application.h
View File

@ -31,7 +31,7 @@
#define X11APPLICATION_H 1 #define X11APPLICATION_H 1
#if __OBJC__ #if __OBJC__
#import <Cocoa/Cocoa.h>
#import "X11Controller.h" #import "X11Controller.h"
@interface X11Application : NSApplication { @interface X11Application : NSApplication {
@ -55,7 +55,7 @@
- (void) prefs_set_string:(NSString *)key value:(NSString *)value; - (void) prefs_set_string:(NSString *)key value:(NSString *)value;
- (void) prefs_synchronize; - (void) prefs_synchronize;
- (BOOL) x_active; - (OSX_BOOL) x_active;
@end @end

10
hw/xquartz/X11Application.m
View File

@ -43,6 +43,10 @@
# define _APPLEWM_SERVER_ # define _APPLEWM_SERVER_
# include "X11/extensions/applewm.h" # include "X11/extensions/applewm.h"
# include "micmap.h" # include "micmap.h"
<<<<<<< HEAD:hw/xquartz/X11Application.m
=======
>>>>>>> bc50d41... XQuartz: More sanitization of the namespace:hw/xquartz/X11Application.m
#include <mach/mach.h> #include <mach/mach.h>
#include <unistd.h> #include <unistd.h>
#include <pthread.h> #include <pthread.h>
@ -151,7 +155,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
[self orderFrontStandardAboutPanelWithOptions: dict]; [self orderFrontStandardAboutPanelWithOptions: dict];
} }
- (void) activateX:(BOOL)state { - (void) activateX:(OSX_BOOL)state {
/* Create a TSM document that supports full Unicode input, and /* Create a TSM document that supports full Unicode input, and
have it activated while X is active (unless using the old have it activated while X is active (unless using the old
keymapping files) */ keymapping files) */
@ -185,7 +189,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
- (void) sendEvent:(NSEvent *)e { - (void) sendEvent:(NSEvent *)e {
NSEventType type; NSEventType type;
BOOL for_appkit, for_x; OSX_BOOL for_appkit, for_x;
type = [e type]; type = [e type];
@ -644,7 +648,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
AppleWMCopyToPasteboard); AppleWMCopyToPasteboard);
} }
- (BOOL) x_active { - (OSX_BOOL) x_active {
return _x_active; return _x_active;
} }

8
hw/xquartz/X11Controller.h
View File

@ -32,7 +32,7 @@
#if __OBJC__ #if __OBJC__
#import <Cocoa/Cocoa.h> #include "sanitizedCocoa.h"
#include "xpr/x-list.h" #include "xpr/x-list.h"
@interface X11Controller : NSObject @interface X11Controller : NSObject
@ -67,14 +67,14 @@
int checked_window_item; int checked_window_item;
x_list *pending_apps; x_list *pending_apps;
BOOL finished_launching; OSX_BOOL finished_launching;
BOOL can_quit; OSX_BOOL can_quit;
} }
- (void) set_window_menu:(NSArray *)list; - (void) set_window_menu:(NSArray *)list;
- (void) set_window_menu_check:(NSNumber *)n; - (void) set_window_menu_check:(NSNumber *)n;
- (void) set_apps_menu:(NSArray *)list; - (void) set_apps_menu:(NSArray *)list;
- (void) set_can_quit:(BOOL)state; - (void) set_can_quit:(OSX_BOOL)state;
- (void) server_ready; - (void) server_ready;
- (IBAction) apps_table_show:(id)sender; - (IBAction) apps_table_show:(id)sender;

10
hw/xquartz/X11Controller.m
View File

@ -600,7 +600,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
#endif #endif
} }
- (void) set_can_quit:(BOOL)state - (void) set_can_quit:(OSX_BOOL)state
{ {
can_quit = state; can_quit = state;
} }
@ -667,7 +667,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
AHLookupAnchor ((CFStringRef)NSLocalizedString(@"Mac Help", no comment), CFSTR ("mchlp2276")); AHLookupAnchor ((CFStringRef)NSLocalizedString(@"Mac Help", no comment), CFSTR ("mchlp2276"));
} }
- (BOOL) validateMenuItem:(NSMenuItem *)item - (OSX_BOOL) validateMenuItem:(NSMenuItem *)item
{ {
NSMenu *menu = [item menu]; NSMenu *menu = [item menu];
@ -739,7 +739,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
pending_apps = NULL; pending_apps = NULL;
} }
- (BOOL) application:(NSApplication *)app openFile:(NSString *)filename - (OSX_BOOL) application:(NSApplication *)app openFile:(NSString *)filename
{ {
const char *name = [filename UTF8String]; const char *name = [filename UTF8String];
@ -752,8 +752,8 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
return YES; return YES;
} }
- (BOOL) applicationShouldHandleReopen:(NSApplication *)app - (OSX_BOOL) applicationShouldHandleReopen:(NSApplication *)app
hasVisibleWindows:(BOOL)hasVis { hasVisibleWindows:(OSX_BOOL)hasVis {
DarwinSendDDXEvent(kXquartzBringAllToFront, 0); DarwinSendDDXEvent(kXquartzBringAllToFront, 0);
return YES; return YES;
} }