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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.48 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.65 by pcg, Fri Apr 2 15:15:26 2004 UTC

… …
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring> 47#include <cstring>
48 48
49vector<rxvt_term *> rxvt_term::termlist;
50
49static char curlocale[128]; 51static char curlocale[128];
50 52
51void 53bool
52rxvt_set_locale (const char *locale) 54rxvt_set_locale (const char *locale)
53{ 55{
54 if (locale && STRNCMP (locale, curlocale, 128)) 56 if (!locale || !STRNCMP (locale, curlocale, 128))
55 { 57 return false;
58
56 STRNCPY (curlocale, locale, 128); 59 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 60 setlocale (LC_CTYPE, curlocale);
61 return true;
62}
63
64#if ENABLE_COMBINING
65class rxvt_composite_vec rxvt_composite;
66
67text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
68{
69 compose_char *cc;
70
71 // break compose chains, as stupid readline really likes to duplicate
72 // composing characters for some reason near the end of a line.
73 cc = (*this)[c1];
74 while (cc)
58 } 75 {
76 if (cc->c2 == c2) return c1;
77 cc = (*this)[cc->c1];
78 }
79
80 // check to see wether this combination already exists otherwise
81 for (cc = v.end (); cc-- > v.begin (); )
82 {
83 if (cc->c1 == c1 && cc->c2 == c2)
84 return COMPOSE_LO + (cc - v.begin ());
85 }
86
87 // allocate a new combination
88 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
89 {
90 static int seen;
91
92 if (!seen++)
93 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
94
95 return REPLACEMENT_CHAR;
96 }
97
98 v.push_back (compose_char (c1, c2));
99
100 return v.size () - 1 + COMPOSE_LO;
59} 101}
102
103int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
104{
105 compose_char *cc = (*this)[c];
106
107 if (!cc)
108 {
109 if (r) *r = c;
110 return 1;
111 }
112
113 int len = expand (cc->c1, r);
114
115 if (r) r += len;
116
117 if (cc->c2 != NOCHAR)
118 {
119 len++;
120 if (r) *r++ = cc->c2;
121 }
122
123 return len;
124
125}
126#endif
60 127
61void * 128void *
62rxvt_term::operator new (size_t s) 129rxvt_term::operator new (size_t s)
63{ 130{
64 void *p = malloc (s); 131 void *p = malloc (s);
… …
100 destroy_ev (this, &rxvt_term::destroy_cb), 167 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb), 168 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb) 169 incr_ev (this, &rxvt_term::incr_cb)
103{ 170{
104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 171 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
172
173 termlist.push_back (this);
105} 174}
106 175
107rxvt_term::~rxvt_term () 176rxvt_term::~rxvt_term ()
108{ 177{
178 termlist.erase (find (termlist.begin (), termlist.end(), this));
179
109 if (cmd_fd >= 0) 180 if (cmd_fd >= 0)
110 close (cmd_fd); 181 close (cmd_fd);
111 182
112#ifndef NO_SETOWNER_TTYDEV 183#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE); 184 privileged_ttydev (RESTORE);
… …
118 189
119 delete TermWin.fontset; 190 delete TermWin.fontset;
120 191
121 if (display) 192 if (display)
122 { 193 {
194 selection_clear ();
195
196#ifdef MENUBAR
197 if (menubarGC) XFreeGC (display->display, menubarGC);
198#endif
199#ifdef XTERM_SCROLLBAR
200 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
201 if (ShadowGC) XFreeGC (display->display, ShadowGC);
202#endif
203#ifdef PLAIN_SCROLLBAR
204 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
205#endif
206#ifdef NEXT_SCROLLBAR
207 if (blackGC) XFreeGC (display->display, blackGC);
208 if (whiteGC) XFreeGC (display->display, whiteGC);
209 if (grayGC) XFreeGC (display->display, grayGC);
210 if (darkGC) XFreeGC (display->display, darkGC);
211 if (stippleGC) XFreeGC (display->display, stippleGC);
212 if (dimple) XFreePixmap (display->display, dimple);
213 if (upArrow) XFreePixmap (display->display, upArrow);
214 if (downArrow) XFreePixmap (display->display, downArrow);
215 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
216 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
217#endif
218#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
219 if (topShadowGC) XFreeGC (display->display, topShadowGC);
220 if (botShadowGC) XFreeGC (display->display, botShadowGC);
221 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
222#endif
223 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
224
123#if defined(MENUBAR) && (MENUBAR_MAX > 1) 225#if defined(MENUBAR) && (MENUBAR_MAX > 1)
124 delete menuBar.drawable; 226 delete menuBar.drawable;
125 //if (menuBar.win) 227 //if (menuBar.win)
126 // XDestroyWindow (display->display, menuBar.win); 228 // XDestroyWindow (display->display, menuBar.win);
127#endif 229#endif
… …
137 239
138 displays.put (display); 240 displays.put (display);
139 241
140 scr_release (); 242 scr_release ();
141 243
244 /* clear all resources */
245 for (int i = 0; i < allocated.size (); i++)
246 free (allocated[i]);
247
248 free (selection.text);
249 // TODO: manage env vars in child only(!)
142 free (env_windowid); 250 free (env_windowid);
143 free (env_display); 251 free (env_display);
144 free (env_term); 252 free (env_term);
145 free (env_colorfgbg); 253 free (env_colorfgbg);
146 free (locale); 254 free (locale);
255#if 0
147 free (codeset); 256 free (codeset);
257#endif
148 258
149 delete envv; 259 delete envv;
150 delete argv; 260 delete argv;
151} 261}
152 262
… …
193 delete this; 303 delete this;
194} 304}
195 305
196/*----------------------------------------------------------------------*/ 306/*----------------------------------------------------------------------*/
197/* rxvt_init () */ 307/* rxvt_init () */
198/* LIBPROTO */
199rxvt_t
200rxvt_init (int argc, const char *const *argv)
201{
202 SET_R (new rxvt_term);
203
204 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
205 {
206 delete GET_R;
207 SET_R (0);
208 }
209
210 return GET_R;
211}
212
213static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
214
215void
216rxvt_init_signals ()
217{
218 /* install exit handler for cleanup */
219#if 0
220#ifdef HAVE_ATEXIT
221 atexit (rxvt_clean_exit);
222#else
223#endif
224#endif
225
226 struct sigaction sa;
227
228 sigfillset (&sa.sa_mask);
229 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
230 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
231 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
232 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
233 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
234 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
235 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
236
237 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
238 /* signal (SIGURG, SIG_DFL); */
239
240 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
241 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
242}
243
244bool 308bool
245rxvt_term::init (int argc, const char *const *argv) 309rxvt_term::init (int argc, const char *const *argv)
246{ 310{
311 SET_R (this);
312
313 if (!init_vars ())
314 return false;
315
247 /* 316 /*
248 * Save and then give up any super-user privileges 317 * Save and then give up any super-user privileges
249 * If we need privileges in any area then we must specifically request it. 318 * If we need privileges in any area then we must specifically request it.
250 * We should only need to be root in these cases: 319 * We should only need to be root in these cases:
251 * 1. write utmp entries on some systems 320 * 1. write utmp entries on some systems
… …
306 check_ev.start (); 375 check_ev.start ();
307 376
308 return true; 377 return true;
309} 378}
310 379
380static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
381
382void
383rxvt_init_signals ()
384{
385 /* install exit handler for cleanup */
386#if 0
387#ifdef HAVE_ATEXIT
388 atexit (rxvt_clean_exit);
389#else
390#endif
391#endif
392
393 struct sigaction sa;
394
395 sigfillset (&sa.sa_mask);
396 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
397 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
398 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
399 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
400 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
401 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
402 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
403
404 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
405 /* signal (SIGURG, SIG_DFL); */
406
407 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
408 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
409}
410
311/* ------------------------------------------------------------------------- * 411/* ------------------------------------------------------------------------- *
312 * SIGNAL HANDLING & EXIT HANDLER * 412 * SIGNAL HANDLING & EXIT HANDLER *
313 * ------------------------------------------------------------------------- */ 413 * ------------------------------------------------------------------------- */
314/* 414/*
315 * Catch a SIGCHLD signal and exit if the direct child has died 415 * Catch a SIGCHLD signal and exit if the direct child has died
316 */ 416 */
417
418void rxvt_term::child_exited (int pid)
419{
420 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
421 if (pid == (*t)->cmd_pid)
422 {
423 (*t)->destroy ();
424 break;
425 }
426}
427
317/* ARGSUSED */ 428/* ARGSUSED */
318/* EXTPROTO */ 429/* EXTPROTO */
319RETSIGTYPE 430RETSIGTYPE
320rxvt_Child_signal (int sig __attribute__ ((unused))) 431rxvt_Child_signal (int sig __attribute__ ((unused)))
321{ 432{
322 int pid, save_errno = errno; 433 int pid, save_errno = errno;
434
323 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 435 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
324 ; 436 rxvt_term::child_exited (pid);
437
325 errno = save_errno; 438 errno = save_errno;
326
327#if 0
328 if (pid == cmd_pid)
329 exit (EXIT_SUCCESS);
330#endif
331} 439}
332 440
333/* 441/*
334 * Catch a fatal signal and tidy up before quitting 442 * Catch a fatal signal and tidy up before quitting
335 */ 443 */
… …
337RETSIGTYPE 445RETSIGTYPE
338rxvt_Exit_signal (int sig) 446rxvt_Exit_signal (int sig)
339{ 447{
340 signal (sig, SIG_DFL); 448 signal (sig, SIG_DFL);
341#ifdef DEBUG_CMD 449#ifdef DEBUG_CMD
342 rxvt_print_error ("signal %d", sig); 450 rxvt_warn ("caught signal %d, exiting.\n", sig);
343#endif 451#endif
344 rxvt_clean_exit (); 452 rxvt_clean_exit ();
345 kill (getpid (), sig); 453 kill (getpid (), sig);
346} 454}
347 455
… …
622 else 730 else
623 szHint.win_gravity = SouthWestGravity; 731 szHint.win_gravity = SouthWestGravity;
624 } 732 }
625 } 733 }
626 } 734 }
735
627 /* TODO: BOUNDS */ 736 /* TODO: BOUNDS */
628 TermWin.width = TermWin.ncol * TermWin.fwidth; 737 TermWin.width = TermWin.ncol * TermWin.fwidth;
629 TermWin.height = TermWin.nrow * TermWin.fheight; 738 TermWin.height = TermWin.nrow * TermWin.fheight;
630 max_width = MAX_COLS * TermWin.fwidth; 739 max_width = MAX_COLS * TermWin.fwidth;
631 max_height = MAX_ROWS * TermWin.fheight; 740 max_height = MAX_ROWS * TermWin.fheight;
… …
773/*----------------------------------------------------------------------*/ 882/*----------------------------------------------------------------------*/
774/* xterm sequences - title, iconName, color (exptl) */ 883/* xterm sequences - title, iconName, color (exptl) */
775void 884void
776rxvt_term::set_title (const char *str) 885rxvt_term::set_title (const char *str)
777{ 886{
778#ifndef SMART_WINDOW_TITLE 887#ifdef SMART_WINDOW_TITLE
779 XStoreName (display->display, TermWin.parent[0], str);
780#else
781 char *name; 888 char *name;
782 889
783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 890 if (!XFetchName (display->display, TermWin.parent[0], &name))
784 name = NULL; 891 name = NULL;
892
785 if (name == NULL || STRCMP (name, str)) 893 if (name == NULL || STRCMP (name, str))
894#endif
786 XStoreName (display->display, TermWin.parent[0], str); 895 XStoreName (display->display, TermWin.parent[0], str);
896
897#ifdef SMART_WINDOW_TITLE
787 if (name) 898 if (name)
788 XFree (name); 899 XFree (name);
789#endif 900#endif
790} 901}
791 902
792void 903void
793rxvt_term::set_iconName (const char *str) 904rxvt_term::set_icon_name (const char *str)
794{ 905{
795#ifndef SMART_WINDOW_TITLE 906#ifdef SMART_WINDOW_TITLE
796 XSetIconName (display->display, TermWin.parent[0], str);
797#else
798 char *name; 907 char *name;
799 908
800 if (XGetIconName (display->display, TermWin.parent[0], &name)) 909 if (!XGetIconName (display->display, TermWin.parent[0], &name))
801 name = NULL; 910 name = NULL;
911
802 if (name == NULL || STRCMP (name, str)) 912 if (name == NULL || STRCMP (name, str))
913#endif
803 XSetIconName (display->display, TermWin.parent[0], str); 914 XSetIconName (display->display, TermWin.parent[0], str);
915
916#ifdef SMART_WINDOW_TITLE
804 if (name) 917 if (name)
805 XFree (name); 918 XFree (name);
806#endif 919#endif
807} 920}
808 921
… …
835 PixColors[idx] = PixColors[minCOLOR + i]; 948 PixColors[idx] = PixColors[minCOLOR + i];
836 SET_PIXCOLOR (idx); 949 SET_PIXCOLOR (idx);
837 goto Done; 950 goto Done;
838 } 951 }
839 } 952 }
953
840 if (!rXParseAllocColor (& xcol, color)) 954 if (!rXParseAllocColor (& xcol, color))
841 return; 955 return;
956
842 /* XStoreColor (display->display, XCMAP, XColor*); */ 957 /* XStoreColor (display->display, XCMAP, XColor*); */
843 958
844 /* 959 /*
845 * FIXME: should free colors here, but no idea how to do it so instead, 960 * FIXME: should free colors here, but no idea how to do it so instead,
846 * so just keep gobbling up the colormap 961 * so just keep gobbling up the colormap
… …
869 984
870 /* handle Color_BD, scrollbar background, etc. */ 985 /* handle Color_BD, scrollbar background, etc. */
871 986
872 set_colorfgbg (); 987 set_colorfgbg ();
873 recolour_cursor (); 988 recolour_cursor ();
874 /* the only reasonable way to enforce a clean update */ 989 scr_touch (true);
875 scr_poweron ();
876} 990}
877 991
878#else 992#else
879# define set_window_color (idx,color) ((void)0) 993# define set_window_color (idx,color) ((void)0)
880#endif /* XTERM_COLOR_CHANGE */ 994#endif /* XTERM_COLOR_CHANGE */
881 995
882void 996void
883rxvt_term::recolour_cursor () 997rxvt_term::recolour_cursor ()
884{ 998{
885#if TODO
886 rxvt_color xcol[2]; 999 XColor xcol[2];
887 1000
888 xcol[0] = PixColors[Color_pointer]; 1001 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg];
889 xcol[1] = PixColors[Color_bg]; 1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg];
890 XQueryColors (display->display, XCMAP, xcol, 2); 1003 XQueryColors (display->display, XCMAP, xcol, 2);
891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1004 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
892#endif
893} 1005}
894 1006
895/*----------------------------------------------------------------------*/ 1007/*----------------------------------------------------------------------*/
896/* 1008/*
897 * find if fg/bg matches any of the normal (low-intensity) colors 1009 * find if fg/bg matches any of the normal (low-intensity) colors
… …
946int 1058int
947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1059rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
948{ 1060{
949 if (!screen_in_out->set (display, colour)) 1061 if (!screen_in_out->set (display, colour))
950 { 1062 {
951 rxvt_print_error ("can't allocate colour: %s", colour); 1063 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
952 return false; 1064 return false;
953 } 1065 }
954 1066
955 return true; 1067 return true;
956} 1068}
… …
1323 if (preedit_attr) XFree (preedit_attr); 1435 if (preedit_attr) XFree (preedit_attr);
1324 if (status_attr) XFree (status_attr); 1436 if (status_attr) XFree (status_attr);
1325 1437
1326 if (Input_Context == NULL) 1438 if (Input_Context == NULL)
1327 { 1439 {
1328 rxvt_print_error ("failed to create input context"); 1440 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1329 display->put_xim (input_method); 1441 display->put_xim (input_method);
1330 return false; 1442 return false;
1331 } 1443 }
1332 1444
1333 if (input_style & XIMPreeditArea) 1445 if (input_style & XIMPreeditArea)

Diff Legend

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