andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'alanc/master'

Browse Source
This commit is contained in:
Keith Packard 2012-08-06 16:40:54 -07:00
commit 2100e72388
18 changed files with 967 additions and 809 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Xi/extinit.c
View File

@ -158,25 +158,25 @@ static struct dev_type {
Atom type;
const char *name;
} dev_type[] = {
{
0, XI_KEYBOARD}, {
0, XI_MOUSE}, {
0, XI_TABLET}, {
0, XI_TOUCHSCREEN}, {
0, XI_TOUCHPAD}, {
0, XI_BARCODE}, {
0, XI_BUTTONBOX}, {
0, XI_KNOB_BOX}, {
0, XI_ONE_KNOB}, {
0, XI_NINE_KNOB}, {
0, XI_TRACKBALL}, {
0, XI_QUADRATURE}, {
0, XI_ID_MODULE}, {
0, XI_SPACEBALL}, {
0, XI_DATAGLOVE}, {
0, XI_EYETRACKER}, {
0, XI_CURSORKEYS}, {
0, XI_FOOTMOUSE}};
{0, XI_KEYBOARD},
{0, XI_MOUSE},
{0, XI_TABLET},
{0, XI_TOUCHSCREEN},
{0, XI_TOUCHPAD},
{0, XI_BARCODE},
{0, XI_BUTTONBOX},
{0, XI_KNOB_BOX},
{0, XI_ONE_KNOB},
{0, XI_NINE_KNOB},
{0, XI_TRACKBALL},
{0, XI_QUADRATURE},
{0, XI_ID_MODULE},
{0, XI_SPACEBALL},
{0, XI_DATAGLOVE},
{0, XI_EYETRACKER},
{0, XI_CURSORKEYS},
{0, XI_FOOTMOUSE}
};
CARD8 event_base[numInputClasses];
XExtEventInfo EventInfo[32];

251
Xi/xiproperty.c
View File

