fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-25 08:20:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

XQuartz: More sanitization of the namespace

Browse source
This commit is contained in:
Jeremy Huddleston 2008-04-18 20:23:26 -07:00
parent ba074f19ea
commit bc50d41f9d
4 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hw/xquartz/X11Application.h
View file

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

8
hw/xquartz/X11Application.m
View file

@ -37,7 +37,6 @@
#include "quartzForeground.h"
#import "X11Application.h"
#include <Carbon/Carbon.h>
# include "darwin.h"
# include "darwinEvents.h"
@ -45,7 +44,6 @@
# define _APPLEWM_SERVER_
# include "X11/extensions/applewm.h"
# include "micmap.h"
#undef BOOL
#include <mach/mach.h>
#include <unistd.h>
@ -159,7 +157,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
[self orderFrontStandardAboutPanelWithOptions: dict];
}
- (void) activateX:(BOOL)state {
- (void) activateX:(OSX_BOOL)state {
/* Create a TSM document that supports full Unicode input, and
have it activated while X is active (unless using the old
keymapping files) */
@ -193,7 +191,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
- (void) sendEvent:(NSEvent *)e {
NSEventType type;
BOOL for_appkit, for_x;
OSX_BOOL for_appkit, for_x;
type = [e type];
@ -655,7 +653,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
AppleWMCopyToPasteboard);
}
- (BOOL) x_active {
- (OSX_BOOL) x_active {
return _x_active;
}

8
hw/xquartz/X11Controller.h
View file

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

10
hw/xquartz/X11Controller.m
View file

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