1. 26 Apr, 2012 1 commit
  2. 13 Apr, 2012 1 commit
  3. 10 Apr, 2012 3 commits
  4. 06 Apr, 2012 4 commits
  5. 30 Mar, 2012 8 commits
  6. 27 Mar, 2012 14 commits
    • Jeremy Huddleston Sequoia's avatar
      XQuartz: Use scrolling valuators · 1e2a7462
      Jeremy Huddleston Sequoia authored
      This lets use send more accurate data to Xi clients and uses dix
      for legacy scroll buttons rather than reinventing the wheel.
      Signed-off-by: Jeremy Huddleston Sequoia's avatarJeremy Huddleston <jeremyhu@apple.com>
      Acked-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
      (cherry picked from commit 31646d8f)
      1e2a7462
    • Jeremy Huddleston Sequoia's avatar
      XQuartz: Use AllocDevicePair to allocate our keyboard and mouse at the same time · 67d20e39
      Jeremy Huddleston Sequoia authored
      Also correct isMaster to FALSE while we're here.
      Signed-off-by: Jeremy Huddleston Sequoia's avatarJeremy Huddleston <jeremyhu@apple.com>
      Acked-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
      (cherry picked from commit 7790dc86)
      67d20e39
    • Jeremy Huddleston Sequoia's avatar
    • Jeremy Huddleston Sequoia's avatar
      XQuartz: Formatting cleanup for sendX11NSEvent · 81541485
      Jeremy Huddleston Sequoia authored
      Signed-off-by: Jeremy Huddleston Sequoia's avatarJeremy Huddleston <jeremyhu@apple.com>
      (cherry picked from commit 41a46546)
      81541485
    • Jeremy Huddleston Sequoia's avatar
      XQuartz: Source formatting cleanup · 34135703
      Jeremy Huddleston Sequoia authored
      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 Sequoia's avatarJeremy Huddleston <jeremyhu@apple.com>
      (cherry picked from commit 5324557c)
      
      Conflicts:
      
      	hw/xquartz/X11Application.h
      	hw/xquartz/X11Application.m
      Signed-off-by: Jeremy Huddleston Sequoia's avatarJeremy Huddleston <jeremyhu@apple.com>
      34135703
    • Jeremy Huddleston Sequoia's avatar
      XQuartz: Add a defaults option to disable the RENDER extension · c0b4dec9
      Jeremy Huddleston Sequoia authored
      RENDER has some ugly issues on XQuartz, so add an option to disable RENDER.
      
      Enables workaround for: https://bugs.freedesktop.org/show_bug.cgi?id=26124Signed-off-by: Jeremy Huddleston Sequoia's avatarJeremy Huddleston <jeremyhu@apple.com>
      (cherry picked from commit 0bb8a256)
      c0b4dec9
    • Jeremy Huddleston Sequoia's avatar
      XQuartz: Use doubles for input valuators · a6f856a7
      Jeremy Huddleston Sequoia authored
      Signed-off-by: Jeremy Huddleston Sequoia's avatarJeremy Huddleston <jeremyhu@apple.com>
      (cherry picked from commit 5ff46d65)
      a6f856a7
    • Jeremy Huddleston Sequoia's avatar
      XQuartz: Xi: darwinPointer is now Relative · 3998ff22
      Jeremy Huddleston Sequoia authored
      There is really no real reason why this should be necessary, but wine
      developers are stuborn, so doing this to try to work around this wine
      issue:
      
      http://bugs.winehq.org/show_bug.cgi?id=29732Signed-off-by: Jeremy Huddleston Sequoia's avatarJeremy Huddleston <jeremyhu@apple.com>
      (cherry picked from commit cd84c094)
      3998ff22
    • Jeremy Huddleston Sequoia's avatar
      XQuartz: Move our logs into an X11 subdirectory · cdd704da
      Jeremy Huddleston Sequoia authored
      Signed-off-by: Jeremy Huddleston Sequoia's avatarJeremy Huddleston <jeremyhu@apple.com>
      (cherry picked from commit 87939bf8)
      cdd704da
    • Daniel Stone's avatar
      Indentation: Change '& stuff' to '&stuff' · 5926ed85
      Daniel Stone authored
      If the typedef wasn't perfect, indent would get confused and change:
          foo = (SomePointlessTypedef *) &stuff[1];
      to:
          foo = (SomePointlessTypedef *) & stuff[1];
      
      Fix this up with a really naïve sed script, plus some hand-editing to
      change some false positives in XKB back.
      Signed-off-by: Daniel Stone's avatarDaniel Stone <daniel@fooishbar.org>
      (cherry picked from commit ab3a815a)
      5926ed85
    • Daniel Stone's avatar
      Xinerama: Fix up obnoxiously-indented code · dfecff42
      Daniel Stone authored
      Comments inside of conditionals confuse indent to death.  Which is fair
      enough really.
      Signed-off-by: Daniel Stone's avatarDaniel Stone <daniel@fooishbar.org>
      (cherry picked from commit 58b1f739)
      dfecff42
    • Keith Packard's avatar
      Introduce a consistent coding style · 8384075e
      Keith Packard authored
      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's avatarKeith Packard <keithp@keithp.com>
      Acked-by: Daniel Stone's avatarDaniel Stone <daniel@fooishbar.org>
      Acked-by: Alan Coopersmith's avatarAlan Coopersmith <alan.coopersmith@oracle.com>
      (cherry picked from commit 9838b703)
      8384075e
    • Keith Packard's avatar
      Handle blank betweeen type and name in sdksyms.sh · d9a9788b
      Keith Packard authored
      indent sometimes adds a blank line between the type and the name in a
      function declaration that includes _X_EXPORT, so handle that before
      the files are re-indented.
      Signed-off-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
      (cherry picked from commit 75199129)
      d9a9788b
    • Jeremy Huddleston Sequoia's avatar
      3590d0bb
  7. 05 Mar, 2012 2 commits
  8. 27 Feb, 2012 1 commit
  9. 23 Feb, 2012 3 commits
  10. 22 Feb, 2012 1 commit
  11. 15 Feb, 2012 2 commits