@ -49,132 +49,131 @@ static struct dev_properties {
Atom type;
const char *name;
} dev_properties[] = {
{
0, XI_PROP_ENABLED}, {
0, XI_PROP_XTEST_DEVICE}, {
0, XATOM_FLOAT}, {
0, ACCEL_PROP_PROFILE_NUMBER}, {
0, ACCEL_PROP_CONSTANT_DECELERATION}, {
0, ACCEL_PROP_ADAPTIVE_DECELERATION}, {
0, ACCEL_PROP_VELOCITY_SCALING}, {
0, AXIS_LABEL_PROP}, {
0, AXIS_LABEL_PROP_REL_X}, {
0, AXIS_LABEL_PROP_REL_Y}, {
0, AXIS_LABEL_PROP_REL_Z}, {
0, AXIS_LABEL_PROP_REL_RX}, {
0, AXIS_LABEL_PROP_REL_RY}, {
0, AXIS_LABEL_PROP_REL_RZ}, {
0, AXIS_LABEL_PROP_REL_HWHEEL}, {
0, AXIS_LABEL_PROP_REL_DIAL}, {
0, AXIS_LABEL_PROP_REL_WHEEL}, {
0, AXIS_LABEL_PROP_REL_MISC}, {
0, AXIS_LABEL_PROP_REL_VSCROLL}, {
0, AXIS_LABEL_PROP_REL_HSCROLL}, {
0, AXIS_LABEL_PROP_ABS_X}, {
0, AXIS_LABEL_PROP_ABS_Y}, {
0, AXIS_LABEL_PROP_ABS_Z}, {
0, AXIS_LABEL_PROP_ABS_RX}, {
0, AXIS_LABEL_PROP_ABS_RY}, {
0, AXIS_LABEL_PROP_ABS_RZ}, {
0, AXIS_LABEL_PROP_ABS_THROTTLE}, {
0, AXIS_LABEL_PROP_ABS_RUDDER}, {
0, AXIS_LABEL_PROP_ABS_WHEEL}, {
0, AXIS_LABEL_PROP_ABS_GAS}, {
0, AXIS_LABEL_PROP_ABS_BRAKE}, {
0, AXIS_LABEL_PROP_ABS_HAT0X}, {
0, AXIS_LABEL_PROP_ABS_HAT0Y}, {
0, AXIS_LABEL_PROP_ABS_HAT1X}, {
0, AXIS_LABEL_PROP_ABS_HAT1Y}, {
0, AXIS_LABEL_PROP_ABS_HAT2X}, {
0, AXIS_LABEL_PROP_ABS_HAT2Y}, {
0, AXIS_LABEL_PROP_ABS_HAT3X}, {
0, AXIS_LABEL_PROP_ABS_HAT3Y}, {
0, AXIS_LABEL_PROP_ABS_PRESSURE}, {
0, AXIS_LABEL_PROP_ABS_DISTANCE}, {
0, AXIS_LABEL_PROP_ABS_TILT_X}, {
0, AXIS_LABEL_PROP_ABS_TILT_Y}, {
0, AXIS_LABEL_PROP_ABS_TOOL_WIDTH}, {
0, AXIS_LABEL_PROP_ABS_VOLUME}, {
0, AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR}, {
0, AXIS_LABEL_PROP_ABS_MT_TOUCH_MINOR}, {
0, AXIS_LABEL_PROP_ABS_MT_WIDTH_MAJOR}, {
0, AXIS_LABEL_PROP_ABS_MT_WIDTH_MINOR}, {
0, AXIS_LABEL_PROP_ABS_MT_ORIENTATION}, {
0, AXIS_LABEL_PROP_ABS_MT_POSITION_X}, {
0, AXIS_LABEL_PROP_ABS_MT_POSITION_Y}, {
0, AXIS_LABEL_PROP_ABS_MT_TOOL_TYPE}, {
0, AXIS_LABEL_PROP_ABS_MT_BLOB_ID}, {
0, AXIS_LABEL_PROP_ABS_MT_TRACKING_ID}, {
0, AXIS_LABEL_PROP_ABS_MT_PRESSURE}, {
0, AXIS_LABEL_PROP_ABS_MISC}, {
0, BTN_LABEL_PROP}, {
0, BTN_LABEL_PROP_BTN_UNKNOWN}, {
0, BTN_LABEL_PROP_BTN_WHEEL_UP}, {
0, BTN_LABEL_PROP_BTN_WHEEL_DOWN}, {
0, BTN_LABEL_PROP_BTN_HWHEEL_LEFT}, {
0, BTN_LABEL_PROP_BTN_HWHEEL_RIGHT}, {
0, BTN_LABEL_PROP_BTN_0}, {
0, BTN_LABEL_PROP_BTN_1}, {
0, BTN_LABEL_PROP_BTN_2}, {
0, BTN_LABEL_PROP_BTN_3}, {
0, BTN_LABEL_PROP_BTN_4}, {
0, BTN_LABEL_PROP_BTN_5}, {
0, BTN_LABEL_PROP_BTN_6}, {
0, BTN_LABEL_PROP_BTN_7}, {
0, BTN_LABEL_PROP_BTN_8}, {
0, BTN_LABEL_PROP_BTN_9}, {
0, BTN_LABEL_PROP_BTN_LEFT}, {
0, BTN_LABEL_PROP_BTN_RIGHT}, {
0, BTN_LABEL_PROP_BTN_MIDDLE}, {
0, BTN_LABEL_PROP_BTN_SIDE}, {
0, BTN_LABEL_PROP_BTN_EXTRA}, {
0, BTN_LABEL_PROP_BTN_FORWARD}, {
0, BTN_LABEL_PROP_BTN_BACK}, {
0, BTN_LABEL_PROP_BTN_TASK}, {
0, BTN_LABEL_PROP_BTN_TRIGGER}, {
0, BTN_LABEL_PROP_BTN_THUMB}, {
0, BTN_LABEL_PROP_BTN_THUMB2}, {
0, BTN_LABEL_PROP_BTN_TOP}, {
0, BTN_LABEL_PROP_BTN_TOP2}, {
0, BTN_LABEL_PROP_BTN_PINKIE}, {
0, BTN_LABEL_PROP_BTN_BASE}, {
0, BTN_LABEL_PROP_BTN_BASE2}, {
0, BTN_LABEL_PROP_BTN_BASE3}, {
0, BTN_LABEL_PROP_BTN_BASE4}, {
0, BTN_LABEL_PROP_BTN_BASE5}, {
0, BTN_LABEL_PROP_BTN_BASE6}, {
0, BTN_LABEL_PROP_BTN_DEAD}, {
0, BTN_LABEL_PROP_BTN_A}, {
0, BTN_LABEL_PROP_BTN_B}, {
0, BTN_LABEL_PROP_BTN_C}, {
0, BTN_LABEL_PROP_BTN_X}, {
0, BTN_LABEL_PROP_BTN_Y}, {
0, BTN_LABEL_PROP_BTN_Z}, {
0, BTN_LABEL_PROP_BTN_TL}, {
0, BTN_LABEL_PROP_BTN_TR}, {
0, BTN_LABEL_PROP_BTN_TL2}, {
0, BTN_LABEL_PROP_BTN_TR2}, {
0, BTN_LABEL_PROP_BTN_SELECT}, {
0, BTN_LABEL_PROP_BTN_START}, {
0, BTN_LABEL_PROP_BTN_MODE}, {
0, BTN_LABEL_PROP_BTN_THUMBL}, {
0, BTN_LABEL_PROP_BTN_THUMBR}, {
0, BTN_LABEL_PROP_BTN_TOOL_PEN}, {
0, BTN_LABEL_PROP_BTN_TOOL_RUBBER}, {
0, BTN_LABEL_PROP_BTN_TOOL_BRUSH}, {
0, BTN_LABEL_PROP_BTN_TOOL_PENCIL}, {
0, BTN_LABEL_PROP_BTN_TOOL_AIRBRUSH}, {
0, BTN_LABEL_PROP_BTN_TOOL_FINGER}, {
0, BTN_LABEL_PROP_BTN_TOOL_MOUSE}, {
0, BTN_LABEL_PROP_BTN_TOOL_LENS}, {
0, BTN_LABEL_PROP_BTN_TOUCH}, {
0, BTN_LABEL_PROP_BTN_STYLUS}, {
0, BTN_LABEL_PROP_BTN_STYLUS2}, {
0, BTN_LABEL_PROP_BTN_TOOL_DOUBLETAP}, {
0, BTN_LABEL_PROP_BTN_TOOL_TRIPLETAP}, {
0, BTN_LABEL_PROP_BTN_GEAR_DOWN}, {
0, BTN_LABEL_PROP_BTN_GEAR_UP}, {
0, XI_PROP_TRANSFORM}
{0, XI_PROP_ENABLED},
{0, XI_PROP_XTEST_DEVICE},
{0, XATOM_FLOAT},
{0, ACCEL_PROP_PROFILE_NUMBER},
{0, ACCEL_PROP_CONSTANT_DECELERATION},
{0, ACCEL_PROP_ADAPTIVE_DECELERATION},
{0, ACCEL_PROP_VELOCITY_SCALING},
{0, AXIS_LABEL_PROP},
{0, AXIS_LABEL_PROP_REL_X},
{0, AXIS_LABEL_PROP_REL_Y},
{0, AXIS_LABEL_PROP_REL_Z},
{0, AXIS_LABEL_PROP_REL_RX},
{0, AXIS_LABEL_PROP_REL_RY},
{0, AXIS_LABEL_PROP_REL_RZ},
{0, AXIS_LABEL_PROP_REL_HWHEEL},
{0, AXIS_LABEL_PROP_REL_DIAL},
{0, AXIS_LABEL_PROP_REL_WHEEL},
{0, AXIS_LABEL_PROP_REL_MISC},
{0, AXIS_LABEL_PROP_REL_VSCROLL},
{0, AXIS_LABEL_PROP_REL_HSCROLL},
{0, AXIS_LABEL_PROP_ABS_X},
{0, AXIS_LABEL_PROP_ABS_Y},
{0, AXIS_LABEL_PROP_ABS_Z},
{0, AXIS_LABEL_PROP_ABS_RX},
{0, AXIS_LABEL_PROP_ABS_RY},
{0, AXIS_LABEL_PROP_ABS_RZ},
{0, AXIS_LABEL_PROP_ABS_THROTTLE},
{0, AXIS_LABEL_PROP_ABS_RUDDER},
{0, AXIS_LABEL_PROP_ABS_WHEEL},
{0, AXIS_LABEL_PROP_ABS_GAS},
{0, AXIS_LABEL_PROP_ABS_BRAKE},
{0, AXIS_LABEL_PROP_ABS_HAT0X},
{0, AXIS_LABEL_PROP_ABS_HAT0Y},
{0, AXIS_LABEL_PROP_ABS_HAT1X},
{0, AXIS_LABEL_PROP_ABS_HAT1Y},
{0, AXIS_LABEL_PROP_ABS_HAT2X},
{0, AXIS_LABEL_PROP_ABS_HAT2Y},
{0, AXIS_LABEL_PROP_ABS_HAT3X},
{0, AXIS_LABEL_PROP_ABS_HAT3Y},
{0, AXIS_LABEL_PROP_ABS_PRESSURE},
{0, AXIS_LABEL_PROP_ABS_DISTANCE},
{0, AXIS_LABEL_PROP_ABS_TILT_X},
{0, AXIS_LABEL_PROP_ABS_TILT_Y},
{0, AXIS_LABEL_PROP_ABS_TOOL_WIDTH},
{0, AXIS_LABEL_PROP_ABS_VOLUME},
{0, AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR},
{0, AXIS_LABEL_PROP_ABS_MT_TOUCH_MINOR},
{0, AXIS_LABEL_PROP_ABS_MT_WIDTH_MAJOR},
{0, AXIS_LABEL_PROP_ABS_MT_WIDTH_MINOR},
{0, AXIS_LABEL_PROP_ABS_MT_ORIENTATION},
{0, AXIS_LABEL_PROP_ABS_MT_POSITION_X},
{0, AXIS_LABEL_PROP_ABS_MT_POSITION_Y},
{0, AXIS_LABEL_PROP_ABS_MT_TOOL_TYPE},
{0, AXIS_LABEL_PROP_ABS_MT_BLOB_ID},
{0, AXIS_LABEL_PROP_ABS_MT_TRACKING_ID},
{0, AXIS_LABEL_PROP_ABS_MT_PRESSURE},
{0, AXIS_LABEL_PROP_ABS_MISC},
{0, BTN_LABEL_PROP},
{0, BTN_LABEL_PROP_BTN_UNKNOWN},
{0, BTN_LABEL_PROP_BTN_WHEEL_UP},
{0, BTN_LABEL_PROP_BTN_WHEEL_DOWN},
{0, BTN_LABEL_PROP_BTN_HWHEEL_LEFT},
{0, BTN_LABEL_PROP_BTN_HWHEEL_RIGHT},
{0, BTN_LABEL_PROP_BTN_0},
{0, BTN_LABEL_PROP_BTN_1},
{0, BTN_LABEL_PROP_BTN_2},
{0, BTN_LABEL_PROP_BTN_3},
{0, BTN_LABEL_PROP_BTN_4},
{0, BTN_LABEL_PROP_BTN_5},
{0, BTN_LABEL_PROP_BTN_6},
{0, BTN_LABEL_PROP_BTN_7},
{0, BTN_LABEL_PROP_BTN_8},
{0, BTN_LABEL_PROP_BTN_9},
{0, BTN_LABEL_PROP_BTN_LEFT},
{0, BTN_LABEL_PROP_BTN_RIGHT},
{0, BTN_LABEL_PROP_BTN_MIDDLE},
{0, BTN_LABEL_PROP_BTN_SIDE},
{0, BTN_LABEL_PROP_BTN_EXTRA},
{0, BTN_LABEL_PROP_BTN_FORWARD},
{0, BTN_LABEL_PROP_BTN_BACK},
{0, BTN_LABEL_PROP_BTN_TASK},
{0, BTN_LABEL_PROP_BTN_TRIGGER},
{0, BTN_LABEL_PROP_BTN_THUMB},
{0, BTN_LABEL_PROP_BTN_THUMB2},
{0, BTN_LABEL_PROP_BTN_TOP},
{0, BTN_LABEL_PROP_BTN_TOP2},
{0, BTN_LABEL_PROP_BTN_PINKIE},
{0, BTN_LABEL_PROP_BTN_BASE},
{0, BTN_LABEL_PROP_BTN_BASE2},
{0, BTN_LABEL_PROP_BTN_BASE3},
{0, BTN_LABEL_PROP_BTN_BASE4},
{0, BTN_LABEL_PROP_BTN_BASE5},
{0, BTN_LABEL_PROP_BTN_BASE6},
{0, BTN_LABEL_PROP_BTN_DEAD},
{0, BTN_LABEL_PROP_BTN_A},
{0, BTN_LABEL_PROP_BTN_B},
{0, BTN_LABEL_PROP_BTN_C},
{0, BTN_LABEL_PROP_BTN_X},
{0, BTN_LABEL_PROP_BTN_Y},
{0, BTN_LABEL_PROP_BTN_Z},
{0, BTN_LABEL_PROP_BTN_TL},
{0, BTN_LABEL_PROP_BTN_TR},
{0, BTN_LABEL_PROP_BTN_TL2},
{0, BTN_LABEL_PROP_BTN_TR2},
{0, BTN_LABEL_PROP_BTN_SELECT},
{0, BTN_LABEL_PROP_BTN_START},
{0, BTN_LABEL_PROP_BTN_MODE},
{0, BTN_LABEL_PROP_BTN_THUMBL},
{0, BTN_LABEL_PROP_BTN_THUMBR},
{0, BTN_LABEL_PROP_BTN_TOOL_PEN},
{0, BTN_LABEL_PROP_BTN_TOOL_RUBBER},
{0, BTN_LABEL_PROP_BTN_TOOL_BRUSH},
{0, BTN_LABEL_PROP_BTN_TOOL_PENCIL},
{0, BTN_LABEL_PROP_BTN_TOOL_AIRBRUSH},
{0, BTN_LABEL_PROP_BTN_TOOL_FINGER},
{0, BTN_LABEL_PROP_BTN_TOOL_MOUSE},
{0, BTN_LABEL_PROP_BTN_TOOL_LENS},
{0, BTN_LABEL_PROP_BTN_TOUCH},
{0, BTN_LABEL_PROP_BTN_STYLUS},
{0, BTN_LABEL_PROP_BTN_STYLUS2},
{0, BTN_LABEL_PROP_BTN_TOOL_DOUBLETAP},
{0, BTN_LABEL_PROP_BTN_TOOL_TRIPLETAP},
{0, BTN_LABEL_PROP_BTN_GEAR_DOWN},
{0, BTN_LABEL_PROP_BTN_GEAR_UP},
{0, XI_PROP_TRANSFORM}
};
static long XIPropHandlerID = 1;

