From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 Mar 2012 10:05:55 +0100 Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update 23 Mar 2012 --- xorg-server/hw/xwin/winrop.c | 134 +++++++++++++++++++++---------------------- 1 file changed, 66 insertions(+), 68 deletions(-) (limited to 'xorg-server/hw/xwin/winrop.c') diff --git a/xorg-server/hw/xwin/winrop.c b/xorg-server/hw/xwin/winrop.c index f4818920a..1f9ff7320 100644 --- a/xorg-server/hw/xwin/winrop.c +++ b/xorg-server/hw/xwin/winrop.c @@ -37,108 +37,106 @@ #include "win.h" void -ROP16 (HDC hdc, int rop); - -int g_copyROP[16] = { 0xFF0062, /* GXclear - 0 */ - 0x8800C6, /* GXand - S & D */ - 0x440328, /* GXandReverse - S & !D */ - 0xCC0020, /* GXcopy - S */ - 0x220326, /* GXandInverted - !S & D */ - 0xAA0029, /* GXnoop - D */ - 0x660046, /* GXxor - S ^ D */ - 0xEE0086, /* GXor - S | D */ - 0x1100A6, /* GXnor - !S & !D */ - 0x990126, /* GXequiv - !S ^ D */ - 0x550009, /* GXinvert - !D */ - 0xDD0228, /* GXorReverse - S | !D */ - 0x330008, /* GXcopyInverted - !S */ - 0xBB0226, /* GXorInverted - !S | D */ - 0x7700C6, /* GXnand - !S | !D */ - 0x000042 /* GXset - 1 */ + ROP16(HDC hdc, int rop); + +int g_copyROP[16] = { 0xFF0062, /* GXclear - 0 */ + 0x8800C6, /* GXand - S & D */ + 0x440328, /* GXandReverse - S & !D */ + 0xCC0020, /* GXcopy - S */ + 0x220326, /* GXandInverted - !S & D */ + 0xAA0029, /* GXnoop - D */ + 0x660046, /* GXxor - S ^ D */ + 0xEE0086, /* GXor - S | D */ + 0x1100A6, /* GXnor - !S & !D */ + 0x990126, /* GXequiv - !S ^ D */ + 0x550009, /* GXinvert - !D */ + 0xDD0228, /* GXorReverse - S | !D */ + 0x330008, /* GXcopyInverted - !S */ + 0xBB0226, /* GXorInverted - !S | D */ + 0x7700C6, /* GXnand - !S | !D */ + 0x000042 /* GXset - 1 */ }; -int g_patternROP[16] = {0xFF0062, /* GXclear - 0 */ - 0xA000C9, /* GXand - P & D */ - 0xF50225, /* GXandReverse - P & !D */ - 0xF00021, /* GXcopy - P */ - 0x5F00E9, /* GXandInverted - !P & D */ - 0xAA0029, /* GXnoop - D */ - 0xA50065, /* GXxor - P ^ D */ - 0xA000C9, /* GXor - P | D */ - 0x5F00E9, /* GXnor - !P & !D */ - 0x5A0049, /* GXequiv - !P ^ D */ - 0x550009, /* GXinvert - !D */ - 0x500325, /* GXorReverse - P | !D */ - 0x0F0001, /* GXcopyInverted - !P */ - 0x0A0329, /* GXorInverted - !P | D */ - 0x0500A9, /* GXnand - !P | !D */ - 0x000042 /* GXset - 1 */ +int g_patternROP[16] = { 0xFF0062, /* GXclear - 0 */ + 0xA000C9, /* GXand - P & D */ + 0xF50225, /* GXandReverse - P & !D */ + 0xF00021, /* GXcopy - P */ + 0x5F00E9, /* GXandInverted - !P & D */ + 0xAA0029, /* GXnoop - D */ + 0xA50065, /* GXxor - P ^ D */ + 0xA000C9, /* GXor - P | D */ + 0x5F00E9, /* GXnor - !P & !D */ + 0x5A0049, /* GXequiv - !P ^ D */ + 0x550009, /* GXinvert - !D */ + 0x500325, /* GXorReverse - P | !D */ + 0x0F0001, /* GXcopyInverted - !P */ + 0x0A0329, /* GXorInverted - !P | D */ + 0x0500A9, /* GXnand - !P | !D */ + 0x000042 /* GXset - 1 */ }; - void -ROP16 (HDC hdc, int rop) +ROP16(HDC hdc, int rop) { - switch (rop) - { + switch (rop) { case GXclear: - SetROP2 (hdc, R2_BLACK); - break; + SetROP2(hdc, R2_BLACK); + break; case GXand: - SetROP2 (hdc, R2_MASKPEN); - break; + SetROP2(hdc, R2_MASKPEN); + break; case GXandReverse: - SetROP2 (hdc, R2_MASKPENNOT); - break; + SetROP2(hdc, R2_MASKPENNOT); + break; case GXcopy: - SetROP2 (hdc, R2_COPYPEN); - break; + SetROP2(hdc, R2_COPYPEN); + break; case GXnoop: - SetROP2 (hdc, R2_NOP); - break; + SetROP2(hdc, R2_NOP); + break; case GXxor: - SetROP2 (hdc, R2_XORPEN); - break; + SetROP2(hdc, R2_XORPEN); + break; case GXor: - SetROP2 (hdc, R2_MERGEPEN); - break; + SetROP2(hdc, R2_MERGEPEN); + break; case GXnor: - SetROP2 (hdc, R2_NOTMERGEPEN); - break; + SetROP2(hdc, R2_NOTMERGEPEN); + break; case GXequiv: - SetROP2 (hdc, R2_NOTXORPEN); - break; + SetROP2(hdc, R2_NOTXORPEN); + break; case GXinvert: - SetROP2 (hdc, R2_NOT); - break; + SetROP2(hdc, R2_NOT); + break; case GXorReverse: - SetROP2 (hdc, R2_MERGEPENNOT); - break; + SetROP2(hdc, R2_MERGEPENNOT); + break; case GXcopyInverted: - SetROP2 (hdc, R2_NOTCOPYPEN); - break; + SetROP2(hdc, R2_NOTCOPYPEN); + break; case GXorInverted: - SetROP2 (hdc, R2_MERGENOTPEN); - break; + SetROP2(hdc, R2_MERGENOTPEN); + break; case GXnand: - SetROP2 (hdc, R2_NOTMASKPEN); - break; + SetROP2(hdc, R2_NOTMASKPEN); + break; case GXset: - SetROP2 (hdc, R2_WHITE); - break; + SetROP2(hdc, R2_WHITE); + break; } } -- cgit v1.2.3