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.92 by root, Wed Sep 8 17:23:02 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{
… …
590 603
591 this->locale = rxvt_strdup (this->locale); 604 this->locale = rxvt_strdup (this->locale);
592 SET_LOCALE (this->locale); 605 SET_LOCALE (this->locale);
593 mbstate.reset (); 606 mbstate.reset ();
594#endif 607#endif
608
595#if 0 609#if 0
596#if HAVE_NL_LANGINFO 610#if HAVE_NL_LANGINFO
597 free (codeset);
598 codeset = strdup (nl_langinfo (CODESET)); 611 char *codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8") 612 enc_utf8 = !strcasecmp (codeset, "UTF-8")
600 || !strcasecmp (codeset, "UTF8"); 613 || !strcasecmp (codeset, "UTF8");
614 free (codeset);
601#else 615#else
602 enc_utf8 = 1; 616 enc_utf8 = 0;
603#endif 617#endif
604#endif 618#endif
605} 619}
606 620
607void 621void
… …
610#ifdef USE_XIM 624#ifdef USE_XIM
611 if (!locale) 625 if (!locale)
612 rxvt_warn ("setting locale failed, working without locale support.\n"); 626 rxvt_warn ("setting locale failed, working without locale support.\n");
613 else 627 else
614 { 628 {
615 Atom wmlocale; 629 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
616
617 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
618 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
619 XA_STRING, 8, PropModeReplace,
620 (unsigned char *)locale, strlen (locale));
621 630
622 if (!XSupportsLocale ()) 631 if (!XSupportsLocale ())
623 { 632 {
624 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");
625 return; 634 return;
… …
639{ 648{
640 /* 649 /*
641 * Initialize the command connection. 650 * Initialize the command connection.
642 * This should be called after the X server connection is established. 651 * This should be called after the X server connection is established.
643 */ 652 */
644 int i;
645
646 for (i = 0; i < NUM_XA; i++)
647 xa[i] = XInternAtom (display->display, xa_names[i], False);
648
649 /* Enable delete window protocol */
650 XSetWMProtocols (display->display, TermWin.parent[0],
651 & (xa[XA_WMDELETEWINDOW]), 1);
652
653#ifdef USING_W11LIB
654 /* enable W11 callbacks */
655 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
656#endif
657 653
658#ifdef META8_OPTION 654#ifdef META8_OPTION
659 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
660#endif 656#endif
661 657
… …
913 XGCValues gcvalue; 909 XGCValues gcvalue;
914 long vt_emask; 910 long vt_emask;
915 XSetWindowAttributes attributes; 911 XSetWindowAttributes attributes;
916 XWindowAttributes gattr; 912 XWindowAttributes gattr;
917 913
914#ifdef USING_W11LIB
915 /* enable W11 callbacks */
916 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
917#endif
918
919 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
920 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);
921
918 if (options & Opt_transparent) 922 if (options & Opt_transparent)
919 { 923 {
920 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 924 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
921 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 925 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
922 } 926 }
923 927
924#if ENABLE_FRILLS 928#if ENABLE_FRILLS
925 if (options & Opt_borderLess) 929 if (options & Opt_borderLess)
926 { 930 {
927 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 931 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
932
928 if (prop == None) 933 if (prop == None)
929 { 934 {
930 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 935 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
931#ifdef PREFER_24BIT 936#ifdef PREFER_24BIT
932 attributes.override_redirect = TRUE; 937 attributes.override_redirect = TRUE;
… …
947 952
948 /* grab colors before netscape does */ 953 /* grab colors before netscape does */
949 Get_Colours (); 954 Get_Colours ();
950 955
951 if (!set_fonts ()) 956 if (!set_fonts ())
952 rxvt_fatal ("unable to load base fontset, please specify one using -fn, aborting.\n"); 957 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
953 958
954 window_calc (0, 0); 959 window_calc (0, 0);
955 old_width = szHint.width; 960 old_width = szHint.width;
956 old_height = szHint.height; 961 old_height = szHint.height;
957 962
… …
989 wmHint.window_group = TermWin.parent[0]; 994 wmHint.window_group = TermWin.parent[0];
990 995
991 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 996 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
992 (char **)argv, argc, &szHint, &wmHint, &classHint); 997 (char **)argv, argc, &szHint, &wmHint, &classHint);
993 998
999 /* Enable delete window protocol */
1000 XSetWMProtocols (display->display, TermWin.parent[0],
1001 &xa[XA_WMDELETEWINDOW], 1);
1002
994#if ENABLE_FRILLS 1003#if ENABLE_FRILLS
995 long pid = getpid (); 1004 long pid = getpid ();
1005
996 XChangeProperty (display->display, TermWin.parent[0], 1006 XChangeProperty (display->display, TermWin.parent[0],
997 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1007 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
998 PropModeReplace, (unsigned char *)&pid, 1); 1008 PropModeReplace, (unsigned char *)&pid, 1);
999#endif 1009#endif
1000 1010
1001 XSelectInput (display->display, TermWin.parent[0], 1011 XSelectInput (display->display, TermWin.parent[0],
1002 KeyPressMask 1012 KeyPressMask
… …
1008 | StructureNotifyMask); 1018 | StructureNotifyMask);
1009 termwin_ev.start (display, TermWin.parent[0]); 1019 termwin_ev.start (display, TermWin.parent[0]);
1010 1020
1011#if ENABLE_FRILLS 1021#if ENABLE_FRILLS
1012 if (mwmhints.flags) 1022 if (mwmhints.flags)
1013 { 1023 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1014 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False); 1024 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1015 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1016 }
1017#endif 1025#endif
1018 1026
1019 /* 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 */
1020 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1028 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1021 1029

Diff Legend

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