6
config/wscons.c
View File

@ -53,8 +53,10 @@ struct nameint {
int val;
char *name;
} kbdenc[] = {
KB_OVRENC, KB_ENCTAB, {
0}};
KB_OVRENC,
KB_ENCTAB,
{0}
};
struct nameint kbdvar[] = {
{KB_NODEAD | KB_SG, "de_nodeadkeys"},

10
dix/gc.c
View File

@ -419,11 +419,11 @@ static const struct {
RESTYPE type;
Mask access_mode;
} xidfields[] = {
{
GCTile, RT_PIXMAP, DixReadAccess}, {
GCStipple, RT_PIXMAP, DixReadAccess}, {
GCFont, RT_FONT, DixUseAccess}, {
GCClipMask, RT_PIXMAP, DixReadAccess},};
{GCTile, RT_PIXMAP, DixReadAccess},
{GCStipple, RT_PIXMAP, DixReadAccess},
{GCFont, RT_FONT, DixUseAccess},
{GCClipMask, RT_PIXMAP, DixReadAccess},
};
int
ChangeGCXIDs(ClientPtr client, GC * pGC, BITS32 mask, CARD32 *pC32)

955
dix/tables.c
View File

File diff suppressed because it is too large Load Diff

33
hw/kdrive/ephyr/ephyr.c
View File

