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.80 by root, Fri Aug 13 19:31:23 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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);
… …
73 free (p); 140 free (p);
74} 141}
75 142
76rxvt_term::rxvt_term () 143rxvt_term::rxvt_term ()
77 : 144 :
145#if TRANSPARENT
78 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif
169#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
79 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
80 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
91 text_blink_ev (this, &rxvt_term::text_blink_cb),
92#endif
93#ifdef POINTER_BLANK
94 pointer_ev (this, &rxvt_term::pointer_cb),
95#endif
96#ifdef USE_XIM
97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb), 177 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb),
100 destroy_ev (this, &rxvt_term::destroy_cb), 179 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb), 180 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb) 181 incr_ev (this, &rxvt_term::incr_cb)
103{ 182{
104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
184
185 termlist.push_back (this);
105} 186}
106 187
107rxvt_term::~rxvt_term () 188rxvt_term::~rxvt_term ()
108{ 189{
190 termlist.erase (find (termlist.begin (), termlist.end(), this));
191
109 if (cmd_fd >= 0) 192 if (cmd_fd >= 0)
110 close (cmd_fd); 193 close (cmd_fd);
111 194
112#ifndef NO_SETOWNER_TTYDEV 195#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE); 196 privileged_ttydev (RESTORE);
… …
118 201
119 delete TermWin.fontset; 202 delete TermWin.fontset;
120 203
121 if (display) 204 if (display)
122 { 205 {
206 selection_clear ();
207
208#ifdef USE_XIM
209 im_destroy ();
210#endif
211#ifdef MENUBAR
212 if (menubarGC) XFreeGC (display->display, menubarGC);
213#endif
214#ifdef XTERM_SCROLLBAR
215 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
216 if (ShadowGC) XFreeGC (display->display, ShadowGC);
217#endif
218#ifdef PLAIN_SCROLLBAR
219 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
220#endif
221#ifdef NEXT_SCROLLBAR
222 if (blackGC) XFreeGC (display->display, blackGC);
223 if (whiteGC) XFreeGC (display->display, whiteGC);
224 if (grayGC) XFreeGC (display->display, grayGC);
225 if (darkGC) XFreeGC (display->display, darkGC);
226 if (stippleGC) XFreeGC (display->display, stippleGC);
227 if (dimple) XFreePixmap (display->display, dimple);
228 if (upArrow) XFreePixmap (display->display, upArrow);
229 if (downArrow) XFreePixmap (display->display, downArrow);
230 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
231 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
232#endif
233#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
234 if (topShadowGC) XFreeGC (display->display, topShadowGC);
235 if (botShadowGC) XFreeGC (display->display, botShadowGC);
236 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
237#endif
238 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
239
240#if defined(MENUBAR) && (MENUBAR_MAX > 1)
241 delete menuBar.drawable;
242 //if (menuBar.win)
243 // XDestroyWindow (display->display, menuBar.win);
244#endif
245 delete TermWin.drawable;
246 // destroy all windows
123 if (TermWin.parent[0]) 247 if (TermWin.parent[0])
124 XDestroyWindow (display->display, TermWin.parent[0]); 248 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 } 249 }
131 250
132 // TODO: free pixcolours, colours should become part of rxvt_display 251 // TODO: free pixcolours, colours should become part of rxvt_display
133 252
134 delete PixColors; 253 delete PixColorsFocused;
254#ifdef OFF_FOCUS_FADING
255 delete PixColorsUnFocused;
256#endif
135 257
136 displays.put (display); 258 displays.put (display);
137 259
138 scr_release (); 260 scr_release ();
139 261
262 /* clear all resources */
263 for (int i = 0; i < allocated.size (); i++)
264 free (allocated[i]);
265
266 free (selection.text);
267 // TODO: manage env vars in child only(!)
140 free (env_windowid); 268 free (env_windowid);
141 free (env_display); 269 free (env_display);
142 free (env_term); 270 free (env_term);
143 free (env_colorfgbg); 271 free (env_colorfgbg);
144 free (locale); 272 free (locale);
273#if 0
145 free (codeset); 274 free (codeset);
275#endif
146 276
147 delete envv; 277 delete envv;
148 delete argv; 278 delete argv;
149} 279}
150 280
151void 281void
152rxvt_term::destroy () 282rxvt_term::destroy ()
153{ 283{
284 if (destroy_ev.active)
285 return;
286
154 if (display) 287 if (display)
155 { 288 {
289#if USE_XIM
290 im_ev.stop (display);
291#endif
292#if HAVE_SCROLLBARS
293 scrollbar_ev.stop (display);
294#endif
295#if MENUBAR
296 menubar_ev.stop (display);
297#endif
298#if TRANSPARENT
156 rootwin_ev.stop (display); 299 rootwin_ev.stop (display);
300#endif
301 incr_ev.stop ();
157 termwin_ev.stop (display); 302 termwin_ev.stop (display);
158 vt_ev.stop (display); 303 vt_ev.stop (display);
159#ifdef USE_XIM
160 im_destroy ();
161 im_ev.stop (display);
162#endif
163#ifdef HAVE_SCROLLBARS
164 scrollbar_ev.stop (display);
165#endif
166#ifdef MENUBAR
167 menubar_ev.stop (display);
168#endif
169 } 304 }
170 305
171 check_ev.stop (); 306 check_ev.stop ();
172 pty_ev.stop (); 307 pty_ev.stop ();
173#ifdef CURSOR_BLINK 308#ifdef CURSOR_BLINK
174 cursor_blink_ev.stop (); 309 cursor_blink_ev.stop ();
175#endif 310#endif
176#ifdef TEXT_BLINK 311#ifdef TEXT_BLINK
177 text_blink_ev.stop (); 312 text_blink_ev.stop ();
178#endif 313#endif
314#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
315 cont_scroll_ev.stop ();
316#endif
317#ifdef SELECTION_SCROLLING
318 sel_scroll_ev.stop ();
319#endif
179#ifdef POINTER_BLANK 320#ifdef POINTER_BLANK
180 pointer_ev.stop (); 321 pointer_ev.stop ();
181#endif 322#endif
182 323
183 destroy_ev.start (0); 324 destroy_ev.start (0);
… …
191 delete this; 332 delete this;
192} 333}
193 334
194/*----------------------------------------------------------------------*/ 335/*----------------------------------------------------------------------*/
195/* rxvt_init () */ 336/* 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 337bool
243rxvt_term::init (int argc, const char *const *argv) 338rxvt_term::init (int argc, const char *const *argv)
244{ 339{
340 SET_R (this);
341
342 if (!init_vars ())
343 return false;
344
245 /* 345 /*
246 * Save and then give up any super-user privileges 346 * Save and then give up any super-user privileges
247 * If we need privileges in any area then we must specifically request it. 347 * If we need privileges in any area then we must specifically request it.
248 * We should only need to be root in these cases: 348 * We should only need to be root in these cases:
249 * 1. write utmp entries on some systems 349 * 1. write utmp entries on some systems
… …
287#ifdef TRANSPARENT 387#ifdef TRANSPARENT
288 if (Options & Opt_transparent) 388 if (Options & Opt_transparent)
289 { 389 {
290 XSelectInput (display->display, display->root, PropertyChangeMask); 390 XSelectInput (display->display, display->root, PropertyChangeMask);
291 check_our_parents (); 391 check_our_parents ();
292 }
293#endif
294
295 rootwin_ev.start (display, display->root); 392 rootwin_ev.start (display, display->root);
393 }
394#endif
296 395
297 XMapWindow (display->display, TermWin.vt); 396 XMapWindow (display->display, TermWin.vt);
298 XMapWindow (display->display, TermWin.parent[0]); 397 XMapWindow (display->display, TermWin.parent[0]);
299 398
300 init_command (cmd_argv); 399 init_command (cmd_argv);
… …
302 pty_ev.start (cmd_fd, EVENT_READ); 401 pty_ev.start (cmd_fd, EVENT_READ);
303 402
304 check_ev.start (); 403 check_ev.start ();
305 404
306 return true; 405 return true;
406}
407
408static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
409
410void
411rxvt_init_signals ()
412{
413 /* install exit handler for cleanup */
414#if 0
415#ifdef HAVE_ATEXIT
416 atexit (rxvt_clean_exit);
417#else
418#endif
419#endif
420
421 struct sigaction sa;
422
423 sigfillset (&sa.sa_mask);
424 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
425 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
426 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
427 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
428 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
429 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
430 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
431
432 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
433 /* signal (SIGURG, SIG_DFL); */
434
435 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
436 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
307} 437}
308 438
309/* ------------------------------------------------------------------------- * 439/* ------------------------------------------------------------------------- *
310 * SIGNAL HANDLING & EXIT HANDLER * 440 * SIGNAL HANDLING & EXIT HANDLER *
311 * ------------------------------------------------------------------------- */ 441 * ------------------------------------------------------------------------- */
312/* 442/*
313 * Catch a SIGCHLD signal and exit if the direct child has died 443 * Catch a SIGCHLD signal and exit if the direct child has died
314 */ 444 */
445
446void rxvt_term::child_exited (int pid)
447{
448 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
449 if (pid == (*t)->cmd_pid)
450 {
451 (*t)->destroy ();
452 break;
453 }
454}
455
315/* ARGSUSED */ 456/* ARGSUSED */
316/* EXTPROTO */ 457/* EXTPROTO */
317RETSIGTYPE 458RETSIGTYPE
318rxvt_Child_signal (int sig __attribute__ ((unused))) 459rxvt_Child_signal (int sig __attribute__ ((unused)))
319{ 460{
320 int pid, save_errno = errno; 461 int pid, save_errno = errno;
462
321 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 463 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
322 ; 464 rxvt_term::child_exited (pid);
465
323 errno = save_errno; 466 errno = save_errno;
324
325#if 0
326 if (pid == cmd_pid)
327 exit (EXIT_SUCCESS);
328#endif
329} 467}
330 468
331/* 469/*
332 * Catch a fatal signal and tidy up before quitting 470 * Catch a fatal signal and tidy up before quitting
333 */ 471 */
… …
335RETSIGTYPE 473RETSIGTYPE
336rxvt_Exit_signal (int sig) 474rxvt_Exit_signal (int sig)
337{ 475{
338 signal (sig, SIG_DFL); 476 signal (sig, SIG_DFL);
339#ifdef DEBUG_CMD 477#ifdef DEBUG_CMD
340 rxvt_print_error ("signal %d", sig); 478 rxvt_warn ("caught signal %d, exiting.\n", sig);
341#endif 479#endif
342 rxvt_clean_exit (); 480 rxvt_clean_exit ();
343 kill (getpid (), sig); 481 kill (getpid (), sig);
344} 482}
345 483
… …
383 521
384 p = malloc (size); 522 p = malloc (size);
385 if (p) 523 if (p)
386 return p; 524 return p;
387 525
388 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 526 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
389 rxvt_clean_exit (); 527 rxvt_clean_exit ();
390 exit (EXIT_FAILURE); 528 exit (EXIT_FAILURE);
391 /* NOTREACHED */ 529 /* NOTREACHED */
392} 530}
393 531
… …
399 537
400 p = calloc (number, size); 538 p = calloc (number, size);
401 if (p) 539 if (p)
402 return p; 540 return p;
403 541
404 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 542 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
405 rxvt_clean_exit (); 543 rxvt_clean_exit ();
406 exit (EXIT_FAILURE); 544 exit (EXIT_FAILURE);
407 /* NOTREACHED */ 545 /* NOTREACHED */
408} 546}
409 547
… …
418 else 556 else
419 p = malloc (size); 557 p = malloc (size);
420 if (p) 558 if (p)
421 return p; 559 return p;
422 560
423 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 561 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
424 rxvt_clean_exit (); 562 rxvt_clean_exit ();
425 exit (EXIT_FAILURE); 563 exit (EXIT_FAILURE);
426 /* NOTREACHED */ 564 /* NOTREACHED */
427} 565}
428 566
… …
620 else 758 else
621 szHint.win_gravity = SouthWestGravity; 759 szHint.win_gravity = SouthWestGravity;
622 } 760 }
623 } 761 }
624 } 762 }
763
625 /* TODO: BOUNDS */ 764 /* TODO: BOUNDS */
626 TermWin.width = TermWin.ncol * TermWin.fwidth; 765 TermWin.width = TermWin.ncol * TermWin.fwidth;
627 TermWin.height = TermWin.nrow * TermWin.fheight; 766 TermWin.height = TermWin.nrow * TermWin.fheight;
628 max_width = MAX_COLS * TermWin.fwidth; 767 max_width = MAX_COLS * TermWin.fwidth;
629 max_height = MAX_ROWS * TermWin.fheight; 768 max_height = MAX_ROWS * TermWin.fheight;
630 769
631 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 770 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
632 771
633 sb_w = mb_h = 0; 772 sb_w = mb_h = 0;
634 window_vt_x = window_vt_y = 0; 773 window_vt_x = window_vt_y = TermWin.int_bwidth;
774
635 if (scrollbar_visible ()) 775 if (scrollbar_visible ())
636 { 776 {
637 sb_w = scrollbar_TotalWidth (); 777 sb_w = scrollbar_TotalWidth ();
638 szHint.base_width += sb_w; 778 szHint.base_width += sb_w;
639 if (! (Options & Opt_scrollBar_right)) 779 if (!(Options & Opt_scrollBar_right))
640 window_vt_x = sb_w; 780 window_vt_x += sb_w;
641 } 781 }
782
642 if (menubar_visible ()) 783 if (menubar_visible ())
643 { 784 {
644 mb_h = menuBar_TotalHeight (); 785 mb_h = menuBar_TotalHeight ();
645 szHint.base_height += mb_h; 786 szHint.base_height += mb_h;
646 window_vt_y = mb_h; 787 window_vt_y += mb_h;
647 } 788 }
789
648 szHint.width_inc = TermWin.fwidth; 790 szHint.width_inc = TermWin.fwidth;
649 szHint.height_inc = TermWin.fheight; 791 szHint.height_inc = TermWin.fheight;
650 szHint.min_width = szHint.base_width + szHint.width_inc; 792 szHint.min_width = szHint.base_width + szHint.width_inc;
651 szHint.min_height = szHint.base_height + szHint.height_inc; 793 szHint.min_height = szHint.base_height + szHint.height_inc;
652 794
… …
658 else 800 else
659 { 801 {
660 MIN_IT (TermWin.width, max_width); 802 MIN_IT (TermWin.width, max_width);
661 szHint.width = szHint.base_width + TermWin.width; 803 szHint.width = szHint.base_width + TermWin.width;
662 } 804 }
805
663 if (height && height - szHint.base_height < max_height) 806 if (height && height - szHint.base_height < max_height)
664 { 807 {
665 szHint.height = height; 808 szHint.height = height;
666 TermWin.height = height - szHint.base_height; 809 TermWin.height = height - szHint.base_height;
667 } 810 }
668 else 811 else
669 { 812 {
670 MIN_IT (TermWin.height, max_height); 813 MIN_IT (TermWin.height, max_height);
671 szHint.height = szHint.base_height + TermWin.height; 814 szHint.height = szHint.base_height + TermWin.height;
672 } 815 }
816
673 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 817 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
674 window_sb_x = szHint.width - sb_w; 818 window_sb_x = szHint.width - sb_w;
675 819
676 if (recalc_x) 820 if (recalc_x)
677 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 821 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
… …
737 } 881 }
738 else 882 else
739 { 883 {
740 rxvt_fontset *fs = new rxvt_fontset (this); 884 rxvt_fontset *fs = new rxvt_fontset (this);
741 885
742 if (fs && fs->populate (fontname)) 886 if (fs && fs->populate (fontname ? fontname : "fixed"))
743 { 887 {
744 delete TermWin.fontset; 888 delete TermWin.fontset;
745 TermWin.fontset = fs; 889 TermWin.fontset = fs;
746 TermWin.fwidth = fs->base_font ()->width; 890 TermWin.fwidth = fs->base_font ()->width;
747 TermWin.fheight = fs->base_font ()->height; 891 TermWin.fheight = fs->base_font ()->height;
748 TermWin.fbase = fs->base_font ()->ascent; 892 TermWin.fbase = fs->base_font ()->ascent;
749 893
750 // TODO: screen needs to be told about new fonts
751
752 if (TermWin.parent[0]) 894 if (TermWin.parent[0])
753 { 895 {
754 resize_all_windows (0, 0, 0); 896 resize_all_windows (0, 0, 0);
755 scr_remap_chars (); 897 scr_remap_chars ();
756 scr_touch (true); 898 scr_touch (true);
757 } 899 }
758 900
901 for (unicode_t ch = 0x20; ch <= 0x7f; ch++)
902 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);
903
759 return true; 904 return true;
760 } 905 }
761 } 906 }
762 907
763 return false; 908 return false;
… …
773/*----------------------------------------------------------------------*/ 918/*----------------------------------------------------------------------*/
774/* xterm sequences - title, iconName, color (exptl) */ 919/* xterm sequences - title, iconName, color (exptl) */
775void 920void
776rxvt_term::set_title (const char *str) 921rxvt_term::set_title (const char *str)
777{ 922{
778#ifndef SMART_WINDOW_TITLE 923#ifdef SMART_WINDOW_TITLE
779 XStoreName (display->display, TermWin.parent[0], str); 924 char *name;
780#else
781 char *name;
782 925
783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 926 if (!XFetchName (display->display, TermWin.parent[0], &name))
784 name = NULL; 927 name = NULL;
928
785 if (name == NULL || STRCMP (name, str)) 929 if (name == NULL || STRCMP (name, str))
930#endif
786 XStoreName (display->display, TermWin.parent[0], str); 931 XStoreName (display->display, TermWin.parent[0], str);
932
933#ifdef SMART_WINDOW_TITLE
787 if (name) 934 if (name)
788 XFree (name); 935 XFree (name);
789#endif 936#endif
790} 937}
791 938
792void 939void
793rxvt_term::set_iconName (const char *str) 940rxvt_term::set_icon_name (const char *str)
794{ 941{
795#ifndef SMART_WINDOW_TITLE 942#ifdef SMART_WINDOW_TITLE
796 XSetIconName (display->display, TermWin.parent[0], str); 943 char *name;
797#else
798 char *name;
799 944
800 if (XGetIconName (display->display, TermWin.parent[0], &name)) 945 if (!XGetIconName (display->display, TermWin.parent[0], &name))
801 name = NULL; 946 name = NULL;
947
802 if (name == NULL || STRCMP (name, str)) 948 if (name == NULL || STRCMP (name, str))
949#endif
803 XSetIconName (display->display, TermWin.parent[0], str); 950 XSetIconName (display->display, TermWin.parent[0], str);
951
952#ifdef SMART_WINDOW_TITLE
804 if (name) 953 if (name)
805 XFree (name); 954 XFree (name);
806#endif 955#endif
807} 956}
808 957
809#ifdef XTERM_COLOR_CHANGE 958#ifdef XTERM_COLOR_CHANGE
810void 959void
811rxvt_term::set_window_color (int idx, const char *color) 960rxvt_term::set_window_color (int idx, const char *color)
812{ 961{
813 rxvt_color xcol; 962 rxvt_color xcol;
814 int i; 963 int i;
815 964
816 if (color == NULL || *color == '\0') 965 if (color == NULL || *color == '\0')
817 return; 966 return;
818 967
819 /* handle color aliases */ 968 /* handle color aliases */
… …
822 i = atoi (color); 971 i = atoi (color);
823 if (i >= 8 && i <= 15) 972 if (i >= 8 && i <= 15)
824 { /* bright colors */ 973 { /* bright colors */
825 i -= 8; 974 i -= 8;
826# ifndef NO_BRIGHTCOLOR 975# ifndef NO_BRIGHTCOLOR
827 PixColors[idx] = PixColors[minBrightCOLOR + i]; 976 PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];
828 SET_PIXCOLOR (idx); 977 SET_PIXCOLOR (idx);
829 goto Done; 978 goto Done;
830# endif 979# endif
831 980
832 } 981 }
833 if (i >= 0 && i <= 7) 982 if (i >= 0 && i <= 7)
834 { /* normal colors */ 983 { /* normal colors */
835 PixColors[idx] = PixColors[minCOLOR + i]; 984 PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];
836 SET_PIXCOLOR (idx); 985 SET_PIXCOLOR (idx);
837 goto Done; 986 goto Done;
838 } 987 }
839 } 988 }
989
840 if (!rXParseAllocColor (& xcol, color)) 990 if (!rXParseAllocColor (& xcol, color))
841 return; 991 return;
992
842 /* XStoreColor (display->display, XCMAP, XColor*); */ 993 /* XStoreColor (display->display, display->cmap, XColor*); */
843 994
844 /* 995 /*
845 * FIXME: should free colors here, but no idea how to do it so instead, 996 * FIXME: should free colors here, but no idea how to do it so instead,
846 * so just keep gobbling up the colormap 997 * so just keep gobbling up the colormap
847 */ 998 */
… …
850 if (PixColors[idx] == PixColors[i]) 1001 if (PixColors[idx] == PixColors[i])
851 break; 1002 break;
852 if (i > Color_White) 1003 if (i > Color_White)
853 { 1004 {
854 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 1005 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
855 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 1006 XFreeColors (display->display, display->cmap, (PixColors + idx), 1,
856 DisplayPlanes (display->display, display->screen)); 1007 DisplayPlanes (display->display, display->screen));
857 } 1008 }
858# endif 1009# endif
859 1010
860 PixColors[idx] = xcol; 1011 PixColorsFocused[idx] = xcol;
861 SET_PIXCOLOR (idx); 1012 SET_PIXCOLOR (idx);
862 1013
863 /* XSetWindowAttributes attr; */ 1014 /* XSetWindowAttributes attr; */
864 /* Cursor cursor; */ 1015 /* Cursor cursor; */
865Done: 1016Done:
1017#ifdef OFF_FOCUS_FADING
1018 PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));
1019#endif
866 if (idx == Color_bg && ! (Options & Opt_transparent)) 1020 if (idx == Color_bg && ! (Options & Opt_transparent))
867 XSetWindowBackground (display->display, TermWin.vt, 1021 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
868 PixColors[Color_bg]);
869 1022
870 /* handle Color_BD, scrollbar background, etc. */ 1023 /* handle Color_BD, scrollbar background, etc. */
871 1024
872 set_colorfgbg (); 1025 set_colorfgbg ();
873 recolour_cursor (); 1026 recolour_cursor ();
874 /* the only reasonable way to enforce a clean update */ 1027 scr_touch (true);
875 scr_poweron ();
876} 1028}
877 1029
878#else 1030#else
879# define set_window_color (idx,color) ((void)0) 1031# define set_window_color (idx,color) ((void)0)
880#endif /* XTERM_COLOR_CHANGE */ 1032#endif /* XTERM_COLOR_CHANGE */
881 1033
882void 1034void
883rxvt_term::recolour_cursor () 1035rxvt_term::recolour_cursor ()
884{ 1036{
885#if TODO
886 rxvt_color xcol[2]; 1037 XColor xcol[2];
887 1038
888 xcol[0] = PixColors[Color_pointer]; 1039 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];
889 xcol[1] = PixColors[Color_bg]; 1040 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];
890 XQueryColors (display->display, XCMAP, xcol, 2); 1041 XQueryColors (display->display, display->cmap, xcol, 2);
891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1042 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
892#endif
893} 1043}
894 1044
895/*----------------------------------------------------------------------*/ 1045/*----------------------------------------------------------------------*/
896/* 1046/*
897 * find if fg/bg matches any of the normal (low-intensity) colors 1047 * find if fg/bg matches any of the normal (low-intensity) colors
… …
946int 1096int
947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1097rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
948{ 1098{
949 if (!screen_in_out->set (display, colour)) 1099 if (!screen_in_out->set (display, colour))
950 { 1100 {
951 rxvt_print_error ("can't allocate colour: %s", colour); 1101 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
952 return false; 1102 return false;
953 } 1103 }
954 1104
955 return true; 1105 return true;
956} 1106}
… …
967 int old_width = szHint.width, old_height = szHint.height; 1117 int old_width = szHint.width, old_height = szHint.height;
968#endif 1118#endif
969 1119
970 window_calc (width, height); 1120 window_calc (width, height);
971 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1121 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1122
972 if (!ignoreparent) 1123 if (!ignoreparent)
973 { 1124 {
974#ifdef SMART_RESIZE 1125#ifdef SMART_RESIZE
975 /* 1126 /*
976 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1127 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
1011 dy /= 2; 1162 dy /= 2;
1012 1163
1013 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1164 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
1014 szHint.width, szHint.height); 1165 szHint.width, szHint.height);
1015#else 1166#else
1016 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1167 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
1017 szHint.height);
1018#endif 1168#endif
1019
1020 } 1169 }
1021 1170
1022 fix_screen = (TermWin.ncol != prev_ncol 1171 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1023 || TermWin.nrow != prev_nrow);
1024 1172
1025 if (fix_screen || width != old_width || height != old_height) 1173 if (fix_screen || width != old_width || height != old_height)
1026 { 1174 {
1027 if (scrollbar_visible ()) 1175 if (scrollbar_visible ())
1028 { 1176 {
1029 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1177 XMoveResizeWindow (display->display, scrollBar.win,
1178 window_sb_x, 0,
1030 0, scrollbar_TotalWidth (), szHint.height); 1179 scrollbar_TotalWidth (), szHint.height);
1031 resize_scrollbar (); 1180 resize_scrollbar ();
1032 } 1181 }
1033 1182
1034 if (menubar_visible ()) 1183 if (menubar_visible ())
1035 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1184 XMoveResizeWindow (display->display, menuBar.win,
1185 window_vt_x, 0,
1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1186 TermWin_TotalWidth (), menuBar_TotalHeight ());
1037 1187
1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1188 XMoveResizeWindow (display->display, TermWin.vt,
1039 window_vt_y, TermWin_TotalWidth (), 1189 window_vt_x, window_vt_y,
1040 TermWin_TotalHeight ()); 1190 TermWin_TotalWidth (), TermWin_TotalHeight ());
1041 scr_clear (); 1191 scr_clear ();
1042#ifdef XPM_BACKGROUND 1192#ifdef XPM_BACKGROUND
1043 resize_pixmap (); 1193 resize_pixmap ();
1044#endif 1194#endif
1045
1046 } 1195 }
1047 1196
1048 if (fix_screen || old_height == 0) 1197 if (fix_screen || old_height == 0)
1049 { 1198 {
1050 int curr_screen = -1; 1199 int curr_screen = -1;
… …
1091 if (width == 0) 1240 if (width == 0)
1092 width = wattr.width - szHint.base_width; 1241 width = wattr.width - szHint.base_width;
1093 if (height == 0) 1242 if (height == 0)
1094 height = wattr.height - szHint.base_height; 1243 height = wattr.height - szHint.base_height;
1095 } 1244 }
1245
1096 if (width != TermWin.width || height != TermWin.height) 1246 if (width != TermWin.width || height != TermWin.height)
1097 { 1247 {
1098 width += szHint.base_width; 1248 width += szHint.base_width;
1099 height += szHint.base_height; 1249 height += szHint.base_height;
1100 resize_all_windows (width, height, 0); 1250 resize_all_windows (width, height, 0);
… …
1323 if (preedit_attr) XFree (preedit_attr); 1473 if (preedit_attr) XFree (preedit_attr);
1324 if (status_attr) XFree (status_attr); 1474 if (status_attr) XFree (status_attr);
1325 1475
1326 if (Input_Context == NULL) 1476 if (Input_Context == NULL)
1327 { 1477 {
1328 rxvt_print_error ("failed to create input context"); 1478 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1329 display->put_xim (input_method); 1479 display->put_xim (input_method);
1330 return false; 1480 return false;
1331 } 1481 }
1332 1482
1333 if (input_style & XIMPreeditArea) 1483 if (input_style & XIMPreeditArea)

Diff Legend

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