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.51 by pcg, Sat Mar 6 00:05:01 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
61class rxvt_composite_vec rxvt_composite; 62class rxvt_composite_vec rxvt_composite;
62 63
63text_t rxvt_composite_vec::compose (uint32_t c1, uint32_t c2) 64text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
64{ 65{
65 compose_char *cc; 66 compose_char *cc;
66 67
67 // break compose chains, as stupid readline really likes to duplicate 68 // break compose chains, as stupid readline really likes to duplicate
68 // composing characters for some reason near the end of a line. 69 // composing characters for some reason near the end of a line.
… …
94 v.push_back (compose_char (c1, c2)); 95 v.push_back (compose_char (c1, c2));
95 96
96 return v.size () - 1 + COMPOSE_LO; 97 return v.size () - 1 + COMPOSE_LO;
97} 98}
98 99
99int rxvt_composite_vec::expand (uint32_t c, wchar_t *r) 100int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
100{ 101{
101 compose_char *cc = (*this)[c]; 102 compose_char *cc = (*this)[c];
102 103
103 if (!cc) 104 if (!cc)
104 { 105 {
… …
117 } 118 }
118 119
119 return len; 120 return len;
120 121
121} 122}
123#endif
122 124
123extern struct rxvt_composite_vec rxvt_composite;
124void * 125void *
125rxvt_term::operator new (size_t s) 126rxvt_term::operator new (size_t s)
126{ 127{
127 void *p = malloc (s); 128 void *p = malloc (s);
128 129
… …
181 182
182 delete TermWin.fontset; 183 delete TermWin.fontset;
183 184
184 if (display) 185 if (display)
185 { 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
186#if defined(MENUBAR) && (MENUBAR_MAX > 1) 218#if defined(MENUBAR) && (MENUBAR_MAX > 1)
187 delete menuBar.drawable; 219 delete menuBar.drawable;
188 //if (menuBar.win) 220 //if (menuBar.win)
189 // XDestroyWindow (display->display, menuBar.win); 221 // XDestroyWindow (display->display, menuBar.win);
190#endif 222#endif
… …
200 232
201 displays.put (display); 233 displays.put (display);
202 234
203 scr_release (); 235 scr_release ();
204 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(!)
205 free (env_windowid); 243 free (env_windowid);
206 free (env_display); 244 free (env_display);
207 free (env_term); 245 free (env_term);
208 free (env_colorfgbg); 246 free (env_colorfgbg);
209 free (locale); 247 free (locale);
248#if 0
210 free (codeset); 249 free (codeset);
250#endif
211 251
212 delete envv; 252 delete envv;
213 delete argv; 253 delete argv;
214} 254}
215 255
… …
256 delete this; 296 delete this;
257} 297}
258 298
259/*----------------------------------------------------------------------*/ 299/*----------------------------------------------------------------------*/
260/* rxvt_init () */ 300/* rxvt_init () */
261/* LIBPROTO */
262rxvt_t
263rxvt_init (int argc, const char *const *argv)
264{
265 SET_R (new rxvt_term);
266
267 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
268 {
269 delete GET_R;
270 SET_R (0);
271 }
272
273 return GET_R;
274}
275
276static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
277
278void
279rxvt_init_signals ()
280{
281 /* install exit handler for cleanup */
282#if 0
283#ifdef HAVE_ATEXIT
284 atexit (rxvt_clean_exit);
285#else
286#endif
287#endif
288
289 struct sigaction sa;
290
291 sigfillset (&sa.sa_mask);
292 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
293 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
294 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
295 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
296 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
297 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
298 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
299
300 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
301 /* signal (SIGURG, SIG_DFL); */
302
303 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
304 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
305}
306
307bool 301bool
308rxvt_term::init (int argc, const char *const *argv) 302rxvt_term::init (int argc, const char *const *argv)
309{ 303{
304 SET_R (this);
305
306 if (!init_vars ())
307 return false;
308
310 /* 309 /*
311 * Save and then give up any super-user privileges 310 * Save and then give up any super-user privileges
312 * 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.
313 * We should only need to be root in these cases: 312 * We should only need to be root in these cases:
314 * 1. write utmp entries on some systems 313 * 1. write utmp entries on some systems
… …
367 pty_ev.start (cmd_fd, EVENT_READ); 366 pty_ev.start (cmd_fd, EVENT_READ);
368 367
369 check_ev.start (); 368 check_ev.start ();
370 369
371 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);
372} 402}
373 403
374/* ------------------------------------------------------------------------- * 404/* ------------------------------------------------------------------------- *
375 * SIGNAL HANDLING & EXIT HANDLER * 405 * SIGNAL HANDLING & EXIT HANDLER *
376 * ------------------------------------------------------------------------- */ 406 * ------------------------------------------------------------------------- */
… …
400RETSIGTYPE 430RETSIGTYPE
401rxvt_Exit_signal (int sig) 431rxvt_Exit_signal (int sig)
402{ 432{
403 signal (sig, SIG_DFL); 433 signal (sig, SIG_DFL);
404#ifdef DEBUG_CMD 434#ifdef DEBUG_CMD
405 rxvt_print_error ("signal %d", sig); 435 rxvt_warn ("caught signal %d, exiting.\n", sig);
406#endif 436#endif
407 rxvt_clean_exit (); 437 rxvt_clean_exit ();
408 kill (getpid (), sig); 438 kill (getpid (), sig);
409} 439}
410 440
… …
685 else 715 else
686 szHint.win_gravity = SouthWestGravity; 716 szHint.win_gravity = SouthWestGravity;
687 } 717 }
688 } 718 }
689 } 719 }
720
690 /* TODO: BOUNDS */ 721 /* TODO: BOUNDS */
691 TermWin.width = TermWin.ncol * TermWin.fwidth; 722 TermWin.width = TermWin.ncol * TermWin.fwidth;
692 TermWin.height = TermWin.nrow * TermWin.fheight; 723 TermWin.height = TermWin.nrow * TermWin.fheight;
693 max_width = MAX_COLS * TermWin.fwidth; 724 max_width = MAX_COLS * TermWin.fwidth;
694 max_height = MAX_ROWS * TermWin.fheight; 725 max_height = MAX_ROWS * TermWin.fheight;
… …
841#ifndef SMART_WINDOW_TITLE 872#ifndef SMART_WINDOW_TITLE
842 XStoreName (display->display, TermWin.parent[0], str); 873 XStoreName (display->display, TermWin.parent[0], str);
843#else 874#else
844 char *name; 875 char *name;
845 876
846 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 877 if (!XFetchName (display->display, TermWin.parent[0], &name))
847 name = NULL; 878 name = NULL;
879
848 if (name == NULL || STRCMP (name, str)) 880 if (name == NULL || STRCMP (name, str))
849 XStoreName (display->display, TermWin.parent[0], str); 881 XStoreName (display->display, TermWin.parent[0], str);
882
850 if (name) 883 if (name)
851 XFree (name); 884 XFree (name);
852#endif 885#endif
853} 886}
854 887
855void 888void
856rxvt_term::set_iconName (const char *str) 889rxvt_term::set_icon_name (const char *str)
857{ 890{
858#ifndef SMART_WINDOW_TITLE 891#ifndef SMART_WINDOW_TITLE
859 XSetIconName (display->display, TermWin.parent[0], str); 892 XSetIconName (display->display, TermWin.parent[0], str);
860#else 893#else
861 char *name; 894 char *name;
862 895
863 if (XGetIconName (display->display, TermWin.parent[0], &name)) 896 if (!XGetIconName (display->display, TermWin.parent[0], &name))
864 name = NULL; 897 name = NULL;
898
865 if (name == NULL || STRCMP (name, str)) 899 if (name == NULL || STRCMP (name, str))
866 XSetIconName (display->display, TermWin.parent[0], str); 900 XSetIconName (display->display, TermWin.parent[0], str);
901
867 if (name) 902 if (name)
868 XFree (name); 903 XFree (name);
869#endif 904#endif
870} 905}
871 906
… …
1009int 1044int
1010rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1011{ 1046{
1012 if (!screen_in_out->set (display, colour)) 1047 if (!screen_in_out->set (display, colour))
1013 { 1048 {
1014 rxvt_print_error ("can't allocate colour: %s", colour); 1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1015 return false; 1050 return false;
1016 } 1051 }
1017 1052
1018 return true; 1053 return true;
1019} 1054}
… …
1386 if (preedit_attr) XFree (preedit_attr); 1421 if (preedit_attr) XFree (preedit_attr);
1387 if (status_attr) XFree (status_attr); 1422 if (status_attr) XFree (status_attr);
1388 1423
1389 if (Input_Context == NULL) 1424 if (Input_Context == NULL)
1390 { 1425 {
1391 rxvt_print_error ("failed to create input context"); 1426 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1392 display->put_xim (input_method); 1427 display->put_xim (input_method);
1393 return false; 1428 return false;
1394 } 1429 }
1395 1430
1396 if (input_style & XIMPreeditArea) 1431 if (input_style & XIMPreeditArea)

Diff Legend

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