@ -415,23 +415,22 @@ ephyrRandRGetInfo(ScreenPtr pScreen, Rotation * rotations)
struct {
int width, height;
} sizes[] = {
{
1600, 1200}, {
1400, 1050}, {
1280, 960}, {
1280, 1024}, {
1152, 864}, {
1024, 768}, {
832, 624}, {
800, 600}, {
720, 400}, {
480, 640}, {
640, 480}, {
640, 400}, {
320, 240}, {
240, 320}, {
160, 160}, {
0, 0}
{1600, 1200},
{1400, 1050},
{1280, 960},
{1280, 1024},
{1152, 864},
{1024, 768},
{832, 624},
{800, 600},
{720, 400},
{480, 640},
{640, 480},
{640, 400},
{320, 240},
{240, 320},
{160, 160},
{0, 0}
};
EPHYR_LOG("mark");

20
hw/kdrive/src/kdrive.c
View File

@ -730,22 +730,22 @@ KdSetSubpixelOrder(ScreenPtr pScreen, Rotation randr)
int subpixel_order;
Rotation direction;
} orders[] = {
{
SubPixelHorizontalRGB, RR_Rotate_0}, {
SubPixelHorizontalBGR, RR_Rotate_180}, {
SubPixelVerticalRGB, RR_Rotate_270}, {
SubPixelVerticalBGR, RR_Rotate_90},};
{SubPixelHorizontalRGB, RR_Rotate_0},
{SubPixelHorizontalBGR, RR_Rotate_180},
{SubPixelVerticalRGB, RR_Rotate_270},
{SubPixelVerticalBGR, RR_Rotate_90},
};
static struct {
int bit;
int normal;
int reflect;
} reflects[] = {
{
RR_Reflect_X, SubPixelHorizontalRGB, SubPixelHorizontalBGR}, {
RR_Reflect_X, SubPixelHorizontalBGR, SubPixelHorizontalRGB}, {
RR_Reflect_Y, SubPixelVerticalRGB, SubPixelVerticalBGR}, {
RR_Reflect_Y, SubPixelVerticalRGB, SubPixelVerticalRGB},};
{RR_Reflect_X, SubPixelHorizontalRGB, SubPixelHorizontalBGR},
{RR_Reflect_X, SubPixelHorizontalBGR, SubPixelHorizontalRGB},
{RR_Reflect_Y, SubPixelVerticalRGB, SubPixelVerticalBGR},
{RR_Reflect_Y, SubPixelVerticalRGB, SubPixelVerticalRGB},
};
/* map subpixel to direction */
for (i = 0; i < 4; i++)

13
hw/xfree86/loader/loader.c
View File

