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.44 by pcg, Tue Feb 24 16:25:44 2004 UTC vs.
Revision 1.60 by pcg, Sun Mar 28 02:07:08 2004 UTC

… …
56 STRNCPY (curlocale, locale, 128); 56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 57 setlocale (LC_CTYPE, curlocale);
58 } 58 }
59} 59}
60 60
61#if ENABLE_COMBINING
62class rxvt_composite_vec rxvt_composite;
63
64text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
65{
66 compose_char *cc;
67
68 // break compose chains, as stupid readline really likes to duplicate
69 // composing characters for some reason near the end of a line.
70 cc = (*this)[c1];
71 while (cc)
72 {
73 if (cc->c2 == c2) return c1;
74 cc = (*this)[cc->c1];
75 }
76
77 // check to see wether this combination already exists otherwise
78 for (cc = v.end (); cc-- > v.begin (); )
79 {
80 if (cc->c1 == c1 && cc->c2 == c2)
81 return COMPOSE_LO + (cc - v.begin ());
82 }
83
84 // allocate a new combination
85 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
86 {
87 static int seen;
88
89 if (!seen++)
90 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
91
92 return REPLACEMENT_CHAR;
93 }
94
95 v.push_back (compose_char (c1, c2));
96
97 return v.size () - 1 + COMPOSE_LO;
98}
99
100int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
101{
102 compose_char *cc = (*this)[c];
103
104 if (!cc)
105 {
106 if (r) *r = c;
107 return 1;
108 }
109
110 int len = expand (cc->c1, r);
111
112 if (r) r += len;
113
114 if (cc->c2 != NOCHAR)
115 {
116 len++;
117 if (r) *r++ = cc->c2;
118 }
119
120 return len;
121
122}
123#endif
124
61void * 125void *
62rxvt_term::operator new (size_t s) 126rxvt_term::operator new (size_t s)
63{ 127{
64 void *p = malloc (s); 128 void *p = malloc (s);
65 129
… …
118 182
119 delete TermWin.fontset; 183 delete TermWin.fontset;
120 184
121 if (display) 185 if (display)
122 { 186 {
187 selection_clear ();
188
189#ifdef MENUBAR
190 if (menubarGC) XFreeGC (display->display, menubarGC);
191#endif
192#ifdef XTERM_SCROLLBAR
193 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
194 if (ShadowGC) XFreeGC (display->display, ShadowGC);
195#endif
196#ifdef PLAIN_SCROLLBAR
197 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
198#endif
199#ifdef NEXT_SCROLLBAR
200 if (blackGC) XFreeGC (display->display, blackGC);
201 if (whiteGC) XFreeGC (display->display, whiteGC);
202 if (grayGC) XFreeGC (display->display, grayGC);
203 if (darkGC) XFreeGC (display->display, darkGC);
204 if (stippleGC) XFreeGC (display->display, stippleGC);
205 if (dimple) XFreePixmap (display->display, dimple);
206 if (upArrow) XFreePixmap (display->display, upArrow);
207 if (downArrow) XFreePixmap (display->display, downArrow);
208 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
209 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
210#endif
211#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
212 if (topShadowGC) XFreeGC (display->display, topShadowGC);
213 if (botShadowGC) XFreeGC (display->display, botShadowGC);
214 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
215#endif
216 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
217
218#if defined(MENUBAR) && (MENUBAR_MAX > 1)
219 delete menuBar.drawable;
220 //if (menuBar.win)
221 // XDestroyWindow (display->display, menuBar.win);
222#endif
223 delete TermWin.drawable;
224 // destroy all windows
123 if (TermWin.parent[0]) 225 if (TermWin.parent[0])
124 XDestroyWindow (display->display, TermWin.parent[0]); 226 XDestroyWindow (display->display, TermWin.parent[0]);
125#if defined(MENUBAR) && (MENUBAR_MAX > 1)
126 if (menuBar.win)
127 XDestroyWindow (display->display, menuBar.win);
128 delete menuBar.drawable;
129#endif
130 } 227 }
131 228
132 // TODO: free pixcolours, colours should become part of rxvt_display 229 // TODO: free pixcolours, colours should become part of rxvt_display
133 230
134 delete PixColors; 231 delete PixColors;
135 232
136 displays.put (display); 233 displays.put (display);
137 234
138 scr_release (); 235 scr_release ();
139 236
237 /* clear all resources */
238 for (int i = 0; i < allocated.size (); i++)
239 free (allocated[i]);
240
241 free (selection.text);
242 // TODO: manage env vars in child only(!)
140 free (env_windowid); 243 free (env_windowid);
141 free (env_display); 244 free (env_display);
142 free (env_term); 245 free (env_term);
143 free (env_colorfgbg); 246 free (env_colorfgbg);
144 free (locale); 247 free (locale);
248#if 0
145 free (codeset); 249 free (codeset);
250#endif
146 251
147 delete envv; 252 delete envv;
148 delete argv; 253 delete argv;
149} 254}
150 255
… …
191 delete this; 296 delete this;
192} 297}
193 298
194/*----------------------------------------------------------------------*/ 299/*----------------------------------------------------------------------*/
195/* rxvt_init () */ 300/* rxvt_init () */
196/* LIBPROTO */
197rxvt_t
198rxvt_init (int argc, const char *const *argv)
199{
200 SET_R (new rxvt_term);
201
202 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
203 {
204 delete GET_R;
205 SET_R (0);
206 }
207
208 return GET_R;
209}
210
211static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
212
213void
214rxvt_init_signals ()
215{
216 /* install exit handler for cleanup */
217#if 0
218#ifdef HAVE_ATEXIT
219 atexit (rxvt_clean_exit);
220#else
221#endif
222#endif
223
224 struct sigaction sa;
225
226 sigfillset (&sa.sa_mask);
227 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
228 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
229 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
230 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
231 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
232 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
233 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
234
235 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
236 /* signal (SIGURG, SIG_DFL); */
237
238 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
239 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
240}
241
242bool 301bool
243rxvt_term::init (int argc, const char *const *argv) 302rxvt_term::init (int argc, const char *const *argv)
244{ 303{
304 SET_R (this);
305
306 if (!init_vars ())
307 return false;
308
245 /* 309 /*
246 * Save and then give up any super-user privileges 310 * Save and then give up any super-user privileges
247 * If we need privileges in any area then we must specifically request it. 311 * If we need privileges in any area then we must specifically request it.
248 * We should only need to be root in these cases: 312 * We should only need to be root in these cases:
249 * 1. write utmp entries on some systems 313 * 1. write utmp entries on some systems
… …
302 pty_ev.start (cmd_fd, EVENT_READ); 366 pty_ev.start (cmd_fd, EVENT_READ);
303 367
304 check_ev.start (); 368 check_ev.start ();
305 369
306 return true; 370 return true;
371}
372
373static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
374
375void
376rxvt_init_signals ()
377{
378 /* install exit handler for cleanup */
379#if 0
380#ifdef HAVE_ATEXIT
381 atexit (rxvt_clean_exit);
382#else
383#endif
384#endif
385
386 struct sigaction sa;
387
388 sigfillset (&sa.sa_mask);
389 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
390 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
391 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
392 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
393 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
394 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
395 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
396
397 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
398 /* signal (SIGURG, SIG_DFL); */
399
400 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
401 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
307} 402}
308 403
309/* ------------------------------------------------------------------------- * 404/* ------------------------------------------------------------------------- *
310 * SIGNAL HANDLING & EXIT HANDLER * 405 * SIGNAL HANDLING & EXIT HANDLER *
311 * ------------------------------------------------------------------------- */ 406 * ------------------------------------------------------------------------- */
… …
335RETSIGTYPE 430RETSIGTYPE
336rxvt_Exit_signal (int sig) 431rxvt_Exit_signal (int sig)
337{ 432{
338 signal (sig, SIG_DFL); 433 signal (sig, SIG_DFL);
339#ifdef DEBUG_CMD 434#ifdef DEBUG_CMD
340 rxvt_print_error ("signal %d", sig); 435 rxvt_warn ("caught signal %d, exiting.\n", sig);
341#endif 436#endif
342 rxvt_clean_exit (); 437 rxvt_clean_exit ();
343 kill (getpid (), sig); 438 kill (getpid (), sig);
344} 439}
345 440
… …
383 478
384 p = malloc (size); 479 p = malloc (size);
385 if (p) 480 if (p)
386 return p; 481 return p;
387 482
388 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 483 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
389 rxvt_clean_exit (); 484 rxvt_clean_exit ();
390 exit (EXIT_FAILURE); 485 exit (EXIT_FAILURE);
391 /* NOTREACHED */ 486 /* NOTREACHED */
392} 487}
393 488
… …
399 494
400 p = calloc (number, size); 495 p = calloc (number, size);
401 if (p) 496 if (p)
402 return p; 497 return p;
403 498
404 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 499 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
405 rxvt_clean_exit (); 500 rxvt_clean_exit ();
406 exit (EXIT_FAILURE); 501 exit (EXIT_FAILURE);
407 /* NOTREACHED */ 502 /* NOTREACHED */
408} 503}
409 504
… …
418 else 513 else
419 p = malloc (size); 514 p = malloc (size);
420 if (p) 515 if (p)
421 return p; 516 return p;
422 517
423 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 518 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
424 rxvt_clean_exit (); 519 rxvt_clean_exit ();
425 exit (EXIT_FAILURE); 520 exit (EXIT_FAILURE);
426 /* NOTREACHED */ 521 /* NOTREACHED */
427} 522}
428 523
… …
620 else 715 else
621 szHint.win_gravity = SouthWestGravity; 716 szHint.win_gravity = SouthWestGravity;
622 } 717 }
623 } 718 }
624 } 719 }
720
625 /* TODO: BOUNDS */ 721 /* TODO: BOUNDS */
626 TermWin.width = TermWin.ncol * TermWin.fwidth; 722 TermWin.width = TermWin.ncol * TermWin.fwidth;
627 TermWin.height = TermWin.nrow * TermWin.fheight; 723 TermWin.height = TermWin.nrow * TermWin.fheight;
628 max_width = MAX_COLS * TermWin.fwidth; 724 max_width = MAX_COLS * TermWin.fwidth;
629 max_height = MAX_ROWS * TermWin.fheight; 725 max_height = MAX_ROWS * TermWin.fheight;
… …
737 } 833 }
738 else 834 else
739 { 835 {
740 rxvt_fontset *fs = new rxvt_fontset (this); 836 rxvt_fontset *fs = new rxvt_fontset (this);
741 837
742 if (fs && fs->populate (fontname)) 838 if (fs && fs->populate (fontname ? fontname : "fixed"))
743 { 839 {
744 delete TermWin.fontset; 840 delete TermWin.fontset;
745 TermWin.fontset = fs; 841 TermWin.fontset = fs;
746 TermWin.fwidth = fs->base_font ()->width; 842 TermWin.fwidth = fs->base_font ()->width;
747 TermWin.fheight = fs->base_font ()->height; 843 TermWin.fheight = fs->base_font ()->height;
748 TermWin.fbase = fs->base_font ()->ascent; 844 TermWin.fbase = fs->base_font ()->ascent;
749 845
750 // TODO: screen needs to be told about new fonts
751
752 if (TermWin.parent[0]) 846 if (TermWin.parent[0])
753 { 847 {
754 resize_all_windows (0, 0, 0); 848 resize_all_windows (0, 0, 0);
755 scr_remap_chars (); 849 scr_remap_chars ();
756 scr_touch (true); 850 scr_touch (true);
… …
776rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
777{ 871{
778#ifndef SMART_WINDOW_TITLE 872#ifndef SMART_WINDOW_TITLE
779 XStoreName (display->display, TermWin.parent[0], str); 873 XStoreName (display->display, TermWin.parent[0], str);
780#else 874#else
781 char *name; 875 char *name;
782 876
783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 877 if (!XFetchName (display->display, TermWin.parent[0], &name))
784 name = NULL; 878 name = NULL;
879
785 if (name == NULL || STRCMP (name, str)) 880 if (name == NULL || STRCMP (name, str))
786 XStoreName (display->display, TermWin.parent[0], str); 881 XStoreName (display->display, TermWin.parent[0], str);
882
787 if (name) 883 if (name)
788 XFree (name); 884 XFree (name);
789#endif 885#endif
790} 886}
791 887
792void 888void
793rxvt_term::set_iconName (const char *str) 889rxvt_term::set_icon_name (const char *str)
794{ 890{
795#ifndef SMART_WINDOW_TITLE 891#ifndef SMART_WINDOW_TITLE
796 XSetIconName (display->display, TermWin.parent[0], str); 892 XSetIconName (display->display, TermWin.parent[0], str);
797#else 893#else
798 char *name; 894 char *name;
799 895
800 if (XGetIconName (display->display, TermWin.parent[0], &name)) 896 if (!XGetIconName (display->display, TermWin.parent[0], &name))
801 name = NULL; 897 name = NULL;
898
802 if (name == NULL || STRCMP (name, str)) 899 if (name == NULL || STRCMP (name, str))
803 XSetIconName (display->display, TermWin.parent[0], str); 900 XSetIconName (display->display, TermWin.parent[0], str);
901
804 if (name) 902 if (name)
805 XFree (name); 903 XFree (name);
806#endif 904#endif
807} 905}
808 906
809#ifdef XTERM_COLOR_CHANGE 907#ifdef XTERM_COLOR_CHANGE
810void 908void
811rxvt_term::set_window_color (int idx, const char *color) 909rxvt_term::set_window_color (int idx, const char *color)
812{ 910{
813 rxvt_color xcol; 911 rxvt_color xcol;
814 int i; 912 int i;
815 913
816 if (color == NULL || *color == '\0') 914 if (color == NULL || *color == '\0')
817 return; 915 return;
818 916
819 /* handle color aliases */ 917 /* handle color aliases */
… …
946int 1044int
947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
948{ 1046{
949 if (!screen_in_out->set (display, colour)) 1047 if (!screen_in_out->set (display, colour))
950 { 1048 {
951 rxvt_print_error ("can't allocate colour: %s", colour); 1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
952 return false; 1050 return false;
953 } 1051 }
954 1052
955 return true; 1053 return true;
956} 1054}
… …
1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1134 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1037 1135
1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1136 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
1039 window_vt_y, TermWin_TotalWidth (), 1137 window_vt_y, TermWin_TotalWidth (),
1040 TermWin_TotalHeight ()); 1138 TermWin_TotalHeight ());
1041 scr_clear (); 1139 scr_clear (height != old_height);
1042#ifdef XPM_BACKGROUND 1140#ifdef XPM_BACKGROUND
1043 resize_pixmap (); 1141 resize_pixmap ();
1044#endif 1142#endif
1045 1143
1046 } 1144 }
… …
1323 if (preedit_attr) XFree (preedit_attr); 1421 if (preedit_attr) XFree (preedit_attr);
1324 if (status_attr) XFree (status_attr); 1422 if (status_attr) XFree (status_attr);
1325 1423
1326 if (Input_Context == NULL) 1424 if (Input_Context == NULL)
1327 { 1425 {
1328 rxvt_print_error ("failed to create input context"); 1426 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1329 display->put_xim (input_method); 1427 display->put_xim (input_method);
1330 return false; 1428 return false;
1331 } 1429 }
1332 1430
1333 if (input_style & XIMPreeditArea) 1431 if (input_style & XIMPreeditArea)

Diff Legend

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