andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add image/jpeg type, and rename reclaim_clipboard to claim_clipboard.

Browse Source
This commit is contained in:
George Peter Staplin 2008-09-15 13:27:08 -06:00
parent 21a2d0b8d0
commit 32b175ef62
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/xquartz/pbproxy/main.m
View File

@ -20,7 +20,8 @@ struct atom_list *atoms = &atom_list_inst;
static int x_grab_count; static int x_grab_count;
static Bool x_grab_synced; static Bool x_grab_synced;
static BOOL _is_active = YES; /* FIXME: should query server */ /*GPS why? Is there a race?*/ static BOOL _is_active = YES; /* FIXME: should query server */
/*gstaplin: why? Is there a race?*/
static x_selection *_selection_object; static x_selection *_selection_object;
@ -72,6 +73,7 @@ static void x_init (void) {
atoms->multiple = XInternAtom (x_dpy, "MULTIPLE", False); atoms->multiple = XInternAtom (x_dpy, "MULTIPLE", False);
atoms->cstring = XInternAtom (x_dpy, "CSTRING", False); atoms->cstring = XInternAtom (x_dpy, "CSTRING", False);
atoms->image_png = XInternAtom (x_dpy, "image/png", False); atoms->image_png = XInternAtom (x_dpy, "image/png", False);
atoms->image_jpeg = XInternAtom (x_dpy, "image/jpeg", False);
atoms->incr = XInternAtom (x_dpy, "INCR", False); atoms->incr = XInternAtom (x_dpy, "INCR", False);
atoms->atom = XInternAtom (x_dpy, "ATOM", False); atoms->atom = XInternAtom (x_dpy, "ATOM", False);
atoms->clipboard_manager = XInternAtom (x_dpy, "CLIPBOARD_MANAGER", False); atoms->clipboard_manager = XInternAtom (x_dpy, "CLIPBOARD_MANAGER", False);
@ -91,20 +93,19 @@ static void x_init (void) {
x_input_run (); x_input_run ();
[_selection_object set_clipboard_manager]; [_selection_object set_clipboard_manager];
[_selection_object reclaim_clipboard]; [_selection_object claim_clipboard];
} }
static void x_shutdown (void) { static void x_shutdown (void) {
/*GPS: signal_handler() calls this, and I don't think these are async-signal safe. */ /*gstaplin: signal_handler() calls this, and I don't think these are async-signal safe. */
/*TODO use a socketpair() to trigger a cleanup. This is totally unsafe according to Jordan. */ /*TODO use a socketpair() to trigger a cleanup. This is totally unsafe according to Jordan. It's a segfault waiting to happen on a signal*/
[_selection_object release]; [_selection_object release];
_selection_object = nil; _selection_object = nil;
XCloseDisplay (x_dpy); XCloseDisplay (x_dpy);
x_dpy = NULL; x_dpy = NULL;
exit(0); //GPS this is almost certainly unsafe (sigaction(2) doesn't list it). exit(0);
} }
static void x_error_shutdown (void) { static void x_error_shutdown (void) {