@ -195,13 +195,12 @@ LoaderGetABIVersion(const char *abiclass)
const char *name;
int version;
} classes[] = {
{
ABI_CLASS_ANSIC, LoaderVersionInfo.ansicVersion}, {
ABI_CLASS_VIDEODRV, LoaderVersionInfo.videodrvVersion}, {
ABI_CLASS_XINPUT, LoaderVersionInfo.xinputVersion}, {
ABI_CLASS_EXTENSION, LoaderVersionInfo.extensionVersion}, {
ABI_CLASS_FONT, LoaderVersionInfo.fontVersion}, {
NULL, 0}
{ABI_CLASS_ANSIC, LoaderVersionInfo.ansicVersion},
{ABI_CLASS_VIDEODRV, LoaderVersionInfo.videodrvVersion},
{ABI_CLASS_XINPUT, LoaderVersionInfo.xinputVersion},
{ABI_CLASS_EXTENSION, LoaderVersionInfo.extensionVersion},
{ABI_CLASS_FONT, LoaderVersionInfo.fontVersion},
{NULL, 0}
};
int i;

171
hw/xfree86/modes/xf86DisplayIDModes.c
View File

@ -184,105 +184,96 @@ static const struct did_dmt {
short w, h, r, f;
} did_dmt[] = {
/* byte 3 */
{
640, 350, 85, 0}, {
640, 400, 85, 0}, {
720, 400, 85, 0}, {
640, 480, 60, 0}, {
640, 480, 72, 0}, {
640, 480, 75, 0}, {
640, 480, 85, 0}, {
800, 600, 56, 0},
{640, 350, 85, 0},
{640, 400, 85, 0},
{720, 400, 85, 0},
{640, 480, 60, 0},
{640, 480, 72, 0},
{640, 480, 75, 0},
{640, 480, 85, 0},
{800, 600, 56, 0},
/* byte 4 */
{
800, 600, 60, 0}, {
800, 600, 72, 0}, {
800, 600, 75, 0}, {
800, 600, 85, 0}, {
800, 600, 120, RB}, {
848, 480, 60, 0}, {
1024, 768, 43, INT}, {
1024, 768, 60, 0},
{800, 600, 60, 0},
{800, 600, 72, 0},
{800, 600, 75, 0},
{800, 600, 85, 0},
{800, 600, 120, RB},
{848, 480, 60, 0},
{1024, 768, 43, INT},
{1024, 768, 60, 0},
/* byte 5 */
{
1024, 768, 70, 0}, {
1024, 768, 75, 0}, {
1024, 768, 85, 0}, {
1024, 768, 120, RB}, {
1152, 864, 75, 0}, {
1280, 768, 60, RB}, {
1280, 768, 60, 0}, {
1280, 768, 75, 0},
{1024, 768, 70, 0},
{1024, 768, 75, 0},
{1024, 768, 85, 0},
{1024, 768, 120, RB},
{1152, 864, 75, 0},
{1280, 768, 60, RB},
{1280, 768, 60, 0},
{1280, 768, 75, 0},
/* byte 6 */
{
1280, 768, 85, 0}, {
1280, 768, 120, RB}, {
1280, 800, 60, RB}, {
1280, 800, 60, 0}, {
1280, 800, 75, 0}, {
1280, 800, 85, 0}, {
1280, 800, 120, RB}, {
1280, 960, 60, 0},
{1280, 768, 85, 0},
{1280, 768, 120, RB},
{1280, 800, 60, RB},
{1280, 800, 60, 0},
{1280, 800, 75, 0},
{1280, 800, 85, 0},
{1280, 800, 120, RB},
{1280, 960, 60, 0},
/* byte 7 */
{
1280, 960, 85, 0}, {
1280, 960, 120, RB}, {
1280, 1024, 60, 0}, {
1280, 1024, 75, 0}, {
1280, 1024, 85, 0}, {
1280, 1024, 120, RB}, {
1360, 768, 60, 0}, {
1360, 768, 120, RB},
{1280, 960, 85, 0},
{1280, 960, 120, RB},
{1280, 1024, 60, 0},
{1280, 1024, 75, 0},
{1280, 1024, 85, 0},
{1280, 1024, 120, RB},
{1360, 768, 60, 0},
{1360, 768, 120, RB},
/* byte 8 */
{
1400, 1050, 60, RB}, {
1400, 1050, 60, 0}, {
1400, 1050, 75, 0}, {
1400, 1050, 85, 0}, {
1400, 1050, 120, RB}, {
1440, 900, 60, RB}, {
1440, 900, 60, 0}, {
1440, 900, 75, 0},
{1400, 1050, 60, RB},
{1400, 1050, 60, 0},
{1400, 1050, 75, 0},
{1400, 1050, 85, 0},
{1400, 1050, 120, RB},
{1440, 900, 60, RB},
{1440, 900, 60, 0},
{1440, 900, 75, 0},
/* byte 9 */
{
1440, 900, 85, 0}, {
1440, 900, 120, RB}, {
1600, 1200, 60, 0}, {
1600, 1200, 65, 0}, {
1600, 1200, 70, 0}, {
1600, 1200, 75, 0}, {
1600, 1200, 85, 0}, {
1600, 1200, 120, RB},
{1440, 900, 85, 0},
{1440, 900, 120, RB},
{1600, 1200, 60, 0},
{1600, 1200, 65, 0},
{1600, 1200, 70, 0},
{1600, 1200, 75, 0},
{1600, 1200, 85, 0},
{1600, 1200, 120, RB},
/* byte a */
{
1680, 1050, 60, RB}, {
1680, 1050, 60, 0}, {
1680, 1050, 75, 0}, {
1680, 1050, 85, 0}, {
1680, 1050, 120, RB}, {
1792, 1344, 60, 0}, {
1792, 1344, 75, 0}, {
1792, 1344, 120, RB},
{1680, 1050, 60, RB},
{1680, 1050, 60, 0},
{1680, 1050, 75, 0},
{1680, 1050, 85, 0},
{1680, 1050, 120, RB},
{1792, 1344, 60, 0},
{1792, 1344, 75, 0},
{1792, 1344, 120, RB},
/* byte b */
{
1856, 1392, 60, 0}, {
1856, 1392, 75, 0}, {
1856, 1392, 120, RB}, {
1920, 1200, 60, RB}, {
1920, 1200, 60, 0}, {
1920, 1200, 75, 0}, {
1920, 1200, 85, 0}, {
1920, 1200, 120, RB},
{1856, 1392, 60, 0},
{1856, 1392, 75, 0},
{1856, 1392, 120, RB},
{1920, 1200, 60, RB},
{1920, 1200, 60, 0},
{1920, 1200, 75, 0},
{1920, 1200, 85, 0},
{1920, 1200, 120, RB},
/* byte c */
{
1920, 1440, 60, 0}, {
1920, 1440, 75, 0}, {
1920, 1440, 120, RB}, {
2560, 1600, 60, RB}, {
2560, 1600, 60, 0}, {
2560, 1600, 75, 0}, {
2560, 1600, 85, 0}, {
2560, 1600, 120, RB},};
{1920, 1440, 60, 0},
{1920, 1440, 75, 0},
{1920, 1440, 120, RB},
{2560, 1600, 60, RB},
{2560, 1600, 60, 0},
{2560, 1600, 75, 0},
{2560, 1600, 85, 0},
{2560, 1600, 120, RB},
};
static void
didVesaTiming(int scrn, unsigned char *x, MonPtr mon)

