ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.96 by root, Sat Dec 11 23:01:36 2004 UTC vs.
Revision 1.99 by root, Mon Dec 20 16:44:31 2004 UTC

… …
33 33
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "init.h" 36#include "init.h"
37 37
38#include <signal.h> 38#include <csignal>
39 39
40const char *const def_colorName[] = 40const char *const def_colorName[] =
41 { 41 {
42 COLOR_FOREGROUND, 42 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 43 COLOR_BACKGROUND,
… …
155 NULL, /* Color_BD */ 155 NULL, /* Color_BD */
156 NULL, /* Color_IT */ 156 NULL, /* Color_IT */
157 NULL, /* Color_UL */ 157 NULL, /* Color_UL */
158 NULL, /* Color_RV */ 158 NULL, /* Color_RV */
159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
160#if ENABLE_FRILLS
161 NULL, // Color_underline
162#endif
160#ifdef OPTION_HC 163#ifdef OPTION_HC
161 NULL, 164 NULL,
162#endif 165#endif
163#ifdef KEEP_SCROLLCOLOR 166#ifdef KEEP_SCROLLCOLOR
164 COLOR_SCROLLBAR, 167 COLOR_SCROLLBAR,
… …
167#if TINTING 170#if TINTING
168 NULL, 171 NULL,
169#endif 172#endif
170 }; 173 };
171 174
172const char *const xa_names[NUM_XA] = 175const char *const xa_names[] =
173 { 176 {
174 "TEXT", 177 "TEXT",
175 "COMPOUND_TEXT", 178 "COMPOUND_TEXT",
176 "UTF8_STRING", 179 "UTF8_STRING",
177 "MULTIPLE", 180 "MULTIPLE",
178 "TARGETS", 181 "TARGETS",
179 "TIMESTAMP", 182 "TIMESTAMP",
180 "VT_SELECTION", 183 "VT_SELECTION",
181 "INCR", 184 "INCR",
182 "WM_DELETE_WINDOW", 185 "WM_DELETE_WINDOW",
186 "CLIPBOARD",
187#if ENABLE_FRILLS
188 "_NET_WM_PID",
189 "_MOTIF_WM_HINTS",
190 "_NET_WM_NAME",
191 "_NET_WM_ICON_NAME",
192#endif
193#if USE_XIM
194 "WM_LOCALE_NAME",
195#endif
183#ifdef TRANSPARENT 196#ifdef TRANSPARENT
184 "_XROOTPMAP_ID", 197 "_XROOTPMAP_ID",
198 "ESETROOT_PMAP_ID",
185#endif 199#endif
186#ifdef OFFIX_DND 200#ifdef OFFIX_DND
187 "DndProtocol", 201 "DndProtocol",
188 "DndSelection", 202 "DndSelection",
189#endif 203#endif
190 "CLIPBOARD"
191 }; 204 };
192 205
193bool 206bool
194rxvt_term::init_vars () 207rxvt_term::init_vars ()
195{ 208{
… …
611#ifdef USE_XIM 624#ifdef USE_XIM
612 if (!locale) 625 if (!locale)
613 rxvt_warn ("setting locale failed, working without locale support.\n"); 626 rxvt_warn ("setting locale failed, working without locale support.\n");
614 else 627 else
615 { 628 {
616 set_string_property (display->atom ("WM_LOCALE_NAME"), locale); 629 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
617 630
618 if (!XSupportsLocale ()) 631 if (!XSupportsLocale ())
619 { 632 {
620 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 633 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
621 return; 634 return;
… …
896 XGCValues gcvalue; 909 XGCValues gcvalue;
897 long vt_emask; 910 long vt_emask;
898 XSetWindowAttributes attributes; 911 XSetWindowAttributes attributes;
899 XWindowAttributes gattr; 912 XWindowAttributes gattr;
900 913
901 for (int i = 0; i < NUM_XA; i++)
902 xa[i] = XInternAtom (display->display, xa_names[i], False);
903
904#ifdef USING_W11LIB 914#ifdef USING_W11LIB
905 /* enable W11 callbacks */ 915 /* enable W11 callbacks */
906 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 916 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
907#endif 917#endif
918
919 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
920 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);
908 921
909 if (options & Opt_transparent) 922 if (options & Opt_transparent)
910 { 923 {
911 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 924 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
912 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 925 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
… …
989 1002
990#if ENABLE_FRILLS 1003#if ENABLE_FRILLS
991 long pid = getpid (); 1004 long pid = getpid ();
992 1005
993 XChangeProperty (display->display, TermWin.parent[0], 1006 XChangeProperty (display->display, TermWin.parent[0],
994 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1007 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
995 PropModeReplace, (unsigned char *)&pid, 1); 1008 PropModeReplace, (unsigned char *)&pid, 1);
996#endif 1009#endif
997 1010
998 XSelectInput (display->display, TermWin.parent[0], 1011 XSelectInput (display->display, TermWin.parent[0],
999 KeyPressMask 1012 KeyPressMask
… …
1005 | StructureNotifyMask); 1018 | StructureNotifyMask);
1006 termwin_ev.start (display, TermWin.parent[0]); 1019 termwin_ev.start (display, TermWin.parent[0]);
1007 1020
1008#if ENABLE_FRILLS 1021#if ENABLE_FRILLS
1009 if (mwmhints.flags) 1022 if (mwmhints.flags)
1010 { 1023 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1011 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);
1012 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32,
1013 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1024 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1014 }
1015#endif 1025#endif
1016 1026
1017 /* vt cursor: Black-on-White is standard, but this is more popular */ 1027 /* vt cursor: Black-on-White is standard, but this is more popular */
1018 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1028 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1019 1029

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines