ab32ee3589
XQuartz: Better support turning off "Displays have separate Spaces" on OS X Mavericks
...
http://xquartz.macosforge.org/trac/ticket/1876
Follow-up to: 1c10b37380
2014-08-11 13:18:51 -07:00
1c10b37380
XQuartz: Update logic to account for title bar on every display in Mavericks
...
<rdar://problem/14205847>
http://xquartz.macosforge.org/trac/ticket/832
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-05-31 17:48:29 -07:00
ba4bb3bc1b
XQuartz: Don't add the 15bit visual any more
...
Mountain Lion only supports 32bit backing stores, so don't use 15bit visuals until libXplugin adapts
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2012-12-18 01:37:27 -08:00
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
19020b23ef
XQuartz: ASL: Use xpr subsystem for logging xpr messages
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-01 21:18:44 -07:00
60af79e35e
XQuartz: RandR: Don't crash if X11 is launched while there are no attached displays
...
If CG reports no displays when launching, we could crash in RandR. Instead, just
provide a fake 800x600 display until we are notified about displays being attached.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-22 11:17:59 -07:00
96ac4e61f4
XQuartz: Update DEBUG_LOG to report to ASL
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-22 11:17:59 -07:00
c116e32dc2
XQuartz: Put ifdef guards around have_depth label (-Wunused-label)
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-03-23 12:07:36 -07:00
0343aed1f0
XQuartz: Don't use deprecated CoreGraphics API on SL and Lion
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-02-27 16:19:50 -08:00
8cf3348e90
XQuartz: RandR: Add RandR modes for the primary display in multi-monitor configs
...
We now support using RandR to set the resolution of the primary display (and
place a shielding window on other displays) in multi-monitor configurations.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-02-27 15:46:22 -08:00
229323a19b
XQuartz: RandR: Don't change the rootless preference when changing RandR mode
...
Also renames a bunch of other variables for better consistency.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-09-28 09:50:35 -07:00
026a47e212
XQuartz: RandR: Respond better to resolution changes made outside X
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-09-28 09:50:34 -07:00
2d411472c2
XQuartz: RandR: Implement basic RandR functionality.
...
Querying and changing of resolution and refresh rate is supported,
rotation is not implemented yet.
Signed-off-by: Jan Hauffa <hauffa@in.tum.de>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-09-28 09:50:34 -07:00
2079853632
rootless: Delete dead remnants of rootless acceleration.
...
Jeremy deleted rootlessAccelInit's implementation in 2008 in commit
587c010a1c
2010-09-13 15:58:08 -07:00
e7fae9ecc4
Move each screen's root-window pointer into ScreenRec.
...
Many references to the WindowTable array already had the corresponding
screen pointer handy, which meant they usually looked like
"WindowTable[pScreen->myNum]". Adding a field to ScreenRec instead of
keeping this information in a parallel array simplifies those
expressions, and eliminates a MAXSCREENS-sized array.
Since dix uses this data, a screen private entry isn't appropriate.
xf86-video-dummy currently uses WindowTable, so it needs to be updated
to reflect this change.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
2010-06-03 14:03:23 -07:00
3f3ff971ec
Replace X-allocation functions with their C89 counterparts
...
The only remaining X-functions used in server are XNF*, the rest is converted to
plain alloc/calloc/realloc/free/strdup.
X* functions are still exported from server and x* macros are still defined in
header file, so both ABI and API are not affected by this change.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-05-13 00:22:37 +07:00
52456c602c
XQuartz: Attatch a stub display when CoreGraphics reports no displays.
...
This is half of the required changes to address the "stuck mouse pointer"
bug that occurs when X11 launches while the displays are asleep. The
remainder of the fix is part of libXplugin which needs to be updated to
send XP_EVENT_DISPLAY_CHANGED when the display wakes up. If you don't
have a recent enough libXplugin (expected in 2.5.0_beta2 or later), you
can cause this event to be sent by changing your display resolution (or
you could just start X11.app with your screens awake).
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-01-30 14:49:02 -08:00
67a51cd9ef
XQuartz: Fix a bunch of compilation warnings about style
...
(cherry picked from commit 54000bdcbca52a2de31f7c1a1147de6d8e9dbbb8)
2009-09-27 23:31:35 -07:00
ae65daab08
XQuartz: Unify how we set our bitmasks for visuals
...
(cherry picked from commit c230b52c27ce50ac6c27011ec8e88f1b263b25f9)
2009-07-31 15:34:13 -07:00
70ac671af2
XQuartz: no DirectColor
...
(cherry picked from commit df2fbc410f2c484612f65a6539a6cb069ef4a468)
2009-07-31 15:33:58 -07:00
9e74bb97ab
XQuartz: xpr: Added missing include for RootlessHideAllWindows
...
(cherry picked from commit 75e104730810acbb11bf8503bac24ea25243b2ac)
2009-07-25 15:25:23 -07:00
82d7cf5cdc
XQuartz: In rooted mode, make sure we start in the hidden state.
...
(cherry picked from commit 5ecc497f71c2133f773f6c56ad76cb778862ddd6)
2009-04-10 00:46:48 -07:00
1beff89810
XQuartz: misc 1.6 updates (still --disable-glx)
...
rlAccel is not longer compatable, and it's not worth fixing
Don't override DeviceCursorInitialize with a noop
Don't do a SwitchCoreKeyboard (which wasn't even needed in the first place)
(cherry picked from commit c137f681680e1d04b1513a8be68aeda4d1c56fd5)
2009-01-11 01:55:26 -08:00
895186e026
XQuartz: Re-enable rlAccel
...
It was incorrectly blamed for some crashes a few months ago, and it should be
safe to use until we get an EXA driver to replace it.
(cherry picked from commit 8121f30bd29591fc74fbc680fbbf20210271fa58)
2008-12-28 22:17:03 -08:00
a1b201bcb0
XQuartz: Use depth=24 instead of FatalError if we can't figure out our depth
...
(cherry picked from commit 80b65c5b78d125c4ad3620b87b121c9e666299c3)
2008-12-23 12:45:57 -08:00
23156a21d8
XQuartz: Make debugging output for invalid depths a bit more detailed
...
(cherry picked from commit 609fb166b7062c76f0561df12ffe893811f6ac8f)
2008-12-10 15:08:05 -08:00
09c3f6e04c
XQuartz: Dead code removal
...
(cherry picked from commit 46c077d9b4a883fc809c32077ce40f33a70d268b)
2008-11-25 00:54:22 -08:00
aedafbea0e
fix compilation on systems that don't have
...
XP_EVENT_SPACE_CHANGED defined
(cherry picked from commit 6e833e41e2f3a84f7e5164b918737b3975517c12)
2008-11-14 15:11:42 -08:00
ecd55bc859
XQuartz: displayScreenBounds uses quartzEnableRootless rather than !quartzHasRoot
...
(cherry picked from commit c883a78ef0c2e7e29437881db85d3815a89ab874)
2008-10-31 15:50:06 -07:00
93298c7f8f
XQuartz: Don't map the menu bar to the screen area.
...
(cherry picked from commit 1115917ada127a1cd6a8b61efe7fd134e2ea85fd)
2008-10-31 15:49:44 -07:00
af0d5e2ef7
XQuartz: 64bit crash fix ... don't pass pointers through xe.
...
(cherry picked from commit 5f1265b82edead8f15f2affc79c2782519502fa2)
2008-09-21 17:40:42 -07:00
a338007be6
XQuartz: Adjust the screen origin offset properly for multimonitor setups
...
(cherry picked from commit f2020b9836bacd0593ac0b4c8541e32714ab02a9)
2008-05-01 18:04:18 -07:00
0209e46249
XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging.
...
(cherry picked from commit 515b8b855ac5d2d5aef881053f73b2ad07a6dd2e)
2008-04-24 23:50:23 -07:00
b65dbd350b
XQuartz: Cleaned up multi-monitor support.
...
(cherry picked from commit c05abf0a19b0ef0fc4ace9400a095ce2521456bc)
(cherry picked from commit 9112f290434c246d3e797551aaaf3a89d2006b23)
2008-04-24 23:50:21 -07:00
570b0dca26
Fix for pointer-offset issue when using a multi-display environment on X11.app.
...
(cherry picked from commit 9a7e14286ced55c5e2a4512e2629e03836443009)
2008-04-21 17:55:19 -07:00
5183fea6d3
XQuartz: Handled sanitization of namespace better
...
(cherry picked from commit 8cb23d672177da919257c885804cecd18cf9af88)
2008-04-18 20:07:55 -07:00
652479dba3
XQuartz: Moved some rootless-specific cruft into xpr
...
(cherry picked from commit 31625cc03b58317120c2ac7877e227e2322e1de8)
2008-04-17 15:50:11 -07:00
8716d081fd
XQuartz: Don't enable rootless accelerated functionality... crashy...
...
(cherry picked from commit cdb4c291d8c10c3a9ea59d8e79275a30d2ea82b4)
2008-04-16 23:14:06 -07:00
9e7ced94a5
XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread
...
(cherry picked from commit cb27d5ca8230707b276763c0ec20e586203144c9)
2008-04-15 12:06:07 -07:00
2e42b67b82
XQuartz: Change reporting of space change to debug log rather than stderr
...
(cherry picked from commit ed15556a9fc4ebdb88f42961052fc8456082165f)
2008-04-02 18:05:55 -07:00
e9e2d88436
moved and renamed QuartzMessageServerThread to
...
DarwinSendDDXEvent to make more clear what it actually does.
(cherry picked from commit bee2b377efc930e25017636e5112093a3a6549c7)
2008-04-02 17:48:01 -07:00
985c631b2e
just a bit of juggling headers around -- we're preparing
...
to call our Xquartz-specific event handlers directly
as mieqHandlers
(cherry picked from commit 4aedba5aa727e22316e8ca456f7218bea9ee0313)
2008-04-02 17:47:57 -07:00
b8ea9f2a25
XQuartz: Fixed names of enums to be more consistent
...
(cherry picked from commit c309a08806daf5d716a860c709e51eacad2c745a)
2008-03-28 17:03:20 -07:00
c49e112683
XQuartz: Initial framework for dealing with spaces on OS-X
...
(cherry picked from commit 9831324998f9d1f05ff944c58c5bf60dcae17355)
2008-03-21 19:37:42 -07:00
4c76607b69
Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
...
(cherry picked from commit f03202ad15457c98be7ca78cc59bac88cf5f1966)
2008-03-21 19:33:21 -07:00
aca75f389e
XQuartz: Flush the debug log for easier debugging
...
Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d4239c7f3918332ef07752f1e211afb23)
2008-01-04 23:10:10 -08:00
e46d559739
XQuartz: Cleaned up color map configuration.
...
8 bit color still doesn't work, but the -depth command line argument now works properly.
(cherry picked from commit 6765949c27c053d22882f54337cfd09203aa5383)
2008-01-03 13:25:56 -08:00
bc65a24393
Darwin: Flattened quartz into darwin, renamed darwin xquartz
...
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point
(cherry picked from commit 48e6a75fbdd0fee86e364f02ace83f20b312a2b2)
2007-12-05 20:32:40 -08:00
Jeremy Huddleston Sequoia
Keith Packard
Jan Hauffa
Jamey Sharp
Mikhail Gusarov
Jeremy Huddleston
Ben Byer
Jeremy Huddleston
Jeremy Huddleston