122
hw/xfree86/modes/xf86EdidModes.c
View File

@ -513,14 +513,14 @@ DDCModeDoInterlaceQuirks(DisplayModePtr mode)
static const struct {
int w, h;
} cea_interlaced[] = {
{
1920, 1080}, {
720, 480}, {
1440, 480}, {
2880, 480}, {
720, 576}, {
1440, 576}, {
2880, 576},};
{1920, 1080},
{720, 480},
{1440, 480},
{2880, 480},
{720, 576},
{1440, 576},
{2880, 576},
};
static const int n_modes =
sizeof(cea_interlaced) / sizeof(cea_interlaced[0]);
int i;
@ -668,68 +668,62 @@ static const struct {
short r;
short rb;
} EstIIIModes[] = {
/* byte 6 */
{
640, 350, 85, 0}, {
640, 400, 85, 0}, {
720, 400, 85, 0}, {
640, 480, 85, 0}, {
848, 480, 60, 0}, {
800, 600, 85, 0}, {
1024, 768, 85, 0}, {
1152, 864, 75, 0},
/* byte 6 */
{640, 350, 85, 0},
{640, 400, 85, 0},
{720, 400, 85, 0},
{640, 480, 85, 0},
{848, 480, 60, 0},
{800, 600, 85, 0},
{1024, 768, 85, 0},
{1152, 864, 75, 0},
/* byte 7 */
{
1280, 768, 60, 1}, {
1280, 768, 60, 0}, {
1280, 768, 75, 0}, {
1280, 768, 85, 0}, {
1280, 960, 60, 0}, {
1280, 960, 85, 0}, {
1280, 1024, 60, 0}, {
1280, 1024, 85, 0},
{1280, 768, 60, 1},
{1280, 768, 60, 0},
{1280, 768, 75, 0},
{1280, 768, 85, 0},
{1280, 960, 60, 0},
{1280, 960, 85, 0},
{1280, 1024, 60, 0},
{1280, 1024, 85, 0},
/* byte 8 */
{
1360, 768, 60, 0}, {
1440, 900, 60, 1}, {
1440, 900, 60, 0}, {
1440, 900, 75, 0}, {
1440, 900, 85, 0}, {
1400, 1050, 60, 1}, {
1400, 1050, 60, 0}, {
1400, 1050, 75, 0},
{1360, 768, 60, 0},
{1440, 900, 60, 1},
{1440, 900, 60, 0},
{1440, 900, 75, 0},
{1440, 900, 85, 0},
{1400, 1050, 60, 1},
{1400, 1050, 60, 0},
{1400, 1050, 75, 0},
/* byte 9 */
{
1400, 1050, 85, 0}, {
1680, 1050, 60, 1}, {
1680, 1050, 60, 0}, {
1680, 1050, 75, 0}, {
1680, 1050, 85, 0}, {
1600, 1200, 60, 0}, {
1600, 1200, 65, 0}, {
1600, 1200, 70, 0},
{1400, 1050, 85, 0},
{1680, 1050, 60, 1},
{1680, 1050, 60, 0},
{1680, 1050, 75, 0},
{1680, 1050, 85, 0},
{1600, 1200, 60, 0},
{1600, 1200, 65, 0},
{1600, 1200, 70, 0},
/* byte 10 */
{
1600, 1200, 75, 0}, {
1600, 1200, 85, 0}, {
1792, 1344, 60, 0}, {
1792, 1344, 85, 0}, {
1856, 1392, 60, 0}, {
1856, 1392, 75, 0}, {
1920, 1200, 60, 1}, {
1920, 1200, 60, 0},
{1600, 1200, 75, 0},
{1600, 1200, 85, 0},
{1792, 1344, 60, 0},
{1792, 1344, 85, 0},
{1856, 1392, 60, 0},
{1856, 1392, 75, 0},
{1920, 1200, 60, 1},
{1920, 1200, 60, 0},
/* byte 11 */
{
1920, 1200, 75, 0}, {
1920, 1200, 85, 0}, {
1920, 1440, 60, 0}, {
1920, 1440, 75, 0},
{1920, 1200, 75, 0},
{1920, 1200, 85, 0},
{1920, 1440, 60, 0},
{1920, 1440, 75, 0},
/* fill up last byte */
{
0,0,0,0}, {
0,0,0,0}, {
0,0,0,0}, {
0,0,0,0}, };
{0,0,0,0},
{0,0,0,0},
{0,0,0,0},
{0,0,0,0},
};
static DisplayModePtr
DDCModesFromEstIII(unsigned char *est)

