5324557c7b
XQuartz: Source formatting cleanup
...
indent butchered Objective-C formatting. This patch was created by:
1) Reverting the indent changes in hw/xquartz
2) Editing X11Application.m and chaning some #ifdef logic to work
with uncrustify
3) Hand edited some (c) notifications
4) Opened all XQuartz sources in XCode and re-indented (^I)
5) Ran uncrustify with this configuration
(as close to the indent rules as I could get):
tok_split_gte=false
utf8_byte=true
utf8_force=true
indent_cmt_with_tabs=false
indent_align_string=false
indent_braces=false
indent_braces_no_func=false
indent_braces_no_class=false
indent_braces_no_struct=false
indent_brace_parent=false
indent_namespace=false
indent_extern=false
indent_class=false
indent_class_colon=false
indent_else_if=false
indent_var_def_cont=false
indent_func_call_param=false
indent_func_def_param=false
indent_func_proto_param=false
indent_func_class_param=false
indent_func_ctor_var_param=false
indent_template_param=false
indent_func_param_double=false
indent_relative_single_line_comments=false
indent_col1_comment=false
indent_access_spec_body=false
indent_paren_nl=false
indent_comma_paren=false
indent_bool_paren=false
indent_first_bool_expr=false
indent_square_nl=false
indent_preserve_sql=false
indent_align_assign=true
sp_balance_nested_parens=false
align_keep_tabs=false
align_with_tabs=false
align_on_tabstop=false
align_number_left=false
align_func_params=false
align_same_func_call_params=false
align_var_def_colon=true
align_var_def_attribute=true
align_var_def_inline=true
align_right_cmt_mix=false
align_on_operator=false
align_mix_var_proto=false
align_single_line_func=false
align_single_line_brace=false
align_nl_cont=false
align_left_shift=true
align_oc_decl_colon=true
nl_collapse_empty_body=true
nl_assign_leave_one_liners=true
nl_class_leave_one_liners=true
nl_enum_leave_one_liners=true
nl_getset_leave_one_liners=true
nl_func_leave_one_liners=true
nl_if_leave_one_liners=true
nl_multi_line_cond=false
nl_multi_line_define=false
nl_before_case=true
nl_after_case=true
nl_after_return=false
nl_after_semicolon=true
nl_after_brace_open=true
nl_after_brace_open_cmt=false
nl_after_vbrace_open=false
nl_after_vbrace_open_empty=false
nl_after_brace_close=false
nl_after_vbrace_close=false
nl_define_macro=false
nl_squeeze_ifdef=false
nl_ds_struct_enum_cmt=false
nl_ds_struct_enum_close_brace=false
nl_create_if_one_liner=false
nl_create_for_one_liner=false
nl_create_while_one_liner=false
ls_for_split_full=false
ls_func_split_full=false
nl_after_multiline_comment=false
eat_blanks_after_open_brace=false
eat_blanks_before_close_brace=false
mod_full_brace_if_chain=false
mod_pawn_semicolon=false
mod_full_paren_if_bool=false
mod_remove_extra_semicolon=false
mod_sort_import=false
mod_sort_using=false
mod_sort_include=false
mod_move_case_break=false
mod_remove_empty_return=false
cmt_indent_multi=true
cmt_c_group=false
cmt_c_nl_start=false
cmt_c_nl_end=false
cmt_cpp_group=false
cmt_cpp_nl_start=false
cmt_cpp_nl_end=false
cmt_cpp_to_c=false
cmt_star_cont=false
cmt_multi_check_last=true
cmt_insert_before_preproc=false
pp_indent_at_level=false
pp_region_indent_code=false
pp_if_indent_code=false
pp_define_at_level=false
indent_columns=4
indent_brace=0
indent_switch_case=0
align_struct_init_span=2
align_pp_define_gap=0
align_pp_define_span=2
align_oc_msg_colon_span=16
nl_end_of_file_min=1
nl_func_var_def_blk=0
code_width=78
nl_max=2
newlines=auto
indent_with_tabs=0
sp_arith=force
sp_assign=force
sp_assign_default=force
sp_before_assign=force
sp_after_assign=force
sp_enum_assign=force
sp_enum_before_assign=force
sp_enum_after_assign=force
sp_pp_stringify=add
sp_bool=force
sp_compare=force
sp_inside_paren=remove
sp_paren_paren=remove
sp_paren_brace=force
sp_before_ptr_star=ignore
sp_before_unnamed_ptr_star=force
sp_before_byref=force
sp_before_unnamed_byref=force
sp_after_byref=remove
sp_after_type=force
sp_before_sparen=force
sp_inside_sparen=remove
sp_inside_sparen_close=remove
sp_after_sparen=force
sp_sparen_brace=force
sp_special_semi=force
sp_before_semi=remove
sp_after_semi=force
sp_after_semi_for=force
sp_after_semi_for_empty=remove
sp_before_square=remove
sp_inside_square=remove
sp_after_comma=force
sp_before_comma=remove
sp_paren_comma=force
sp_before_ellipsis=force
sp_after_class_colon=force
sp_before_class_colon=force
sp_before_case_colon=remove
sp_after_cast=remove
sp_inside_paren_cast=remove
sp_sizeof_paren=remove
sp_inside_braces_enum=force
sp_inside_braces_struct=force
sp_inside_braces=force
sp_inside_braces_empty=remove
sp_func_proto_paren=remove
sp_func_def_paren=remove
sp_inside_fparens=remove
sp_inside_fparen=remove
sp_square_fparen=remove
sp_fparen_brace=force
sp_func_call_paren=remove
sp_func_call_paren_empty=remove
sp_return_paren=force
sp_attribute_paren=remove
sp_defined_paren=remove
sp_macro=force
sp_macro_func=force
sp_else_brace=force
sp_brace_else=force
sp_brace_typedef=force
sp_not=remove
sp_inv=remove
nl_start_of_file=remove
nl_end_of_file=force
nl_assign_square=remove
nl_after_square_assign=remove
nl_fcall_brace=remove
nl_enum_brace=remove
nl_struct_brace=remove
nl_union_brace=remove
nl_if_brace=remove
nl_brace_else=force
nl_elseif_brace=remove
nl_else_brace=remove
nl_else_if=remove
nl_for_brace=remove
nl_do_brace=remove
nl_brace_while=remove
nl_switch_brace=remove
nl_case_colon_brace=force
nl_func_type_name=force
nl_func_type_name_class=force
nl_func_proto_type_name=force
nl_func_paren=remove
nl_func_def_paren=remove
nl_func_decl_start=remove
nl_func_def_start=remove
nl_func_decl_args=remove
nl_func_decl_end=remove
nl_func_def_end=remove
nl_func_decl_end_single=remove
nl_func_def_end_single=remove
nl_func_decl_empty=remove
nl_func_def_empty=remove
nl_fdef_brace=force
nl_return_expr=remove
nl_before_if=ignore
nl_after_if=ignore
nl_before_for=ignore
nl_after_for=ignore
nl_before_while=ignore
nl_after_while=ignore
nl_before_switch=ignore
nl_after_switch=ignore
nl_before_do=ignore
nl_after_do=ignore
pp_space=remove
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-24 01:07:06 -07:00
9838b7032e
Introduce a consistent coding style
...
This is strictly the application of the script 'x-indent-all.sh'
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:
-bap
-psl
-T PrivatePtr
-T pmWait
-T _XFUNCPROTOBEGIN
-T _XFUNCPROTOEND
-T _X_EXPORT
The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
sdksyms.sh generates incorrect output.
The generated code was compared with the previous version and found to
be essentially identical -- "assert" line numbers and BUILD_TIME were
the only differences found.
The comparison was done with this script:
dir1=$1
dir2=$2
for dir in $dir1 $dir2; do
(cd $dir && find . -name '*.o' | while read file; do
dir=`dirname $file`
base=`basename $file .o`
dump=$dir/$base.dump
objdump -d $file > $dump
done)
done
find $dir1 -name '*.dump' | while read dump; do
otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
diff -u $dump $otherdump
done
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-03-21 13:54:42 -07:00
fae7ed62ad
XQuartz: pbproxy: Add missing AM_OBJCFLAGS
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-04 21:40:41 -07:00
48b4b778f6
XQuartz: xpbproxy: Correct NSUInteger format strings
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-01 21:57:52 -07:00
971193b275
XQuartz: ASL: Use xpbproxy subsystem for logging xpbproxy messages
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-01 21:57:52 -07:00
25191648b8
XQuartz: Don't call mieqEnqueue during server shutdown
...
Found-by: GuardMalloc
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-14 19:15:27 -07:00
6f29dbf5e3
XQuartz: Use ErrorF rather than fprintf to log errors
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-25 22:00:41 -07:00
72ed7551f4
XQuartz: pbproxy: LP64: Fix itteration through XGetWindowProperty where sizeof(long) != 4
...
http://xquartz.macosforge.org/trac/ticket/476
Signed-off-by: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-25 18:57:04 -07:00
de4023f194
XQuartz: Rename launchd-id-prefix to bundle-id-prefix
...
It's used many other places than just for launchd.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-25 18:57:04 -07:00
d0caa0e4cd
XQuartz: Silence warnings about deprecated functionality where it is an intended fallback
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-25 18:57:03 -07:00
69a9171dbb
XQuartz: pbproxy: Protect against possible collision between Cocoa and X11 Cursor types
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-03-01 20:02:46 -08:00
750d4e82a0
XQuartz: xpbproxy: Don't take down the whole server on an IO error
...
Calls pthread_exit to prevent _XIOError from calling exit()
This fixes http://xquartz.macosforge.org/trac/ticket/421
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-07-29 11:41:32 -07:00
927480be12
XQuartz: pbproxy: Make standalone xpbproxy respect the launchd prefix
...
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2010-03-21 21:56:39 -07:00
d16bc8a3cd
XQuartz: xpbproxy: Cleanup xpbproxy threading
...
Confine xpbproxy to a single thread
Runs inside its own CFRunLoop
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2010-03-21 21:56:39 -07:00
4127e8e5be
XQuartz: clang static analysis fixes
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-02-15 15:03:49 -08:00
7ba5de6e9e
XQuartz: Add some .gitignore magic
...
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2010-01-30 10:55:38 -08:00
97a6454ea5
XQuartz: pbproxy: Fix building of standalone xpbproxy executable
...
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-12-09 18:27:31 -08:00
e87a03fd53
XQuartz: pbproxy: Wait for the server to finish starting up, so display is valid.
...
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-11 18:00:19 -08:00
422cd7a674
XQuartz: pbproxy: Remove debugging XBell()
...
(cherry picked from commit 1fd7c1fd4740393a32e261af33e64c19be48ca9a)
2009-09-14 14:29:50 -07:00
7ece2cb220
XQuartz: pbproxy: 64bit fixes: Properly process an array of Atoms
...
(cherry picked from commit 1b659cda1af02762a31cc7875e457b08c8dc68b5)
2009-09-06 14:06:06 -07:00
c2b668e6ff
XQuartz: pbproxy standalone: added missing variable declarations.
...
(cherry picked from commit 2d947d17a3ef5fb8cef959bff0eb08b8bb5b6548)
2009-05-09 11:41:47 -07:00
d8c9ba37ab
XQuartz: pbproxy: Push dpy init and CFRunLoop hook setup into the pbproxy thread to avoid possible deadlock
...
(cherry picked from commit 49e59d32b88e4fad070f230b5efaa261b47f78db)
2009-01-02 11:02:42 -08:00
029d255a65
XQuartz: pbproxy: Release display notification lock when not needed to avoid deadlock
...
(cherry picked from commit 22f664ab95a0cae981e9cefad6f075d051583ca5)
2008-12-21 21:35:22 -08:00
fa4f2527a5
XQuartz: pbproxy: Simplify linking
...
(cherry picked from commit 909cc5c4dca0f63e90505575bbd454b46a4670cc)
2008-12-03 21:59:23 -08:00
94df1ab7f0
XQuartz: Force X11Controller to reset a broken DISPLAY envvar.
...
(cherry picked from commit f1a52b5b5ac31702497937efe3ac578be9a6c54f)
2008-11-25 11:53:06 -08:00
065d2afb0c
XQuartz: Add fallback for xpbproxy's display for Tiger or no-launchd-Leopard
...
(cherry picked from commit 7a8c6665949d7804a97ef2539a74ec4aa682e1cc)
2008-11-25 00:54:52 -08:00
b55cad4569
XQuartz: Don't hardcode values of org.x.X11 for the preferences domain
...
(cherry picked from commit 3a500d9247cf34686ec17b4a88c34d51ecd38ecd)
2008-11-25 00:54:37 -08:00
5d47a5d652
XQuartz: pbproxy: Added some typedefs for types not available on Tiger
...
(cherry picked from commit 0947aa7911f1de44bfe16e505a757b659c5ab2a8)
2008-11-21 10:59:34 -08:00
d7ee76f9dd
XQuartz: pbproxy: Push the pbproxy Xevent processing into its own thread
...
and just have the AppKit thread wake it up.
(cherry picked from commit 799715b8f3327c8da59ab45706e85af2d2c438e4)
2008-11-21 10:59:10 -08:00
c4ec71b405
XQuartz: pbproxy: nuke RCS Id, update header license/copyright
...
(cherry picked from commit 477c6968a88429bb9c10222a5836bdc936d10ab1)
2008-11-19 10:58:15 -08:00
42f330cf9e
XQuartz: pbproxy: Remove thread-main.m
...
it got accidently added and isn't used.
(cherry picked from commit cb6ffce68a2d10022fa92725d2d1837da4b3b89f)
2008-11-19 10:58:06 -08:00
e8112784e8
XQuartz: Integrated xpbproxy into the server.
...
Added a configure option called --enable-standalone-xpbproxy which is useful for deveoping xpbproxy.
The 'active' switch in preferences just disables the in-server xpbproxy (not this standalone).
(cherry picked from commit 42944936326ef8732f622db9f75b79a92980550d)
2008-11-15 19:52:34 -08:00
273df54685
XQuartz: pbproxy: Fix a bug that prevented nedit CLIPBOARD from being proxied.
...
It seems that we were calling copy_completed: too soon. Now we return instead
of falling through to the free_propdata, and copy_completed:.
(cherry picked from commit 5797d5b662817a3369a74a673f4a7c995cde75cf)
2008-10-28 22:01:34 -07:00
313d87341a
XQuartz: pbproxy: Work around bugs in some apps that aren't ICCCM compliant.
...
Eterm ends up setting the type of the property to TARGETS, instead of ATOM.
That's why it wasn't working.
(cherry picked from commit 9be5998ede7427f14dd9597e117b3d6b427ba4e5)
2008-10-28 22:01:29 -07:00
9007d3beea
XQuartz: pbproxy: Add code to handle PICT conversion to PNG and JPEG.
...
This may work, unfortunately I don't have test apps that fail.
The way it works is by using an NSImage class initWithPasteboard:
method, which we then get the TIFFRepresentation of, and convert
to PNG or JPEG.
The TIFFRepresentation uses NSTIFFCompressionNone; which should be
lossless.
(cherry picked from commit 8d048cfa956f4a0860250cc836a6748912b37ad8)
2008-10-28 22:01:22 -07:00
b742da0b71
XQuartz: pbproxy: fixed blocking
...
(cherry picked from commit bb330a1b1c480e89727fb75ff5aeb71f4afc5ee3)
2008-10-28 22:00:52 -07:00
c885110aed
Xquartz: pbproxy: Some debugging about unhandled mime types... this will spam up quick, but will be useful for a while...
...
(cherry picked from commit 3647215310f5a52126661b9ec473dcfeed25b40f)
2008-10-28 22:00:42 -07:00
d837d4e2af
XQuartz: pbproxy: pbproxy.h had invalid macro usage with 2 #else statements, so it wasn't building. Fix the build.
...
(cherry picked from commit 6bcbb9ba85d95d7df63811a482abc39c4d595366)
2008-10-23 19:22:28 -07:00
28d4f71193
XQuartz: pbproxy: Fix compilation on case-sensitive file systems...
...
(cherry picked from commit 6622efca216663c99d112c7a226bde691d1f3215)
2008-10-23 16:30:53 -07:00
2d764e21f2
XQuartz: pbproxy: SIGHUP reloads preferences.
...
(cherry picked from commit cbc0935ef74ebd76ed3db16d6ab86043eeed42a3)
2008-10-23 14:16:57 -07:00
f935c11398
XQuartz: pbproxy: Fix 2 bugs with the preferences.
...
Add dump_prefs() for instrospection.
Make prefs_get_bool a little more clear.
In get_property don't assume that the Mac realloc(NULL, 0); returns
non-NULL. We shouldn't depend on implementation-defined behavior too
much.
Add more commentary in various spots.
Add TARGETS in the TARGETS response. I don't know why some X11 apps
do this, but it could be something that some weird toolkit/app tests
for.
In reload_preferences add preferences synchronization, so that xpbproxy
reloads the preferences, and picks up any changes.
Fix a typo/misspelling of the sync_clipboard_to_pasteboard preference.
(cherry picked from commit 165cbbb90c793d9335ea76f0274b1f60ad295903)
2008-10-21 09:32:03 -07:00
84ef8ed6fb
XQuartz: implemented primary-on-grab and fixed clipboard-to-pasteboard
...
(cherry picked from commit bcb83eea729a01026d99d1cfc2b77385b5b275fd)
2008-10-15 17:31:54 -07:00
2998e48be3
Xquartz: Fix parallel builds
...
(cherry picked from commit 1fe7298a3b9a2ed82c612292f9e547cf78f99ae5)
2008-10-08 18:44:17 -07:00
ed3134918d
XQuartz: pbcopy: Re-enabled some code I commented out for testing
...
(cherry picked from commit 9b5d11409264080e394c8f18e06237122de80014)
2008-10-04 21:17:09 -07:00
b3a971d8b5
XQuartz: xpbproxy: Support some of the preference toggles from X11.app, cleaned up CLIPBOARD_MANAGER atom management.
...
(cherry picked from commit f7673bb4de3c1f71eb390a3279eed3589efc3df4)
2008-10-04 21:17:02 -07:00
7bb73a9513
XQuartz: pbproxy: Possibly fix a memory leak by using an [NSApp run] loop,
...
instead of calling CFRunLoopRun() directly. The leak wasn't reproducible on
this machine, but someone was able to produce a leak trace with Instruments
that indicates it was leaking in the CFRunLoopRun() path.
x-input.m: dequeue and ignore events when pbproxy_active is false.
x-selection.h: add an is_active method that is used by x-input.m to ignore
events.
x-selection.m: Handle nearly every preference, except for primary_on_grab,
which I don't really understand yet.
(cherry picked from commit 4d51ad851e64da83cbdfb0a4a22428418a7bcf75)
2008-10-03 11:14:49 -07:00
b1d0b19661
XQuartz: pbproxy: Make the signal handler safer by using _exit, and only exit.
...
Remove some unnecesssary headers.
Remove some dead code that was never called or used in pbproxy.
Make use of an NSAutoreleasePool in x_init. It could potentially cause a leak
on a startup without this.
Start adding reload_preferences to the x_selection class, as well as event
handling for that.
(cherry picked from commit 602e8ba8f7ee196696bc9e3cea6ecdf3200dcf5c)
2008-10-03 11:14:30 -07:00
b7ad86ff8a
Xquartz: xpbproxy: Split out app-specific stuff to app-main.m in prep for making this into a thread.
...
(cherry picked from commit c2012138a520560f8a2160518ea73fced410c3b7)
2008-10-03 11:12:57 -07:00
6020c3fbfe
XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
...
(cherry picked from commit 8edc5fb38c922f28659d2f823148339a8907c4d9)
(cherry picked from commit 88033a66a5549870fd053795b019d4c22950425b)
2008-10-03 11:11:47 -07:00
eb8be3e90a
XQuartz: pbproxy: Fix another STRING bug.
...
Fix the usage of the NSString cStringUsingEncoding: - it doesn't NUL
terminate the string, which lead to a bus error. So, we use
lengthOfBytesUsingEncoding: to get the length in bytes instead of
strlen().
(cherry picked from commit 6333d619e747c3b6bd3ba7557e35c0e5f6daa40f)
2008-09-26 12:31:33 -07:00
Jeremy Huddleston
Keith Packard
Emanuele Giaquinta
Jeremy Huddleston
George Peter Staplin