summaryrefslogtreecommitdiff
path: root/hw/xquartz/X11Controller.h
AgeCommit message (Collapse)AuthorFilesLines
2012-03-24XQuartz: Source formatting cleanupJeremy Huddleston1-61/+61
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-34/+37
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>
2011-07-19XQuartz: Add GUI controls to toggle scroll_in_device_directionJeremy Huddleston1-0/+2
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-1/+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-04-11XQuartz: Add a GUI preference for the Alt / Mode_switch toggleJeremy Huddleston1-3/+2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Kevin Van Vechten <kvv@apple.com>
2010-04-11XQuartz: Add a defaults option to toggle Alt / Mode_switchJeremy Huddleston1-0/+1
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-11XQuartz: Buildfix for Leopard and olderJeremy Huddleston1-0/+4
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-05XQuartz: Cleanup X11Controller.m compilation warnings.Jeremy Huddleston1-1/+1
Declare X11Controller as implementing NSTableViewDataSource. Use selectRowIndexes:byExtendingSelection instead of selectRow:byExtendingSelection Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-05XQuartz: Controller thread launches clientsJeremy Huddleston1-1/+1
This avoids a memory leak due to no active auto-release pool on the server thread. Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-03XQuartz: Run xmodmap after programatically updating the keymap.Jeremy Huddleston1-0/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> Signed-off-by: Martin Otte <otte@duke.edu>
2009-08-25XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger ↵Jeremy Huddleston1-0/+10
types are defined. (cherry picked from commit 36e02a8649c0a545084cce5fb2c5717277b9273c)
2009-07-28XQuartz: Avoid namespace collission for BOOL in SparkleJeremy Huddleston1-0/+2
(cherry picked from commit 227c6e01a641b72158201553273299283cdb5599)
2009-07-24XQuartz: Change handling of Windows menu to workaround a bug triggered by ↵Jeremy Huddleston1-1/+9
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-1/+6
(cherry picked from commit b2e9a77111d4572402d8ca95e3368db97ba7d598)
2009-07-24XQuartz: Added a "Check for X11 Updates..." menu item.Jeremy Huddleston1-0/+10
(cherry picked from commit 305144bfa4b59791123c44e869fab93a084792d6)
2008-10-31XQuartz: Add option to allow access to the menu in fullscreen modeJeremy Huddleston1-0/+1
(cherry picked from commit 637a9f4bd1ff2b55c870a08ead4940df0f9818e5)
2008-09-21XQuartz: Added a preferences UI for pbproxy options.Jeremy Huddleston1-0/+8
(cherry picked from commit d76cca5e1eae86450aa236e49a2024881d0bac01)
2008-08-30XQuartz: Fixed editing of Applications menuJeremy Huddleston1-1/+0
(cherry picked from commit da647f1add4c1ae7854c0fbfbf972666ce5d12c8)
2008-04-28XQuartz: More startup / threading house cleaning.Jeremy Huddleston1-1/+1
(cherry picked from commit 72653c24c00dfba64ce35a3d400598bcd77defc1)
2008-04-26XQuartz: Cleaned up startup and thread creation a tad.Jeremy Huddleston1-1/+1
(cherry picked from commit c861fe00e112b21ee0156d09a6cd5281642a1dcc)
2008-04-18XQuartz: More sanitization of the namespaceJeremy Huddleston1-4/+4
(cherry picked from commit bc50d41f9d1aec04f0de0478cbd5036f1fe9b81e)
2008-03-21Xquartz: Added separate preference tab for quartz-wm settingsJeremy Huddleston1-0/+2
Added FFM and "Focus on new window" options (cherry picked from commit 6841d078b7cb0b0db3db948d26b4d5ec7747deb8)
2008-02-10XQuartz: Added option for setting quartz-wm click-through preferenceJeremy Huddleston1-19/+39
(cherry picked from commit bf54c267cba97b2b3b9a621da0575776a388b2cb)
2007-12-20Xquartz: Use X11ControllerMain()Jeremy Huddleston1-0/+2
(cherry picked from commit a9ac932543374aa2540f5a12cc85ef82c85b0e0c)
2007-12-20Xquartz: General CleanupJeremy Huddleston1-4/+0
General code cleanup, whitespace, dead code removal, added missing prototypes. Made Xquartz come to foreground later in startup, so it doesn't appear for Xquartz -version (cherry picked from commit 36922e8ff4316c93843aa3fe959cf8df3c7d5892)
2007-12-05Darwin: Flattened quartz into darwin, renamed darwin xquartzJeremy Huddleston1-0/+85
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point (cherry picked from commit 48e6a75fbdd0fee86e364f02ace83f20b312a2b2)