summaryrefslogtreecommitdiff
path: root/hw/xquartz/X11Controller.m
AgeCommit message (Collapse)AuthorFilesLines
2015-06-09XQuartz: Silence -Wformat-security for NSRunAlertPanelJeremy Huddleston Sequoia1-3/+3
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2015-06-09XQuartz: Silence -Wunused-variableJeremy Huddleston Sequoia1-1/+0
X11Controller.m:939:9: warning: unused variable 'remain' [-Wunused-variable,Unused Entity Issue] int remain; ^ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2015-06-09XQuartz: Silence -Wpointer-bool-conversionJeremy Huddleston Sequoia1-3/+3
X11Controller.m:417:17: error: address of function 'asl_log_descriptor' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion,Value Conversion Issue] if (asl_log_descriptor) { ~~ ^~~~~~~~~~~~~~~~~~ X11Controller.m:417:17: note: prefix with the address-of operator to silence this warning [Semantic Issue] if (asl_log_descriptor) { ^ & Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-04-06XQuartz: Ensure we wait for the server thread to terminateJeremy Huddleston Sequoia1-3/+2
AKA: XQuartz 2.7.5 doesn't delete its /tmp/.X$d-lock http://xquartz.macosforge.org/trac/ticket/823 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-12XQuartz: Mark applicationWillTerminate: noreturnJeremy Huddleston Sequoia1-1/+1
X11Controller.m:938:1: warning: method 'applicationWillTerminate:' could be declared with attribute 'noreturn' [-Wmissing-noreturn,Semantic Issue] { ^ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2013-12-12XQuartz: Use asl_log_descriptor to log stdout/stderr of child processesJeremy Huddleston Sequoia1-4/+4
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2013-11-10XQuartz: Don't sleep forever on exit if usleep() returns an errorJeremy Huddleston Sequoia1-1/+1
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2012-08-16XQuartz: Use asl_log_descriptor for children as wellJeremy Huddleston Sequoia1-2/+60
This change is #if'd out due to a bug in asl_log_descriptor, but it is left here as reference to be enabled in the future. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2012-03-24XQuartz: Source formatting cleanupJeremy Huddleston1-361/+417
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-21Introduce a consistent coding styleKeith Packard1-667/+679
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-01-29XQuartz: Toggle off fullscreen mode when XQuartz is hiddenJeremy Huddleston1-0/+7
http://xquartz.macosforge.org/trac/ticket/478 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-19XQuartz: Add GUI controls to toggle scroll_in_device_directionJeremy Huddleston1-2/+16
Also cleaned up the wording for fullscreen_menu. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-12-08XQuartz: Just NSBeep() for XBell()Jeremy Huddleston1-4/+0
The CoreAudio path uses deprecated API and has reported crashes that aren't worth fixing (4e8bf12b13690afa6d9fee0e339d3819ef16fb3f fixed one and introduced another). NSBeep() does the job just fine. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-09-28XQuartz: RandR: Don't change the rootless preference when changing RandR modeJeremy Huddleston1-21/+21
Also renames a bunch of other variables for better consistency. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-11XQuartz: Add a defaults option to toggle Alt / Mode_switchJeremy Huddleston1-40/+62
See option_sends_alt in Xquartz(1) Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Kevin Van Vechten <kvv@apple.com>
2009-11-05XQuartz: Cleanup X11Controller.m compilation warnings.Jeremy Huddleston1-8/+8
Declare X11Controller as implementing NSTableViewDataSource. Use selectRowIndexes:byExtendingSelection instead of selectRow:byExtendingSelection Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-09-29XQuartz: Remove the redundant xquartz_resetenv_displayJeremy Huddleston1-3/+1
unsetenv(DISPLAY) takes care of this for us anyway (cherry picked from commit d2263645d839c9edeedea0835d26f1f41b37f70e)
2009-09-27XQuartz: Fix a bunch of compilation warnings about styleJeremy Huddleston1-1/+3
(cherry picked from commit 54000bdcbca52a2de31f7c1a1147de6d8e9dbbb8)
2009-08-25XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger ↵Jeremy Huddleston1-8/+0
types are defined. (cherry picked from commit 36e02a8649c0a545084cce5fb2c5717277b9273c)
2009-08-25XQuartz: Use applewmproto 1.4 updated headers.Jeremy Huddleston1-2/+1
(cherry picked from commit 203df06c0eb2dcd5adfa788a1ba9569650c15f9c)
2009-07-28XQuartz: Avoid a possible spinlock in applicationWillTerminateJeremy Huddleston1-1/+4
(cherry picked from commit f430cda0fdcc1a8fc5f4795743b40f09ff0bd869)
2009-07-24XQuartz: Rever the "Set can_quit to true during a Sparkle-initiated ↵Jeremy Huddleston1-1/+1
relaunch." change This was in place to work around the issue that was correctly solved with the previous commit (changing the Windows menu behavior). Reverting this change no longer causes crashing, so it's safe to show the dialog now. (cherry picked from commit 023cef31bbb2ab80a241098d82fcfd35ada75fc0)
2009-07-24XQuartz: Change handling of Windows menu to workaround a bug triggered by ↵Jeremy Huddleston1-14/+23
mixing Sparkle and X11 windows <rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet (cherry picked from commit 27ac5135267be9cb221329ae68461117dd43a4bf)
2009-07-24XQuartz: Set can_quit to true during a Sparkle-initiated relaunch.Jeremy Huddleston1-5/+9
(cherry picked from commit b2e9a77111d4572402d8ca95e3368db97ba7d598)
2009-07-24XQuartz: Added a "Check for X11 Updates..." menu item.Jeremy Huddleston1-0/+21
(cherry picked from commit 305144bfa4b59791123c44e869fab93a084792d6)
2009-01-25XQuartz: SnowLeopard: Help system book name changed in 10.6Jeremy Huddleston1-8/+9
(cherry picked from commit b57cb05c69acbedb00a97234099ea104309aa2cb)
2008-12-21XQuartz: Run applications via '/bin/sh -c ...' to support users who expect ↵Jeremy Huddleston1-25/+5
shell parsing (cherry picked from commit 67455e716e3ecffd528930479192785958d37988)
2008-12-10XQuartz: Avoid using login /bin/sh blech. Just use a bash script to start ↵Jeremy Huddleston1-54/+68
the app, so it will inherit the right environment (cherry picked from commit f4b7ad9cc6b0c99fc7ee8516c4bf858ece938148)
2008-11-28XQuarz: Setup our PATH and PWD earlier, so our initial client benefits from ↵Jeremy Huddleston1-14/+1
it as well... (cherry picked from commit cbae2b447357b3fed6ff19414c60dd3792045600)
2008-11-25XQuartz: Simplify the xquartz_resetenv_display pathJeremy Huddleston1-11/+1
(cherry picked from commit d2e0624dd30eb234bb25595ceedfa51d48ca1724)
2008-11-25XQuartz: Force X11Controller to reset a broken DISPLAY envvar.Jeremy Huddleston1-0/+12
(cherry picked from commit f1a52b5b5ac31702497937efe3ac578be9a6c54f)
2008-11-21XQuartz: More Tiger ifdefsJeremy Huddleston1-2/+9
(cherry picked from commit 803509072f2c039e5cd555c4ac14d672f0e698c5)
2008-10-31XQuartz: Add option to allow access to the menu in fullscreen modeJeremy Huddleston1-12/+17
(cherry picked from commit 637a9f4bd1ff2b55c870a08ead4940df0f9818e5)
2008-10-21XQuartz: More progress towards fullscreen...Jeremy Huddleston1-2/+0
(cherry picked from commit 628cae86b4ad02c49d20df1e1afdcb7abcabb649) (cherry picked from commit b47b7ab6d6d0a7f6cbf678a5755124d6b7516d3e)
2008-10-08XQuartz: Some motion made towards supporting fullscreen.Jeremy Huddleston1-5/+1
(cherry picked from commit 99be3d68b64059caada739a373e5e01844c776e0)
2008-10-03XQuartz: Send AppleWMReloadPreferences where appropriate.Jeremy Huddleston1-34/+25
(cherry picked from commit 490cbe9888e2c1080495b003c429fdb1659444e1)
2008-09-21XQuartz: "Disable" the text when syncing is disabled.Jeremy Huddleston1-6/+6
(cherry picked from commit 7713d7ab66e74b212a6c0d634a3ad82373e178db)
2008-09-21XQuartz: Added a preferences UI for pbproxy options.Jeremy Huddleston1-3/+48
(cherry picked from commit d76cca5e1eae86450aa236e49a2024881d0bac01)
2008-09-12XQuartz: Dead code removalJeremy Huddleston1-1/+0
(cherry picked from commit 43184cd379c4fb7254391b8a362016cbf89b5529)
2008-09-12XQuartz: 256 color supportJeremy Huddleston1-3/+0
(cherry picked from commit 8dd6d5c825d457f26b41b79d02d57ed4a5ecf1f5)
2008-09-03XQuartz: Removed "Done" button from Applications Customization. Now ↵Jeremy Huddleston1-0/+7
properly save on exit. (cherry picked from commit 2f1e163d5db6063e54fcaa045ea67c29ce3e46aa) (cherry picked from commit 7542c00b96461c3474b8c23545171c4b6ddfd29d)
2008-08-30XQuartz: Fixed editing of Applications menuJeremy Huddleston1-13/+9
(cherry picked from commit da647f1add4c1ae7854c0fbfbf972666ce5d12c8)
2008-08-20XQuartz: Support windowItemModMask=0 or -1 to disable window shortcuts.Jeremy Huddleston1-1/+4
(cherry picked from commit 81187364e512606a6aebb95ab2967d9d420f57f2) (cherry picked from commit f2ec79e4a159dec6481691e4dd615db01770dd7a)
2008-08-20XQuartz: Added window_item_modifiers defaults item (and option to ↵Jeremy Huddleston1-2/+6
localization) to change the modifier keys used for the windows menu. (cherry picked from commit e4110861d307a55d9032cb83cf024ec1f294e8d7) (cherry picked from commit fcfc05482a88696cb713c7a2ddfcf935ae8378a6)
2008-05-01XQuartz: Adjust the screen origin offset properly for multimonitor setupsJeremy Huddleston1-0/+1
(cherry picked from commit f2020b9836bacd0593ac0b4c8541e32714ab02a9)
2008-04-28XQuartz: More startup / threading house cleaning.Jeremy Huddleston1-2/+2
(cherry picked from commit 72653c24c00dfba64ce35a3d400598bcd77defc1)
2008-04-26XQuartz: Cleaned up startup and thread creation a tad.Jeremy Huddleston1-2/+2
(cherry picked from commit c861fe00e112b21ee0156d09a6cd5281642a1dcc)
2008-04-21XQuartz: Fixed cmd-tab to bring all windows forward.Jeremy Huddleston1-6/+0
(cherry picked from commit e48e2ce931228f4dfa36c39b8ec8c72a58025b1b)
2008-04-21XQuartz: Fixed quit dialog to be more conforming with HIG.Jeremy Huddleston1-14/+16
(cherry picked from commit 14c6b837bb03bd0956f90882f550847f13d0ca09)
2008-04-18XQuartz: More sanitization of the namespaceJeremy Huddleston1-5/+5
(cherry picked from commit bc50d41f9d1aec04f0de0478cbd5036f1fe9b81e)