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.43 by pcg, Tue Feb 24 00:02: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
… …
117#endif 181#endif
118 182
119 delete TermWin.fontset; 183 delete TermWin.fontset;
120 184
121 if (display) 185 if (display)
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
122 if (TermWin.parent[0]) 225 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]); 226 XDestroyWindow (display->display, TermWin.parent[0]);
227 }
124 228
125 // TODO: free pixcolours, colours should become part of rxvt_display 229 // TODO: free pixcolours, colours should become part of rxvt_display
126 230
127 delete PixColors; 231 delete PixColors;
128 232
129 displays.put (display); 233 displays.put (display);
130 234
131 scr_release (); 235 scr_release ();
132 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(!)
133 free (env_windowid); 243 free (env_windowid);
134 free (env_display); 244 free (env_display);
135 free (env_term); 245 free (env_term);
136 free (env_colorfgbg); 246 free (env_colorfgbg);
137 free (locale); 247 free (locale);
248#if 0
138 free (codeset); 249 free (codeset);
250#endif
139 251
140 delete envv; 252 delete envv;
141 delete argv; 253 delete argv;
142} 254}
143 255
… …
184 delete this; 296 delete this;
185} 297}
186 298
187/*----------------------------------------------------------------------*/ 299/*----------------------------------------------------------------------*/
188/* rxvt_init () */ 300/* rxvt_init () */
189/* LIBPROTO */
190rxvt_t
191rxvt_init (int argc, const char *const *argv)
192{
193 SET_R (new rxvt_term);
194
195 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
196 {
197 delete GET_R;
198 SET_R (0);
199 }
200
201 return GET_R;
202}
203
204static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
205
206void
207rxvt_init_signals ()
208{
209 /* install exit handler for cleanup */
210#if 0
211#ifdef HAVE_ATEXIT
212 atexit (rxvt_clean_exit);
213#else
214#endif
215#endif
216
217 struct sigaction sa;
218
219 sigfillset (&sa.sa_mask);
220 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
221 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
222 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
223 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
224 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
225 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
226 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
227
228 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
229 /* signal (SIGURG, SIG_DFL); */
230
231 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
232 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
233}
234
235bool 301bool
236rxvt_term::init (int argc, const char *const *argv) 302rxvt_term::init (int argc, const char *const *argv)
237{ 303{
304 SET_R (this);
305
306 if (!init_vars ())
307 return false;
308
238 /* 309 /*
239 * Save and then give up any super-user privileges 310 * Save and then give up any super-user privileges
240 * 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.
241 * We should only need to be root in these cases: 312 * We should only need to be root in these cases:
242 * 1. write utmp entries on some systems 313 * 1. write utmp entries on some systems
… …
249 320
250 const char **cmd_argv = init_resources (argc, argv); 321 const char **cmd_argv = init_resources (argc, argv);
251 322
252 set_locale (""); 323 set_locale ("");
253 324
254#if (MENUBAR_MAX) 325#if MENUBAR_MAX
255 menubar_read (rs[Rs_menu]); 326 menubar_read (rs[Rs_menu]);
256#endif 327#endif
257#ifdef HAVE_SCROLLBARS 328#ifdef HAVE_SCROLLBARS
258 if (Options & Opt_scrollBar) 329 if (Options & Opt_scrollBar)
259 scrollBar.setIdle (); /* set existence for size calculations */ 330 scrollBar.setIdle (); /* set existence for size calculations */
… …
295 pty_ev.start (cmd_fd, EVENT_READ); 366 pty_ev.start (cmd_fd, EVENT_READ);
296 367
297 check_ev.start (); 368 check_ev.start ();
298 369
299 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);
300} 402}
301 403
302/* ------------------------------------------------------------------------- * 404/* ------------------------------------------------------------------------- *
303 * SIGNAL HANDLING & EXIT HANDLER * 405 * SIGNAL HANDLING & EXIT HANDLER *
304 * ------------------------------------------------------------------------- */ 406 * ------------------------------------------------------------------------- */
… …
328RETSIGTYPE 430RETSIGTYPE
329rxvt_Exit_signal (int sig) 431rxvt_Exit_signal (int sig)
330{ 432{
331 signal (sig, SIG_DFL); 433 signal (sig, SIG_DFL);
332#ifdef DEBUG_CMD 434#ifdef DEBUG_CMD
333 rxvt_print_error ("signal %d", sig); 435 rxvt_warn ("caught signal %d, exiting.\n", sig);
334#endif 436#endif
335 rxvt_clean_exit (); 437 rxvt_clean_exit ();
336 kill (getpid (), sig); 438 kill (getpid (), sig);
337} 439}
338 440
… …
376 478
377 p = malloc (size); 479 p = malloc (size);
378 if (p) 480 if (p)
379 return p; 481 return p;
380 482
381 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 483 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
382 rxvt_clean_exit (); 484 rxvt_clean_exit ();
383 exit (EXIT_FAILURE); 485 exit (EXIT_FAILURE);
384 /* NOTREACHED */ 486 /* NOTREACHED */
385} 487}
386 488
… …
392 494
393 p = calloc (number, size); 495 p = calloc (number, size);
394 if (p) 496 if (p)
395 return p; 497 return p;
396 498
397 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 499 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
398 rxvt_clean_exit (); 500 rxvt_clean_exit ();
399 exit (EXIT_FAILURE); 501 exit (EXIT_FAILURE);
400 /* NOTREACHED */ 502 /* NOTREACHED */
401} 503}
402 504
… …
411 else 513 else
412 p = malloc (size); 514 p = malloc (size);
413 if (p) 515 if (p)
414 return p; 516 return p;
415 517
416 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 518 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
417 rxvt_clean_exit (); 519 rxvt_clean_exit ();
418 exit (EXIT_FAILURE); 520 exit (EXIT_FAILURE);
419 /* NOTREACHED */ 521 /* NOTREACHED */
420} 522}
421 523
… …
613 else 715 else
614 szHint.win_gravity = SouthWestGravity; 716 szHint.win_gravity = SouthWestGravity;
615 } 717 }
616 } 718 }
617 } 719 }
720
618 /* TODO: BOUNDS */ 721 /* TODO: BOUNDS */
619 TermWin.width = TermWin.ncol * TermWin.fwidth; 722 TermWin.width = TermWin.ncol * TermWin.fwidth;
620 TermWin.height = TermWin.nrow * TermWin.fheight; 723 TermWin.height = TermWin.nrow * TermWin.fheight;
621 max_width = MAX_COLS * TermWin.fwidth; 724 max_width = MAX_COLS * TermWin.fwidth;
622 max_height = MAX_ROWS * TermWin.fheight; 725 max_height = MAX_ROWS * TermWin.fheight;
… …
730 } 833 }
731 else 834 else
732 { 835 {
733 rxvt_fontset *fs = new rxvt_fontset (this); 836 rxvt_fontset *fs = new rxvt_fontset (this);
734 837
735 if (fs && fs->populate (fontname)) 838 if (fs && fs->populate (fontname ? fontname : "fixed"))
736 { 839 {
737 delete TermWin.fontset; 840 delete TermWin.fontset;
738 TermWin.fontset = fs; 841 TermWin.fontset = fs;
739 TermWin.fwidth = fs->base_font ()->width; 842 TermWin.fwidth = fs->base_font ()->width;
740 TermWin.fheight = fs->base_font ()->height; 843 TermWin.fheight = fs->base_font ()->height;
741 TermWin.fbase = fs->base_font ()->ascent; 844 TermWin.fbase = fs->base_font ()->ascent;
742 845
743 // TODO: screen needs to be told about new fonts
744
745 if (TermWin.parent[0]) 846 if (TermWin.parent[0])
746 { 847 {
747 resize_all_windows (0, 0, 0); 848 resize_all_windows (0, 0, 0);
748 scr_remap_chars (); 849 scr_remap_chars ();
749 scr_touch (true); 850 scr_touch (true);
… …
769rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
770{ 871{
771#ifndef SMART_WINDOW_TITLE 872#ifndef SMART_WINDOW_TITLE
772 XStoreName (display->display, TermWin.parent[0], str); 873 XStoreName (display->display, TermWin.parent[0], str);
773#else 874#else
774 char *name; 875 char *name;
775 876
776 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 877 if (!XFetchName (display->display, TermWin.parent[0], &name))
777 name = NULL; 878 name = NULL;
879
778 if (name == NULL || STRCMP (name, str)) 880 if (name == NULL || STRCMP (name, str))
779 XStoreName (display->display, TermWin.parent[0], str); 881 XStoreName (display->display, TermWin.parent[0], str);
882
780 if (name) 883 if (name)
781 XFree (name); 884 XFree (name);
782#endif 885#endif
783} 886}
784 887
785void 888void
786rxvt_term::set_iconName (const char *str) 889rxvt_term::set_icon_name (const char *str)
787{ 890{
788#ifndef SMART_WINDOW_TITLE 891#ifndef SMART_WINDOW_TITLE
789 XSetIconName (display->display, TermWin.parent[0], str); 892 XSetIconName (display->display, TermWin.parent[0], str);
790#else 893#else
791 char *name; 894 char *name;
792 895
793 if (XGetIconName (display->display, TermWin.parent[0], &name)) 896 if (!XGetIconName (display->display, TermWin.parent[0], &name))
794 name = NULL; 897 name = NULL;
898
795 if (name == NULL || STRCMP (name, str)) 899 if (name == NULL || STRCMP (name, str))
796 XSetIconName (display->display, TermWin.parent[0], str); 900 XSetIconName (display->display, TermWin.parent[0], str);
901
797 if (name) 902 if (name)
798 XFree (name); 903 XFree (name);
799#endif 904#endif
800} 905}
801 906
802#ifdef XTERM_COLOR_CHANGE 907#ifdef XTERM_COLOR_CHANGE
803void 908void
804rxvt_term::set_window_color (int idx, const char *color) 909rxvt_term::set_window_color (int idx, const char *color)
805{ 910{
806 rxvt_color xcol; 911 rxvt_color xcol;
807 int i; 912 int i;
808 913
809 if (color == NULL || *color == '\0') 914 if (color == NULL || *color == '\0')
810 return; 915 return;
811 916
812 /* handle color aliases */ 917 /* handle color aliases */
… …
939int 1044int
940rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
941{ 1046{
942 if (!screen_in_out->set (display, colour)) 1047 if (!screen_in_out->set (display, colour))
943 { 1048 {
944 rxvt_print_error ("can't allocate colour: %s", colour); 1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
945 return false; 1050 return false;
946 } 1051 }
947 1052
948 return true; 1053 return true;
949} 1054}
… …
1029 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1134 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1030 1135
1031 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1136 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
1032 window_vt_y, TermWin_TotalWidth (), 1137 window_vt_y, TermWin_TotalWidth (),
1033 TermWin_TotalHeight ()); 1138 TermWin_TotalHeight ());
1034 scr_clear (); 1139 scr_clear (height != old_height);
1035#ifdef XPM_BACKGROUND 1140#ifdef XPM_BACKGROUND
1036 resize_pixmap (); 1141 resize_pixmap ();
1037#endif 1142#endif
1038 1143
1039 } 1144 }
… …
1316 if (preedit_attr) XFree (preedit_attr); 1421 if (preedit_attr) XFree (preedit_attr);
1317 if (status_attr) XFree (status_attr); 1422 if (status_attr) XFree (status_attr);
1318 1423
1319 if (Input_Context == NULL) 1424 if (Input_Context == NULL)
1320 { 1425 {
1321 rxvt_print_error ("failed to create input context"); 1426 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1322 display->put_xim (input_method); 1427 display->put_xim (input_method);
1323 return false; 1428 return false;
1324 } 1429 }
1325 1430
1326 if (input_style & XIMPreeditArea) 1431 if (input_style & XIMPreeditArea)

Diff Legend

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