diff options
Diffstat (limited to 'xorg-server/hw/xwin')
| -rw-r--r-- | xorg-server/hw/xwin/Makefile.in | 14 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winprefsyacc.c | 425 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winprefsyacc.h | 12 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winwindowswm.c | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/xlaunch/config.h | 60 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/xlaunch/makefile | 79 |
6 files changed, 241 insertions, 353 deletions
diff --git a/xorg-server/hw/xwin/Makefile.in b/xorg-server/hw/xwin/Makefile.in index 59c383f89..af96f7508 100644 --- a/xorg-server/hw/xwin/Makefile.in +++ b/xorg-server/hw/xwin/Makefile.in @@ -258,6 +258,7 @@ DGA_LIBS = @DGA_LIBS@ DIX_CFLAGS = @DIX_CFLAGS@ DIX_LIB = @DIX_LIB@ DLLTOOL = @DLLTOOL@ +DLOPEN_LIBS = @DLOPEN_LIBS@ DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@ DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@ @@ -288,6 +289,13 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FONT100DPIDIR = @FONT100DPIDIR@ +FONT75DPIDIR = @FONT75DPIDIR@ +FONTMISCDIR = @FONTMISCDIR@ +FONTOTFDIR = @FONTOTFDIR@ +FONTROOTDIR = @FONTROOTDIR@ +FONTTTFDIR = @FONTTTFDIR@ +FONTTYPE1DIR = @FONTTYPE1DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ @@ -298,6 +306,7 @@ GREP = @GREP@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_LIBS = @HAL_LIBS@ INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -347,6 +356,8 @@ OBJCFLAGS = @OBJCFLAGS@ OBJCLINK = @OBJCLINK@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OS_LIB = @OS_LIB@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ @@ -371,6 +382,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = sed SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ +SHA1_CFLAGS = @SHA1_CFLAGS@ +SHA1_LIBS = @SHA1_LIBS@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@ @@ -461,7 +474,6 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ diff --git a/xorg-server/hw/xwin/winprefsyacc.c b/xorg-server/hw/xwin/winprefsyacc.c index 1255887c3..797851b95 100644 --- a/xorg-server/hw/xwin/winprefsyacc.c +++ b/xorg-server/hw/xwin/winprefsyacc.c @@ -211,8 +211,9 @@ extern int yylex(void); DEBUG = 281, RELOAD = 282, TRAYICON = 283, - SILENTEXIT = 284, - STRING = 285 + FORCEEXIT = 284, + SILENTEXIT = 285, + STRING = 286 }; #endif /* Tokens. */ @@ -242,8 +243,9 @@ extern int yylex(void); #define DEBUG 281 #define RELOAD 282 #define TRAYICON 283 -#define SILENTEXIT 284 -#define STRING 285 +#define FORCEEXIT 284 +#define SILENTEXIT 285 +#define STRING 286 @@ -262,7 +264,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 266 "winprefsyacc.c" +#line 268 "winprefsyacc.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -274,7 +276,7 @@ typedef union YYSTYPE /* Line 264 of yacc.c */ -#line 278 "winprefsyacc.c" +#line 280 "winprefsyacc.c" #ifdef short # undef short @@ -489,20 +491,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 92 +#define YYLAST 98 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 31 +#define YYNTOKENS 32 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 32 +#define YYNNTS 33 /* YYNRULES -- Number of rules. */ -#define YYNRULES 63 +#define YYNRULES 65 /* YYNRULES -- Number of states. */ -#define YYNSTATES 118 +#define YYNSTATES 121 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 285 +#define YYMAXUTOK 286 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -538,7 +540,7 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30 + 25, 26, 27, 28, 29, 30, 31 }; #if YYDEBUG @@ -548,47 +550,48 @@ static const yytype_uint8 yyprhs[] = { 0, 0, 3, 4, 7, 9, 11, 12, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, - 41, 45, 50, 54, 58, 62, 67, 73, 79, 84, - 86, 89, 90, 98, 103, 105, 108, 109, 116, 118, - 120, 122, 124, 126, 128, 130, 132, 134, 137, 140, - 145, 147, 150, 151, 158, 159, 161, 163, 169, 171, - 174, 175, 183, 186 + 39, 43, 47, 52, 56, 60, 64, 69, 75, 81, + 86, 88, 91, 92, 100, 105, 107, 110, 111, 118, + 120, 122, 124, 126, 128, 130, 132, 134, 136, 139, + 142, 147, 149, 152, 153, 160, 161, 163, 165, 171, + 173, 176, 177, 185, 188, 191 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 32, 0, -1, -1, 32, 33, -1, 3, -1, 35, - -1, -1, 3, 34, -1, 39, -1, 40, -1, 43, - -1, 47, -1, 54, -1, 59, -1, 37, -1, 38, - -1, 62, -1, 36, -1, 61, -1, 28, 30, 3, - -1, 20, 30, 3, -1, 18, 30, 56, 3, -1, - 8, 30, 3, -1, 7, 30, 3, -1, 21, 3, - 34, -1, 30, 25, 3, 34, -1, 30, 24, 30, - 3, 34, -1, 30, 4, 30, 3, 34, -1, 30, - 27, 3, 34, -1, 41, -1, 41, 42, -1, -1, - 4, 30, 5, 44, 34, 42, 6, -1, 30, 30, - 3, 34, -1, 45, -1, 45, 46, -1, -1, 9, - 5, 48, 34, 46, 6, -1, 11, -1, 12, -1, - 13, -1, 14, -1, 15, -1, 16, -1, 17, -1, - 49, -1, 50, -1, 49, 50, -1, 50, 49, -1, - 30, 51, 3, 34, -1, 52, -1, 52, 53, -1, - -1, 10, 5, 55, 34, 53, 6, -1, -1, 22, - -1, 23, -1, 30, 30, 56, 3, 34, -1, 57, - -1, 57, 58, -1, -1, 19, 5, 3, 60, 34, - 58, 6, -1, 29, 3, -1, 26, 30, 3, -1 + 33, 0, -1, -1, 33, 34, -1, 3, -1, 36, + -1, -1, 3, 35, -1, 40, -1, 41, -1, 44, + -1, 48, -1, 55, -1, 60, -1, 38, -1, 39, + -1, 64, -1, 37, -1, 62, -1, 63, -1, 28, + 31, 3, -1, 20, 31, 3, -1, 18, 31, 57, + 3, -1, 8, 31, 3, -1, 7, 31, 3, -1, + 21, 3, 35, -1, 31, 25, 3, 35, -1, 31, + 24, 31, 3, 35, -1, 31, 4, 31, 3, 35, + -1, 31, 27, 3, 35, -1, 42, -1, 42, 43, + -1, -1, 4, 31, 5, 45, 35, 43, 6, -1, + 31, 31, 3, 35, -1, 46, -1, 46, 47, -1, + -1, 9, 5, 49, 35, 47, 6, -1, 11, -1, + 12, -1, 13, -1, 14, -1, 15, -1, 16, -1, + 17, -1, 50, -1, 51, -1, 50, 51, -1, 51, + 50, -1, 31, 52, 3, 35, -1, 53, -1, 53, + 54, -1, -1, 10, 5, 56, 35, 54, 6, -1, + -1, 22, -1, 23, -1, 31, 31, 57, 3, 35, + -1, 58, -1, 58, 59, -1, -1, 19, 5, 3, + 61, 35, 59, 6, -1, 29, 3, -1, 30, 3, + -1, 26, 31, 3, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint8 yyrline[] = { - 0, 108, 108, 109, 112, 113, 117, 118, 121, 122, - 123, 124, 125, 126, 127, 128, 129, 130, 131, 134, - 137, 140, 143, 146, 149, 150, 151, 152, 153, 156, - 157, 160, 160, 163, 166, 167, 170, 170, 173, 174, - 175, 176, 179, 180, 181, 184, 185, 186, 187, 190, - 193, 194, 197, 197, 200, 201, 202, 205, 208, 209, - 212, 212, 215, 218 + 0, 132, 132, 133, 136, 137, 141, 142, 145, 146, + 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, + 159, 162, 165, 168, 171, 174, 175, 176, 177, 178, + 181, 182, 185, 185, 188, 191, 192, 195, 195, 198, + 199, 200, 201, 204, 205, 206, 209, 210, 211, 212, + 215, 218, 219, 222, 222, 225, 226, 227, 230, 233, + 234, 237, 237, 240, 243, 246 }; #endif @@ -601,13 +604,13 @@ static const char *const yytname[] = "ICONDIRECTORY", "DEFAULTICON", "ICONS", "STYLES", "TOPMOST", "MAXIMIZE", "MINIMIZE", "BOTTOM", "NOTITLE", "OUTLINE", "NOFRAME", "DEFAULTSYSMENU", "SYSMENU", "ROOTMENU", "SEPARATOR", "ATSTART", "ATEND", "EXEC", - "ALWAYSONTOP", "DEBUG", "RELOAD", "TRAYICON", "SILENTEXIT", "STRING", - "$accept", "input", "line", "newline_or_nada", "command", "trayicon", - "rootmenu", "defaultsysmenu", "defaulticon", "icondirectory", "menuline", - "menulist", "menu", "$@1", "iconline", "iconlist", "icons", "$@2", - "group1", "group2", "stylecombo", "styleline", "stylelist", "styles", - "$@3", "atspot", "sysmenuline", "sysmenulist", "sysmenu", "$@4", - "silentexit", "debug", 0 + "ALWAYSONTOP", "DEBUG", "RELOAD", "TRAYICON", "FORCEEXIT", "SILENTEXIT", + "STRING", "$accept", "input", "line", "newline_or_nada", "command", + "trayicon", "rootmenu", "defaultsysmenu", "defaulticon", "icondirectory", + "menuline", "menulist", "menu", "$@1", "iconline", "iconlist", "icons", + "$@2", "group1", "group2", "stylecombo", "styleline", "stylelist", + "styles", "$@3", "atspot", "sysmenuline", "sysmenulist", "sysmenu", + "$@4", "forceexit", "silentexit", "debug", 0 }; #endif @@ -619,32 +622,32 @@ static const yytype_uint16 yytoknum[] = 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, - 285 + 285, 286 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 31, 32, 32, 33, 33, 34, 34, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, - 37, 38, 39, 40, 41, 41, 41, 41, 41, 42, - 42, 44, 43, 45, 46, 46, 48, 47, 49, 49, - 49, 49, 50, 50, 50, 51, 51, 51, 51, 52, - 53, 53, 55, 54, 56, 56, 56, 57, 58, 58, - 60, 59, 61, 62 + 0, 32, 33, 33, 34, 34, 35, 35, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 37, 38, 39, 40, 41, 42, 42, 42, 42, 42, + 43, 43, 45, 44, 46, 47, 47, 49, 48, 50, + 50, 50, 50, 51, 51, 51, 52, 52, 52, 52, + 53, 54, 54, 56, 55, 57, 57, 57, 58, 59, + 59, 61, 60, 62, 63, 64 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 0, 2, 1, 1, 0, 2, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, - 3, 4, 3, 3, 3, 4, 5, 5, 4, 1, - 2, 0, 7, 4, 1, 2, 0, 6, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 2, 2, 4, - 1, 2, 0, 6, 0, 1, 1, 5, 1, 2, - 0, 7, 2, 3 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 3, 3, 4, 3, 3, 3, 4, 5, 5, 4, + 1, 2, 0, 7, 4, 1, 2, 0, 6, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, + 4, 1, 2, 0, 6, 0, 1, 1, 5, 1, + 2, 0, 7, 2, 2, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -653,54 +656,56 @@ static const yytype_uint8 yyr2[] = static const yytype_uint8 yydefact[] = { 2, 0, 1, 4, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 3, 5, 17, 14, 15, - 8, 9, 10, 11, 12, 13, 18, 16, 0, 0, - 0, 36, 52, 54, 0, 0, 0, 0, 62, 31, - 23, 22, 6, 6, 55, 56, 0, 60, 20, 63, - 19, 6, 6, 0, 0, 21, 6, 0, 7, 0, - 34, 0, 0, 50, 0, 0, 0, 0, 29, 0, - 0, 35, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 0, 51, 53, 0, 58, 0, 6, 0, - 0, 0, 0, 30, 32, 6, 47, 48, 6, 54, - 59, 61, 24, 0, 0, 6, 6, 33, 49, 0, - 6, 6, 25, 28, 6, 27, 26, 57 + 0, 0, 0, 0, 0, 0, 3, 5, 17, 14, + 15, 8, 9, 10, 11, 12, 13, 18, 19, 16, + 0, 0, 0, 37, 53, 55, 0, 0, 0, 0, + 63, 64, 32, 24, 23, 6, 6, 56, 57, 0, + 61, 21, 65, 20, 6, 6, 0, 0, 22, 6, + 0, 7, 0, 35, 0, 0, 51, 0, 0, 0, + 0, 30, 0, 0, 36, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 0, 52, 54, 0, 59, + 0, 6, 0, 0, 0, 0, 31, 33, 6, 48, + 49, 6, 55, 60, 62, 25, 0, 0, 6, 6, + 34, 50, 0, 6, 6, 26, 29, 6, 28, 27, + 58 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 1, 15, 53, 16, 17, 18, 19, 20, 21, - 68, 69, 22, 51, 60, 61, 23, 42, 80, 81, - 82, 63, 64, 24, 43, 46, 86, 87, 25, 56, - 26, 27 + -1, 1, 16, 56, 17, 18, 19, 20, 21, 22, + 71, 72, 23, 54, 63, 64, 24, 45, 83, 84, + 85, 66, 67, 25, 46, 49, 89, 90, 26, 59, + 27, 28, 29 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -44 +#define YYPACT_NINF -47 static const yytype_int8 yypact[] = { - -44, 7, -44, -44, -28, -10, -7, 27, 29, 14, - 41, 18, 19, 20, 44, -44, -44, -44, -44, -44, - -44, -44, -44, -44, -44, -44, -44, -44, 46, 50, - 51, -44, -44, -4, 53, 54, 55, 56, -44, -44, - -44, -44, 57, 57, -44, -44, 58, -44, -44, -44, - -44, 57, 57, 34, 35, -44, 57, -18, -44, 36, - 34, 63, 26, 35, 64, 42, 70, -3, -18, 68, - 72, -44, -44, -44, -44, -44, -44, -44, -44, -44, - -11, 17, 73, -44, -44, 47, 42, 74, 57, 48, - 49, 78, 79, -44, -44, 57, -44, -44, 57, -4, - -44, -44, -44, 80, 81, 57, 57, -44, -44, 82, - 57, 57, -44, -44, 57, -44, -44, -44 + -47, 7, -47, -47, -1, 0, 1, 18, 29, 15, + 42, 17, 19, 20, 46, 50, -47, -47, -47, -47, + -47, -47, -47, -47, -47, -47, -47, -47, -47, -47, + 49, 53, 54, -47, -47, 6, 55, 56, 57, 58, + -47, -47, -47, -47, -47, 61, 61, -47, -47, 62, + -47, -47, -47, -47, 61, 61, 35, 38, -47, 61, + -19, -47, 39, 35, 66, 27, 38, 67, 43, 72, + -3, -19, 70, 74, -47, -47, -47, -47, -47, -47, + -47, -47, -47, 3, -8, 75, -47, -47, 48, 43, + 76, 61, 52, 59, 77, 78, -47, -47, 61, -47, + -47, 61, 6, -47, -47, -47, 81, 82, 61, 61, + -47, -47, 83, 61, 61, -47, -47, 61, -47, -47, + -47 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -44, -44, -44, -43, -44, -44, -44, -44, -44, -44, - -44, 21, -44, -44, -44, 28, -44, -44, 5, 10, - -44, -44, 24, -44, -44, -8, -44, 6, -44, -44, - -44, -44 + -47, -47, -47, -46, -47, -47, -47, -47, -47, -47, + -47, 16, -47, -47, -47, 25, -47, -47, 5, 8, + -47, -47, 26, -47, -47, -9, -47, 9, -47, -47, + -47, -47, -47 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -710,48 +715,49 @@ static const yytype_int8 yypgoto[] = #define YYTABLE_NINF -1 static const yytype_uint8 yytable[] = { - 54, 89, 28, 66, 77, 78, 79, 2, 57, 58, - 3, 4, 67, 65, 5, 6, 7, 8, 44, 45, - 29, 90, 91, 30, 92, 9, 10, 11, 73, 74, - 75, 76, 31, 12, 32, 13, 14, 73, 74, 75, - 76, 77, 78, 79, 33, 102, 34, 38, 35, 36, - 37, 39, 107, 40, 41, 108, 47, 48, 49, 50, - 52, 55, 112, 113, 59, 62, 70, 115, 116, 72, - 84, 117, 85, 88, 94, 95, 98, 99, 103, 104, - 101, 105, 106, 110, 111, 114, 97, 83, 71, 93, - 96, 109, 100 + 57, 92, 69, 76, 77, 78, 79, 2, 60, 61, + 3, 4, 70, 68, 5, 6, 7, 8, 80, 81, + 82, 93, 94, 33, 95, 9, 10, 11, 47, 48, + 30, 31, 32, 12, 34, 13, 14, 15, 76, 77, + 78, 79, 80, 81, 82, 105, 35, 36, 37, 40, + 38, 39, 110, 41, 42, 111, 43, 44, 50, 51, + 52, 53, 115, 116, 55, 58, 62, 118, 119, 65, + 73, 120, 75, 87, 88, 91, 97, 98, 101, 102, + 108, 109, 104, 106, 113, 114, 117, 96, 74, 100, + 107, 99, 86, 112, 0, 0, 0, 0, 103 }; -static const yytype_uint8 yycheck[] = +static const yytype_int8 yycheck[] = { - 43, 4, 30, 21, 15, 16, 17, 0, 51, 52, - 3, 4, 30, 56, 7, 8, 9, 10, 22, 23, - 30, 24, 25, 30, 27, 18, 19, 20, 11, 12, - 13, 14, 5, 26, 5, 28, 29, 11, 12, 13, - 14, 15, 16, 17, 30, 88, 5, 3, 30, 30, - 30, 5, 95, 3, 3, 98, 3, 3, 3, 3, - 3, 3, 105, 106, 30, 30, 30, 110, 111, 6, - 6, 114, 30, 3, 6, 3, 3, 30, 30, 30, - 6, 3, 3, 3, 3, 3, 81, 63, 60, 68, - 80, 99, 86 + 46, 4, 21, 11, 12, 13, 14, 0, 54, 55, + 3, 4, 31, 59, 7, 8, 9, 10, 15, 16, + 17, 24, 25, 5, 27, 18, 19, 20, 22, 23, + 31, 31, 31, 26, 5, 28, 29, 30, 11, 12, + 13, 14, 15, 16, 17, 91, 31, 5, 31, 3, + 31, 31, 98, 3, 5, 101, 3, 3, 3, 3, + 3, 3, 108, 109, 3, 3, 31, 113, 114, 31, + 31, 117, 6, 6, 31, 3, 6, 3, 3, 31, + 3, 3, 6, 31, 3, 3, 3, 71, 63, 84, + 31, 83, 66, 102, -1, -1, -1, -1, 89 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 32, 0, 3, 4, 7, 8, 9, 10, 18, - 19, 20, 26, 28, 29, 33, 35, 36, 37, 38, - 39, 40, 43, 47, 54, 59, 61, 62, 30, 30, - 30, 5, 5, 30, 5, 30, 30, 30, 3, 5, - 3, 3, 48, 55, 22, 23, 56, 3, 3, 3, - 3, 44, 3, 34, 34, 3, 60, 34, 34, 30, - 45, 46, 30, 52, 53, 34, 21, 30, 41, 42, - 30, 46, 6, 11, 12, 13, 14, 15, 16, 17, - 49, 50, 51, 53, 6, 30, 57, 58, 3, 4, - 24, 25, 27, 42, 6, 3, 50, 49, 3, 30, - 58, 6, 34, 30, 30, 3, 3, 34, 34, 56, - 3, 3, 34, 34, 3, 34, 34, 34 + 0, 33, 0, 3, 4, 7, 8, 9, 10, 18, + 19, 20, 26, 28, 29, 30, 34, 36, 37, 38, + 39, 40, 41, 44, 48, 55, 60, 62, 63, 64, + 31, 31, 31, 5, 5, 31, 5, 31, 31, 31, + 3, 3, 5, 3, 3, 49, 56, 22, 23, 57, + 3, 3, 3, 3, 45, 3, 35, 35, 3, 61, + 35, 35, 31, 46, 47, 31, 53, 54, 35, 21, + 31, 42, 43, 31, 47, 6, 11, 12, 13, 14, + 15, 16, 17, 50, 51, 52, 54, 6, 31, 58, + 59, 3, 4, 24, 25, 27, 43, 6, 3, 51, + 50, 3, 31, 59, 6, 35, 31, 31, 3, 3, + 35, 35, 57, 3, 3, 35, 35, 3, 35, 35, + 35 }; #define yyerrok (yyerrstatus = 0) @@ -1562,269 +1568,276 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 19: + case 20: /* Line 1455 of yacc.c */ -#line 134 "winprefsyacc.y" +#line 159 "winprefsyacc.y" { SetTrayIcon((yyvsp[(2) - (3)].sVal)); free((yyvsp[(2) - (3)].sVal)); } break; - case 20: + case 21: /* Line 1455 of yacc.c */ -#line 137 "winprefsyacc.y" +#line 162 "winprefsyacc.y" { SetRootMenu((yyvsp[(2) - (3)].sVal)); free((yyvsp[(2) - (3)].sVal)); } break; - case 21: + case 22: /* Line 1455 of yacc.c */ -#line 140 "winprefsyacc.y" +#line 165 "winprefsyacc.y" { SetDefaultSysMenu((yyvsp[(2) - (4)].sVal), (yyvsp[(3) - (4)].iVal)); free((yyvsp[(2) - (4)].sVal)); } break; - case 22: + case 23: /* Line 1455 of yacc.c */ -#line 143 "winprefsyacc.y" +#line 168 "winprefsyacc.y" { SetDefaultIcon((yyvsp[(2) - (3)].sVal)); free((yyvsp[(2) - (3)].sVal)); } break; - case 23: + case 24: /* Line 1455 of yacc.c */ -#line 146 "winprefsyacc.y" +#line 171 "winprefsyacc.y" { SetIconDirectory((yyvsp[(2) - (3)].sVal)); free((yyvsp[(2) - (3)].sVal)); } break; - case 24: + case 25: /* Line 1455 of yacc.c */ -#line 149 "winprefsyacc.y" +#line 174 "winprefsyacc.y" { AddMenuLine("-", CMD_SEPARATOR, ""); } break; - case 25: + case 26: /* Line 1455 of yacc.c */ -#line 150 "winprefsyacc.y" +#line 175 "winprefsyacc.y" { AddMenuLine((yyvsp[(1) - (4)].sVal), CMD_ALWAYSONTOP, ""); free((yyvsp[(1) - (4)].sVal)); } break; - case 26: + case 27: /* Line 1455 of yacc.c */ -#line 151 "winprefsyacc.y" +#line 176 "winprefsyacc.y" { AddMenuLine((yyvsp[(1) - (5)].sVal), CMD_EXEC, (yyvsp[(3) - (5)].sVal)); free((yyvsp[(1) - (5)].sVal)); free((yyvsp[(3) - (5)].sVal)); } break; - case 27: + case 28: /* Line 1455 of yacc.c */ -#line 152 "winprefsyacc.y" +#line 177 "winprefsyacc.y" { AddMenuLine((yyvsp[(1) - (5)].sVal), CMD_MENU, (yyvsp[(3) - (5)].sVal)); free((yyvsp[(1) - (5)].sVal)); free((yyvsp[(3) - (5)].sVal)); } break; - case 28: + case 29: /* Line 1455 of yacc.c */ -#line 153 "winprefsyacc.y" +#line 178 "winprefsyacc.y" { AddMenuLine((yyvsp[(1) - (4)].sVal), CMD_RELOAD, ""); free((yyvsp[(1) - (4)].sVal)); } break; - case 31: + case 32: /* Line 1455 of yacc.c */ -#line 160 "winprefsyacc.y" +#line 185 "winprefsyacc.y" { OpenMenu((yyvsp[(2) - (3)].sVal)); free((yyvsp[(2) - (3)].sVal)); } break; - case 32: + case 33: /* Line 1455 of yacc.c */ -#line 160 "winprefsyacc.y" +#line 185 "winprefsyacc.y" {CloseMenu();} break; - case 33: + case 34: /* Line 1455 of yacc.c */ -#line 163 "winprefsyacc.y" +#line 188 "winprefsyacc.y" { AddIconLine((yyvsp[(1) - (4)].sVal), (yyvsp[(2) - (4)].sVal)); free((yyvsp[(1) - (4)].sVal)); free((yyvsp[(2) - (4)].sVal)); } break; - case 36: + case 37: /* Line 1455 of yacc.c */ -#line 170 "winprefsyacc.y" +#line 195 "winprefsyacc.y" {OpenIcons();} break; - case 37: + case 38: /* Line 1455 of yacc.c */ -#line 170 "winprefsyacc.y" +#line 195 "winprefsyacc.y" {CloseIcons();} break; - case 38: + case 39: /* Line 1455 of yacc.c */ -#line 173 "winprefsyacc.y" +#line 198 "winprefsyacc.y" { (yyval.uVal)=STYLE_TOPMOST; } break; - case 39: + case 40: /* Line 1455 of yacc.c */ -#line 174 "winprefsyacc.y" +#line 199 "winprefsyacc.y" { (yyval.uVal)=STYLE_MAXIMIZE; } break; - case 40: + case 41: /* Line 1455 of yacc.c */ -#line 175 "winprefsyacc.y" +#line 200 "winprefsyacc.y" { (yyval.uVal)=STYLE_MINIMIZE; } break; - case 41: + case 42: /* Line 1455 of yacc.c */ -#line 176 "winprefsyacc.y" +#line 201 "winprefsyacc.y" { (yyval.uVal)=STYLE_BOTTOM; } break; - case 42: + case 43: /* Line 1455 of yacc.c */ -#line 179 "winprefsyacc.y" +#line 204 "winprefsyacc.y" { (yyval.uVal)=STYLE_NOTITLE; } break; - case 43: + case 44: /* Line 1455 of yacc.c */ -#line 180 "winprefsyacc.y" +#line 205 "winprefsyacc.y" { (yyval.uVal)=STYLE_OUTLINE; } break; - case 44: + case 45: /* Line 1455 of yacc.c */ -#line 181 "winprefsyacc.y" +#line 206 "winprefsyacc.y" { (yyval.uVal)=STYLE_NOFRAME; } break; - case 45: + case 46: /* Line 1455 of yacc.c */ -#line 184 "winprefsyacc.y" +#line 209 "winprefsyacc.y" { (yyval.uVal)=(yyvsp[(1) - (1)].uVal); } break; - case 46: + case 47: /* Line 1455 of yacc.c */ -#line 185 "winprefsyacc.y" +#line 210 "winprefsyacc.y" { (yyval.uVal)=(yyvsp[(1) - (1)].uVal); } break; - case 47: + case 48: /* Line 1455 of yacc.c */ -#line 186 "winprefsyacc.y" +#line 211 "winprefsyacc.y" { (yyval.uVal)=(yyvsp[(1) - (2)].uVal)|(yyvsp[(2) - (2)].uVal); } break; - case 48: + case 49: /* Line 1455 of yacc.c */ -#line 187 "winprefsyacc.y" +#line 212 "winprefsyacc.y" { (yyval.uVal)=(yyvsp[(1) - (2)].uVal)|(yyvsp[(2) - (2)].uVal); } break; - case 49: + case 50: /* Line 1455 of yacc.c */ -#line 190 "winprefsyacc.y" +#line 215 "winprefsyacc.y" { AddStyleLine((yyvsp[(1) - (4)].sVal), (yyvsp[(2) - (4)].uVal)); free((yyvsp[(1) - (4)].sVal)); } break; - case 52: + case 53: /* Line 1455 of yacc.c */ -#line 197 "winprefsyacc.y" +#line 222 "winprefsyacc.y" {OpenStyles();} break; - case 53: + case 54: /* Line 1455 of yacc.c */ -#line 197 "winprefsyacc.y" +#line 222 "winprefsyacc.y" {CloseStyles();} break; - case 54: + case 55: /* Line 1455 of yacc.c */ -#line 200 "winprefsyacc.y" +#line 225 "winprefsyacc.y" { (yyval.iVal)=AT_END; } break; - case 55: + case 56: /* Line 1455 of yacc.c */ -#line 201 "winprefsyacc.y" +#line 226 "winprefsyacc.y" { (yyval.iVal)=AT_START; } break; - case 56: + case 57: /* Line 1455 of yacc.c */ -#line 202 "winprefsyacc.y" +#line 227 "winprefsyacc.y" { (yyval.iVal)=AT_END; } break; - case 57: + case 58: /* Line 1455 of yacc.c */ -#line 205 "winprefsyacc.y" +#line 230 "winprefsyacc.y" { AddSysMenuLine((yyvsp[(1) - (5)].sVal), (yyvsp[(2) - (5)].sVal), (yyvsp[(3) - (5)].iVal)); free((yyvsp[(1) - (5)].sVal)); free((yyvsp[(2) - (5)].sVal)); } break; - case 60: + case 61: /* Line 1455 of yacc.c */ -#line 212 "winprefsyacc.y" +#line 237 "winprefsyacc.y" {OpenSysMenu();} break; - case 61: + case 62: /* Line 1455 of yacc.c */ -#line 212 "winprefsyacc.y" +#line 237 "winprefsyacc.y" {CloseSysMenu();} break; - case 62: + case 63: /* Line 1455 of yacc.c */ -#line 215 "winprefsyacc.y" +#line 240 "winprefsyacc.y" + { pref.fForceExit = TRUE; } + break; + + case 64: + +/* Line 1455 of yacc.c */ +#line 243 "winprefsyacc.y" { pref.fSilentExit = TRUE; } break; - case 63: + case 65: /* Line 1455 of yacc.c */ -#line 218 "winprefsyacc.y" +#line 246 "winprefsyacc.y" { ErrorF("LoadPreferences: %s\n", (yyvsp[(2) - (3)].sVal)); free((yyvsp[(2) - (3)].sVal)); } break; /* Line 1455 of yacc.c */ -#line 1828 "winprefsyacc.c" +#line 1841 "winprefsyacc.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2036,7 +2049,7 @@ yyreturn: /* Line 1675 of yacc.c */ -#line 222 "winprefsyacc.y" +#line 250 "winprefsyacc.y" /* * Errors in parsing abort and print log messages diff --git a/xorg-server/hw/xwin/winprefsyacc.h b/xorg-server/hw/xwin/winprefsyacc.h index a9e5d0c2b..67470cfb7 100644 --- a/xorg-server/hw/xwin/winprefsyacc.h +++ b/xorg-server/hw/xwin/winprefsyacc.h @@ -65,8 +65,9 @@ DEBUG = 281, RELOAD = 282, TRAYICON = 283, - SILENTEXIT = 284, - STRING = 285 + FORCEEXIT = 284, + SILENTEXIT = 285, + STRING = 286 }; #endif /* Tokens. */ @@ -96,8 +97,9 @@ #define DEBUG 281 #define RELOAD 282 #define TRAYICON 283 -#define SILENTEXIT 284 -#define STRING 285 +#define FORCEEXIT 284 +#define SILENTEXIT 285 +#define STRING 286 @@ -116,7 +118,7 @@ typedef union YYSTYPE /* Line 1676 of yacc.c */ -#line 120 "winprefsyacc.h" +#line 122 "winprefsyacc.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c index 3d4d8c208..34368246a 100644 --- a/xorg-server/hw/xwin/winwindowswm.c +++ b/xorg-server/hw/xwin/winwindowswm.c @@ -85,8 +85,8 @@ winWindowsWMExtensionInit () { ExtensionEntry* extEntry; - ClientType = CreateNewResourceType(WMFreeClient); - eventResourceType = CreateNewResourceType(WMFreeEvents); + ClientType = CreateNewResourceType(WMFreeClient, "WMClient"); + eventResourceType = CreateNewResourceType(WMFreeEvents, "WMEvent"); eventResource = FakeClientID(0); if (ClientType && eventResourceType && diff --git a/xorg-server/hw/xwin/xlaunch/config.h b/xorg-server/hw/xwin/xlaunch/config.h deleted file mode 100644 index f0aed3cf1..000000000 --- a/xorg-server/hw/xwin/xlaunch/config.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2005 Alexander Gottwald - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name(s) of the above copyright - * holders shall not be used in advertising or otherwise to promote the sale, - * use or other dealings in this Software without prior written authorization. - */ -#ifndef __CONFIG_H__ -#define __CONFIG_H__ - -#include <string> -struct CConfig -{ - enum {MultiWindow, Fullscreen, Windowed, Nodecoration} window; - enum {NoClient, StartProgram, XDMCP} client; - bool local; - std::string display; - std::string protocol; - std::string program; - std::string host; - std::string user; - bool broadcast; - bool indirect; - std::string xdmcp_host; - bool clipboard; - std::string extra_params; -#ifdef _DEBUG - CConfig() : window(MultiWindow), client(StartProgram), local(false), display("1"), - protocol("Putty"), program("xterm"), host("lupus"), user("ago"), - broadcast(false), indirect(false), xdmcp_host("lupus"), - clipboard(true), extra_params() {}; -#else - CConfig() : window(MultiWindow), client(StartProgram), local(false), display("0"), - protocol("Putty"), program("xterm"), host(""), user(""), - broadcast(true), indirect(false), xdmcp_host(""), - clipboard(true), extra_params() {}; -#endif - void Load(const char* filename); - void Save(const char* filename); -}; - -#endif diff --git a/xorg-server/hw/xwin/xlaunch/makefile b/xorg-server/hw/xwin/xlaunch/makefile deleted file mode 100644 index f7cf923df..000000000 --- a/xorg-server/hw/xwin/xlaunch/makefile +++ /dev/null @@ -1,79 +0,0 @@ -# -# Copyright (c) 2005 Alexander Gottwald -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name(s) of the above copyright -# holders shall not be used in advertising or otherwise to promote the sale, -# use or other dealings in this Software without prior written authorization. -# -WINDRES=windres - -TARGET=mingw -#DEBUG_FLAGS=-D_DEBUG - -OS_FLAGS_mingw=-mno-cygwin -OS_FLAGS=$(OS_FLAGS_$(TARGET)) $(DEBUG_FLAGS) - -X11_DIR_$(TARGET)=/usr/X11R6 -X11_DIR_mingw=../../../../../exports -X11_DIR=$(X11_DIR_$(TARGET)) -X11_INCLUDE=-I$(X11_DIR)/include -X11_LIBDIR=-L$(X11_DIR)/lib -X11_LIBS_$(TARGET)=-lX11 -X11_LIBS_mingw=-lX11 -lwsock32 -X11_LIBS=$(X11_LIBS_$(TARGET)) - -PROGRAMFILES:=$(shell cygpath -u $(PROGRAMFILES)) -#MSXML_DIR=$(PROGRAMFILES)/MSXML 4.0 -MSXML_DIR=$(PROGRAMFILES)/Microsoft XML Parser SDK -MSXML_INCLUDE="-I$(MSXML_DIR)/inc" -MSXML_LIBDIR="-L$(MSXML_DIR)/lib" -MSXML_LIBS= - - -CXXFLAGS=-g $(OS_FLAGS) $(X11_INCLUDE) $(MSXML_INCLUDE) -LDFLAGS=-mwindows $(X11_LIBDIR) $(MSXML_LIBDIR) -LIBS=-lcomctl32 -lole32 -loleaut32 $(X11_LIBS) $(MSXML_LIBS) -all:xlaunch.exe -%.res: %.rc - $(WINDRES) -O coff -o $@ $< - -WINDOW_PARTS=window util dialog wizard -WINDOW_OBJECTS=$(foreach file,$(WINDOW_PARTS),window/$(file).o) - -RESOURCES_IMAGES=resources/multiwindow.bmp resources/fullscreen.bmp \ - resources/windowed.bmp resources/nodecoration.bmp - -resources/resources.res: resources/resources.rc resources/resources.h \ - resources/images.rc resources/dialog.rc resources/strings.rc \ - $(RESOURCES_IMAGES) -xlaunch.exe: $(WINDOW_OBJECTS) main.o config.o resources/resources.res - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) - - -window/dialog.o: window/dialog.cc window/dialog.h window/window.h window/util.h -window/frame.o: window/frame.cc window/frame.h window/window.h -window/util.o: window/util.cc window/util.h -window/window.o: window/window.cc window/window.h window/util.h -window/wizard.o: window/wizard.cc window/wizard.h window/dialog.h \ - window/window.h window/util.h -main.o: main.cc window/util.h window/wizard.h window/dialog.h \ - window/window.h resources/resources.h config.h -config.o: config.cc config.h |