Eamon Walsh
2d17f47cc7
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
2007-11-19 18:10:46 -05:00
Eamon Walsh
60be452c2e
xace: restore the old SaveScreens function and introduce new API, since the
...
old version is called from drivers...
2007-11-19 16:59:34 -05:00
Michel Dänzer
ea9c63e93b
DEFAULT_DPI was undefined here.
2007-11-19 15:53:49 +01:00
Adam Jackson
db9ae86353
Bump DEFAULT_DPI to 96.
...
75 is just nonsense.
2007-11-18 11:57:01 -05:00
Tormod Volden
ee2d4626dc
Bug #12932 : Use DEFAULT_DPI in randr1.2 instead of hardcoded 96.
2007-11-18 11:56:31 -05:00
Adam Jackson
d15339a92c
Bug #9725 : Don't look in root's $HOME for config files, that's just confusing.
2007-11-17 22:12:10 -05:00
Aaron Plattner
f797c96845
Save pixmap allocation hints into the PixmapRec.
2007-11-15 12:21:25 -08:00
Adam Jackson
6bc50de021
Simplify system resource range setup.
...
osRes only existed to get copied into Acc. Waste of effort.
2007-11-15 15:03:58 -05:00
Adam Jackson
e1ff14a924
Delete some dead code in X -configure.
2007-11-15 14:45:49 -05:00
Adam Jackson
c67b9c5fc3
Clean up some garbage in driver enumeration.
2007-11-15 14:24:36 -05:00
Adam Jackson
0706e5e790
Eliminate some redundancy in autoconfiguration.
...
We already synthesize Monitor and Module sections for you, no need to
specify them explicitly in the fake config buffer.
2007-11-15 14:15:09 -05:00
Adam Jackson
2c01a49bf0
Don't sleep(1) at exit on any platform.
2007-11-15 13:32:59 -05:00
Tiago Vignatti
4c9cc82fc4
For some reason "-nozap" appeared twice. Weird.
2007-11-15 01:46:11 -02:00
Adam Jackson
cecac79445
Don't sleep(1) at server exit.
2007-11-14 14:46:22 -05:00
Eamon Walsh
1603130236
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/xace.c
Xext/xace.h
2007-11-14 13:35:50 -05:00
Ben Byer
338c1aedbd
formatting fixes
2007-11-08 20:41:47 -08:00
Ben Byer
bd269d0d78
Fix for off-by-one error in menu bar height calculation -- props to Nicholas Riley!
2007-11-08 20:39:08 -08:00
Ben Byer
b4d1448405
Undo some last-minute breakage in xpr.h
2007-11-08 20:38:02 -08:00
Ben Byer
05d5b9baa0
removed debugging output
2007-11-08 20:37:38 -08:00
Ben Byer
9a8abcfa6d
Fixed focus problem (clicking on an X11 window that sits behind
...
an Aqua window would not always bring it to the top of the stack.
2007-11-08 20:37:18 -08:00
Ben Byer
b34d2ffc38
formatting changes.
2007-11-08 20:37:04 -08:00
Ben Byer
50dac9b2cb
Fixed Spaces issue, correctly -- dragging an X window from one
...
Space to another in Expose mode now works.
2007-11-08 20:11:34 -08:00
Ben Byer
a6ac900295
formatting cleanup
2007-11-08 20:06:05 -08:00
Ben Byer
67e96be13c
Fixed logic error that prevent JIS (Japanese) keyboard layouts from
...
being detected.
2007-11-08 20:04:44 -08:00
Ben Byer
154fb6417e
Initial support for Spaces -- if you use Expose to drag an X11
...
window to another Space, it will work correctly (as opposed
to just leaving a ghost window). We accomplish this by listening
for the notification from Xplugin that our window has been moved,
and then we ask X11 to move the window to the new location.
2007-11-08 20:04:03 -08:00
Ben Byer
169f83e366
Disable deferred updates in xp_init to fix performance problems
...
-- thanks to Eric Gouriou for pointing out the issue
2007-11-08 20:00:55 -08:00
Dodji Seketeli
e94ab0b502
sync with 'master'
2007-11-07 19:05:38 +01:00
Michel Dänzer
9bee1c6912
EXA: Disable problematic optimization of dest pixmap migration by default.
...
Also add some code comments about these optimizations.
2007-11-07 19:01:24 +01:00
Dodji Seketeli
26e1fc7b42
Xephyr: don't use Xv or GL when those are disabled.
2007-11-07 18:48:23 +01:00
Dodji Seketeli
950f9995d1
Xnest: fix lib dependancy to make libtool happy
...
This fixes an undefined symbol error happening when compiling
the server with the --disable-xv configure switch.
Basically, xnest was linking against
@XSERVER_LIBS@ and @XNEST_LIBS@ and the order of the libraries
given to the linker at the end of the process was bogus.
* configure.ac: make XNEST_LIBS contain the $XSERVER_LIBS re-ordered
in such a way that the linker finds the symbols of all the libs contained
in $XNEST_LIBS.
* hw/xnest/Makefile.am: don't link against @XSERVER_LIBS@ anymore because
XNEST_LIBS contains the right thing.
2007-11-07 18:43:16 +01:00
Dodji Seketeli
868e303630
Xephyr: fix a crash when using xrandr twice
...
* hw/kdrive/ephyr/ephyr.c:
(ephyrScreenFini): don't forget to
free shadowfb data (if necessary) upon server is reset.
2007-11-06 16:24:46 +01:00
Eamon Walsh
a52c9b2a59
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
Dodji Seketeli
632c33c5c1
pull 'master'
2007-11-05 17:53:04 +01:00
Daniel Stone
dda10c9066
Remove all traces of external RGB database (and Speedo)
...
Remove all references to an external RGB database (which hasn't been enabled
for a very long time). Also get rid of some references to Speedo fonts.
2007-11-05 16:28:35 +00:00
Dodji Seketeli
6ff79ea5f7
Xephyr: fix some DRI build breakage
2007-11-05 16:46:49 +01:00
Daniel Stone
733d42065f
XFree86: Remove usage of alloca
...
Replace with heap allocations.
2007-11-05 14:34:42 +00:00
Daniel Stone
caf5450634
KDrive: Remove usage of alloca
...
Replace with heap allocations.
2007-11-05 14:34:42 +00:00
Daniel Stone
d57060f167
DMX: Remove usage of alloca
...
Replace with heap allocations.
2007-11-05 14:34:42 +00:00
Daniel Stone
def6f74f2d
Xvfb: Remove usage of alloca
...
Replace with heap allocations
2007-11-05 14:34:42 +00:00
Daniel Stone
259f4c36d5
Xprint: Remove usage of alloca
...
Replace with heap-based allocations.
2007-11-05 14:34:42 +00:00
Daniel Stone
1c84337af0
Xwin: Remove usage of alloca
...
Replace with heap allocations.
2007-11-05 14:34:42 +00:00
Ben Byer
b1764ddf13
pulling more patches over from xorg-xserver-1.2-apple branch
2007-11-05 05:45:21 -08:00
Ben Byer
10fde62fc8
more CVS tags
2007-11-05 05:45:21 -08:00
Ben Byer
27ecb89250
Removed CVS tags.
2007-11-05 05:45:21 -08:00
Aaron Plattner
f2e310132f
Add CreatePixmap allocation hints.
...
These hints allow an acceleration architecture to optimize allocation of certain
types of pixmaps, such as pixmaps that will serve as backing pixmaps for
redirected windows.
2007-11-04 16:11:28 -08:00
Mark Vytlacil
41c3069f7c
XFree86: Input: Save/restore errno around SIGIO (bug #10683 )
...
Make sure errno is saved and restored from the SIGIO handler, so errors
from system calls in input handlers don't break the interrupted code.
2007-11-04 16:46:21 +00:00
Ben Byer
ff9929ed48
pulling in changes from xorg-server-1.2-apple branch
2007-11-04 05:13:19 -08:00
Matthias Hopf
4d0f35c81d
Always duplicate mode name when duplicating a mode.
...
If the originating mode didn't have a name, we would end up with the name of
the original mode being setup correctly, but with the name of the copy still
being NULL.
2007-11-02 19:27:32 +01:00
Adam Jackson
dfb1cce28a
Restore build of xf8_16bpp.
...
It doesn't link against cfb, so don't conditionalize its build against cfb.
2007-11-02 12:51:56 -04:00
Kristian Høgsberg
7a0555e9bb
Fix crash in xf86InitOrigins()
...
In a multihead setup, if only the first screen can be
initialized, but the second screen is mentioned first in the
ServerLayout section, the xf86InitOrigins() function will crash
because the screen referred to in the e.g. "RightOf" part is
non-existent.
2007-11-02 12:06:09 -04:00