26
hw/xfree86/os-support/bsd/bsd_apm.c
View File

@ -21,21 +21,19 @@ static struct {
u_int apmBsd;
pmEvent xf86;
} bsdToXF86Array[] = {
{
APM_STANDBY_REQ, XF86_APM_SYS_STANDBY}, {
APM_SUSPEND_REQ, XF86_APM_SYS_SUSPEND}, {
APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME}, {
APM_CRIT_RESUME, XF86_APM_CRITICAL_RESUME}, {
APM_BATTERY_LOW, XF86_APM_LOW_BATTERY}, {
APM_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE}, {
APM_UPDATE_TIME, XF86_APM_UPDATE_TIME}, {
APM_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND}, {
APM_USER_STANDBY_REQ, XF86_APM_USER_STANDBY}, {
APM_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND}, {
APM_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
{APM_STANDBY_REQ, XF86_APM_SYS_STANDBY},
{APM_SUSPEND_REQ, XF86_APM_SYS_SUSPEND},
{APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME},
{APM_CRIT_RESUME, XF86_APM_CRITICAL_RESUME},
{APM_BATTERY_LOW, XF86_APM_LOW_BATTERY},
{APM_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE},
{APM_UPDATE_TIME, XF86_APM_UPDATE_TIME},
{APM_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND},
{APM_USER_STANDBY_REQ, XF86_APM_USER_STANDBY},
{APM_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND},
{APM_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
#ifdef APM_CAPABILITY_CHANGE
{
APM_CAPABILITY_CHANGE, XF86_APM_CAPABILITY_CHANGED},
{APM_CAPABILITY_CHANGE, XF86_APM_CAPABILITY_CHANGED},
#endif
};

26
hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
View File

@ -54,21 +54,19 @@ static struct {
u_int apmBsd;
pmEvent xf86;
} bsdToXF86Array[] = {
{
APM_STANDBY_REQ, XF86_APM_SYS_STANDBY}, {
APM_SUSPEND_REQ, XF86_APM_SYS_SUSPEND}, {
APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME}, {
APM_CRIT_RESUME, XF86_APM_CRITICAL_RESUME}, {
APM_BATTERY_LOW, XF86_APM_LOW_BATTERY}, {
APM_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE}, {
APM_UPDATE_TIME, XF86_APM_UPDATE_TIME}, {
APM_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND}, {
APM_USER_STANDBY_REQ, XF86_APM_USER_STANDBY}, {
APM_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND}, {
APM_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
{APM_STANDBY_REQ, XF86_APM_SYS_STANDBY},
{APM_SUSPEND_REQ, XF86_APM_SYS_SUSPEND},
{APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME},
{APM_CRIT_RESUME, XF86_APM_CRITICAL_RESUME},
{APM_BATTERY_LOW, XF86_APM_LOW_BATTERY},
{APM_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE},
{APM_UPDATE_TIME, XF86_APM_UPDATE_TIME},
{APM_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND},
{APM_USER_STANDBY_REQ, XF86_APM_USER_STANDBY},
{APM_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND},
{APM_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
#ifdef APM_CAPABILITY_CHANGE
{
APM_CAPABILITY_CHANGE, XF86_APM_CAPABILITY_CHANGED},
{APM_CAPABILITY_CHANGE, XF86_APM_CAPABILITY_CHANGED},
#endif
};

20
hw/xfree86/os-support/bus/Sbus.c
View File

@ -403,16 +403,16 @@ sparcPromAssignNodes(void)
int devId;
char *prefix;
} procFbPrefixes[] = {
{
SBUS_DEVICE_BW2, "BWtwo"}, {
SBUS_DEVICE_CG14, "CGfourteen"}, {
SBUS_DEVICE_CG6, "CGsix"}, {
SBUS_DEVICE_CG3, "CGthree"}, {
SBUS_DEVICE_FFB, "Creator"}, {
SBUS_DEVICE_FFB, "Elite 3D"}, {
SBUS_DEVICE_LEO, "Leo"}, {
SBUS_DEVICE_TCX, "TCX"}, {
0, NULL},};
{SBUS_DEVICE_BW2, "BWtwo"},
{SBUS_DEVICE_CG14, "CGfourteen"},
{SBUS_DEVICE_CG6, "CGsix"},
{SBUS_DEVICE_CG3, "CGthree"},
{SBUS_DEVICE_FFB, "Creator"},
{SBUS_DEVICE_FFB, "Elite 3D"},
{SBUS_DEVICE_LEO, "Leo"},
{SBUS_DEVICE_TCX, "TCX"},
{0, NULL},
};
while (fscanf(f, "%d %63s\n", &fbNum, buffer) == 2) {
for (i = 0; procFbPrefixes[i].devId; i++)

31
hw/xfree86/os-support/linux/lnx_apm.c
View File

@ -42,26 +42,23 @@ static struct {
apm_event_t apmLinux;
pmEvent xf86;
} LinuxToXF86[] = {
{
APM_SYS_STANDBY, XF86_APM_SYS_STANDBY}, {
APM_SYS_SUSPEND, XF86_APM_SYS_SUSPEND}, {
APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME}, {
APM_CRITICAL_RESUME, XF86_APM_CRITICAL_RESUME}, {
APM_LOW_BATTERY, XF86_APM_LOW_BATTERY}, {
APM_POWER_STATUS_CHANGE, XF86_APM_POWER_STATUS_CHANGE}, {
APM_UPDATE_TIME, XF86_APM_UPDATE_TIME}, {
APM_CRITICAL_SUSPEND, XF86_APM_CRITICAL_SUSPEND}, {
APM_USER_STANDBY, XF86_APM_USER_STANDBY}, {
APM_USER_SUSPEND, XF86_APM_USER_SUSPEND}, {
APM_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
{APM_SYS_STANDBY, XF86_APM_SYS_STANDBY},
{APM_SYS_SUSPEND, XF86_APM_SYS_SUSPEND},
{APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME},
{APM_CRITICAL_RESUME, XF86_APM_CRITICAL_RESUME},
{APM_LOW_BATTERY, XF86_APM_LOW_BATTERY},
{APM_POWER_STATUS_CHANGE, XF86_APM_POWER_STATUS_CHANGE},
{APM_UPDATE_TIME, XF86_APM_UPDATE_TIME},
{APM_CRITICAL_SUSPEND, XF86_APM_CRITICAL_SUSPEND},
{APM_USER_STANDBY, XF86_APM_USER_STANDBY},
{APM_USER_SUSPEND, XF86_APM_USER_SUSPEND},
{APM_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
#if defined(APM_CAPABILITY_CHANGED)
{
APM_CAPABILITY_CHANGED, XF86_CAPABILITY_CHANGED},
{APM_CAPABILITY_CHANGED, XF86_CAPABILITY_CHANGED},
#endif
#if 0
{
APM_STANDBY_FAILED, XF86_APM_STANDBY_FAILED}, {
APM_SUSPEND_FAILED, XF86_APM_SUSPEND_FAILED}
{APM_STANDBY_FAILED, XF86_APM_STANDBY_FAILED},
{APM_SUSPEND_FAILED, XF86_APM_SUSPEND_FAILED}
#endif
};

26
hw/xfree86/os-support/solaris/sun_apm.c
View File

@ -97,21 +97,19 @@ static struct {
u_int apmBsd;
pmEvent xf86;
} sunToXF86Array[] = {
{
APM_STANDBY_REQ, XF86_APM_SYS_STANDBY}, {
APM_SUSPEND_REQ, XF86_APM_SYS_SUSPEND}, {
APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME}, {
APM_CRIT_RESUME, XF86_APM_CRITICAL_RESUME}, {
APM_BATTERY_LOW, XF86_APM_LOW_BATTERY}, {
APM_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE}, {
APM_UPDATE_TIME, XF86_APM_UPDATE_TIME}, {
APM_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND}, {
APM_USER_STANDBY_REQ, XF86_APM_USER_STANDBY}, {
APM_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND}, {
APM_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
{APM_STANDBY_REQ, XF86_APM_SYS_STANDBY},
{APM_SUSPEND_REQ, XF86_APM_SYS_SUSPEND},
{APM_NORMAL_RESUME, XF86_APM_NORMAL_RESUME},
{APM_CRIT_RESUME, XF86_APM_CRITICAL_RESUME},
{APM_BATTERY_LOW, XF86_APM_LOW_BATTERY},
{APM_POWER_CHANGE, XF86_APM_POWER_STATUS_CHANGE},
{APM_UPDATE_TIME, XF86_APM_UPDATE_TIME},
{APM_CRIT_SUSPEND_REQ, XF86_APM_CRITICAL_SUSPEND},
{APM_USER_STANDBY_REQ, XF86_APM_USER_STANDBY},
{APM_USER_SUSPEND_REQ, XF86_APM_USER_SUSPEND},
{APM_SYS_STANDBY_RESUME, XF86_APM_STANDBY_RESUME},
#ifdef APM_CAPABILITY_CHANGE
{
APM_CAPABILITY_CHANGE, XF86_APM_CAPABILITY_CHANGED},
{APM_CAPABILITY_CHANGE, XF86_APM_CAPABILITY_CHANGED},
#endif
};

4
randr/rrmode.c
View File

@ -89,8 +89,10 @@ RRModeCreate(xRRModeInfo * modeInfo, const char *name, ScreenPtr userScreen)
}
mode->mode.id = FakeClientID(0);
if (!AddResource(mode->mode.id, RRModeType, (pointer) mode))
if (!AddResource(mode->mode.id, RRModeType, (pointer) mode)) {
free(newModes);
return NULL;
}
modes = newModes;
modes[num_modes++] = mode;

12
randr/rrproperty.c
View File

@ -217,6 +217,8 @@ RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type,
!pScrPriv->rrOutputSetProperty(output->pScreen, output,
prop->propertyName, &new_value)) {
free(new_value.data);
if (add)
RRDestroyOutputProperty(prop);
return BadValue;
}
free(prop_value->data);
@ -342,12 +344,18 @@ RRConfigureOutputProperty(RROutputPtr output, Atom property,
/*
* ranges must have even number of values
*/
if (range && (num_values & 1))
if (range && (num_values & 1)) {
if (add)
RRDestroyOutputProperty(prop);
return BadMatch;
}
new_values = malloc(num_values * sizeof(INT32));
if (!new_values && num_values)
if (!new_values && num_values) {
if (add)
RRDestroyOutputProperty(prop);
return BadAlloc;
}
if (num_values)
memcpy(new_values, values, num_values * sizeof(INT32));

12
randr/rrproviderproperty.c
View File

@ -216,6 +216,8 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
if (pending && pScrPriv->rrProviderSetProperty &&
!pScrPriv->rrProviderSetProperty(provider->pScreen, provider,
prop->propertyName, &new_value)) {
if (add)
RRDestroyProviderProperty(prop);
free(new_value.data);
return BadValue;
}
@ -342,12 +344,18 @@ RRConfigureProviderProperty(RRProviderPtr provider, Atom property,
/*
* ranges must have even number of values
*/
if (range && (num_values & 1))
if (range && (num_values & 1)) {
if (add)
RRDestroyProviderProperty(prop);
return BadMatch;
}
new_values = malloc(num_values * sizeof(INT32));
if (!new_values && num_values)
if (!new_values && num_values) {
if (add)
RRDestroyProviderProperty(prop);
return BadAlloc;
}
if (num_values)
memcpy(new_values, values, num_values * sizeof(INT32));