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.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);
… …
117#endif 200#endif
118 201
119 delete TermWin.fontset; 202 delete TermWin.fontset;
120 203
121 if (display) 204 if (display)
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
122 if (TermWin.parent[0]) 247 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]); 248 XDestroyWindow (display->display, TermWin.parent[0]);
249 }
124 250
125 // TODO: free pixcolours, colours should become part of rxvt_display 251 // TODO: free pixcolours, colours should become part of rxvt_display
126 252
127 delete PixColors; 253 delete PixColorsFocused;
254#ifdef OFF_FOCUS_FADING
255 delete PixColorsUnFocused;
256#endif
128 257
129 displays.put (display); 258 displays.put (display);
130 259
131 scr_release (); 260 scr_release ();
132 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(!)
133 free (env_windowid); 268 free (env_windowid);
134 free (env_display); 269 free (env_display);
135 free (env_term); 270 free (env_term);
136 free (env_colorfgbg); 271 free (env_colorfgbg);
137 free (locale); 272 free (locale);
273#if 0
138 free (codeset); 274 free (codeset);
275#endif
139 276
140 delete envv; 277 delete envv;
141 delete argv; 278 delete argv;
142} 279}
143 280
144void 281void
145rxvt_term::destroy () 282rxvt_term::destroy ()
146{ 283{
284 if (destroy_ev.active)
285 return;
286
147 if (display) 287 if (display)
148 { 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
149 rootwin_ev.stop (display); 299 rootwin_ev.stop (display);
300#endif
301 incr_ev.stop ();
150 termwin_ev.stop (display); 302 termwin_ev.stop (display);
151 vt_ev.stop (display); 303 vt_ev.stop (display);
152#ifdef USE_XIM
153 im_destroy ();
154 im_ev.stop (display);
155#endif
156#ifdef HAVE_SCROLLBARS
157 scrollbar_ev.stop (display);
158#endif
159#ifdef MENUBAR
160 menubar_ev.stop (display);
161#endif
162 } 304 }
163 305
164 check_ev.stop (); 306 check_ev.stop ();
165 pty_ev.stop (); 307 pty_ev.stop ();
166#ifdef CURSOR_BLINK 308#ifdef CURSOR_BLINK
167 cursor_blink_ev.stop (); 309 cursor_blink_ev.stop ();
168#endif 310#endif
169#ifdef TEXT_BLINK 311#ifdef TEXT_BLINK
170 text_blink_ev.stop (); 312 text_blink_ev.stop ();
171#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
172#ifdef POINTER_BLANK 320#ifdef POINTER_BLANK
173 pointer_ev.stop (); 321 pointer_ev.stop ();
174#endif 322#endif
175 323
176 destroy_ev.start (0); 324 destroy_ev.start (0);
… …
184 delete this; 332 delete this;
185} 333}
186 334
187/*----------------------------------------------------------------------*/ 335/*----------------------------------------------------------------------*/
188/* rxvt_init () */ 336/* 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 337bool
236rxvt_term::init (int argc, const char *const *argv) 338rxvt_term::init (int argc, const char *const *argv)
237{ 339{
340 SET_R (this);
341
342 if (!init_vars ())
343 return false;
344
238 /* 345 /*
239 * Save and then give up any super-user privileges 346 * Save and then give up any super-user privileges
240 * 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.
241 * We should only need to be root in these cases: 348 * We should only need to be root in these cases:
242 * 1. write utmp entries on some systems 349 * 1. write utmp entries on some systems
… …
249 356
250 const char **cmd_argv = init_resources (argc, argv); 357 const char **cmd_argv = init_resources (argc, argv);
251 358
252 set_locale (""); 359 set_locale ("");
253 360
254#if (MENUBAR_MAX) 361#if MENUBAR_MAX
255 menubar_read (rs[Rs_menu]); 362 menubar_read (rs[Rs_menu]);
256#endif 363#endif
257#ifdef HAVE_SCROLLBARS 364#ifdef HAVE_SCROLLBARS
258 if (Options & Opt_scrollBar) 365 if (Options & Opt_scrollBar)
259 scrollBar.setIdle (); /* set existence for size calculations */ 366 scrollBar.setIdle (); /* set existence for size calculations */
… …
280#ifdef TRANSPARENT 387#ifdef TRANSPARENT
281 if (Options & Opt_transparent) 388 if (Options & Opt_transparent)
282 { 389 {
283 XSelectInput (display->display, display->root, PropertyChangeMask); 390 XSelectInput (display->display, display->root, PropertyChangeMask);
284 check_our_parents (); 391 check_our_parents ();
285 }
286#endif
287
288 rootwin_ev.start (display, display->root); 392 rootwin_ev.start (display, display->root);
393 }
394#endif
289 395
290 XMapWindow (display->display, TermWin.vt); 396 XMapWindow (display->display, TermWin.vt);
291 XMapWindow (display->display, TermWin.parent[0]); 397 XMapWindow (display->display, TermWin.parent[0]);
292 398
293 init_command (cmd_argv); 399 init_command (cmd_argv);
… …
295 pty_ev.start (cmd_fd, EVENT_READ); 401 pty_ev.start (cmd_fd, EVENT_READ);
296 402
297 check_ev.start (); 403 check_ev.start ();
298 404
299 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);
300} 437}
301 438
302/* ------------------------------------------------------------------------- * 439/* ------------------------------------------------------------------------- *
303 * SIGNAL HANDLING & EXIT HANDLER * 440 * SIGNAL HANDLING & EXIT HANDLER *
304 * ------------------------------------------------------------------------- */ 441 * ------------------------------------------------------------------------- */
305/* 442/*
306 * 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
307 */ 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
308/* ARGSUSED */ 456/* ARGSUSED */
309/* EXTPROTO */ 457/* EXTPROTO */
310RETSIGTYPE 458RETSIGTYPE
311rxvt_Child_signal (int sig __attribute__ ((unused))) 459rxvt_Child_signal (int sig __attribute__ ((unused)))
312{ 460{
313 int pid, save_errno = errno; 461 int pid, save_errno = errno;
462
314 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 463 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
315 ; 464 rxvt_term::child_exited (pid);
465
316 errno = save_errno; 466 errno = save_errno;
317
318#if 0
319 if (pid == cmd_pid)
320 exit (EXIT_SUCCESS);
321#endif
322} 467}
323 468
324/* 469/*
325 * Catch a fatal signal and tidy up before quitting 470 * Catch a fatal signal and tidy up before quitting
326 */ 471 */
… …
328RETSIGTYPE 473RETSIGTYPE
329rxvt_Exit_signal (int sig) 474rxvt_Exit_signal (int sig)
330{ 475{
331 signal (sig, SIG_DFL); 476 signal (sig, SIG_DFL);
332#ifdef DEBUG_CMD 477#ifdef DEBUG_CMD
333 rxvt_print_error ("signal %d", sig); 478 rxvt_warn ("caught signal %d, exiting.\n", sig);
334#endif 479#endif
335 rxvt_clean_exit (); 480 rxvt_clean_exit ();
336 kill (getpid (), sig); 481 kill (getpid (), sig);
337} 482}
338 483
… …
376 521
377 p = malloc (size); 522 p = malloc (size);
378 if (p) 523 if (p)
379 return p; 524 return p;
380 525
381 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 526 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
382 rxvt_clean_exit (); 527 rxvt_clean_exit ();
383 exit (EXIT_FAILURE); 528 exit (EXIT_FAILURE);
384 /* NOTREACHED */ 529 /* NOTREACHED */
385} 530}
386 531
… …
392 537
393 p = calloc (number, size); 538 p = calloc (number, size);
394 if (p) 539 if (p)
395 return p; 540 return p;
396 541
397 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 542 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
398 rxvt_clean_exit (); 543 rxvt_clean_exit ();
399 exit (EXIT_FAILURE); 544 exit (EXIT_FAILURE);
400 /* NOTREACHED */ 545 /* NOTREACHED */
401} 546}
402 547
… …
411 else 556 else
412 p = malloc (size); 557 p = malloc (size);
413 if (p) 558 if (p)
414 return p; 559 return p;
415 560
416 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 561 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
417 rxvt_clean_exit (); 562 rxvt_clean_exit ();
418 exit (EXIT_FAILURE); 563 exit (EXIT_FAILURE);
419 /* NOTREACHED */ 564 /* NOTREACHED */
420} 565}
421 566
… …
613 else 758 else
614 szHint.win_gravity = SouthWestGravity; 759 szHint.win_gravity = SouthWestGravity;
615 } 760 }
616 } 761 }
617 } 762 }
763
618 /* TODO: BOUNDS */ 764 /* TODO: BOUNDS */
619 TermWin.width = TermWin.ncol * TermWin.fwidth; 765 TermWin.width = TermWin.ncol * TermWin.fwidth;
620 TermWin.height = TermWin.nrow * TermWin.fheight; 766 TermWin.height = TermWin.nrow * TermWin.fheight;
621 max_width = MAX_COLS * TermWin.fwidth; 767 max_width = MAX_COLS * TermWin.fwidth;
622 max_height = MAX_ROWS * TermWin.fheight; 768 max_height = MAX_ROWS * TermWin.fheight;
623 769
624 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 770 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
625 771
626 sb_w = mb_h = 0; 772 sb_w = mb_h = 0;
627 window_vt_x = window_vt_y = 0; 773 window_vt_x = window_vt_y = TermWin.int_bwidth;
774
628 if (scrollbar_visible ()) 775 if (scrollbar_visible ())
629 { 776 {
630 sb_w = scrollbar_TotalWidth (); 777 sb_w = scrollbar_TotalWidth ();
631 szHint.base_width += sb_w; 778 szHint.base_width += sb_w;
632 if (! (Options & Opt_scrollBar_right)) 779 if (!(Options & Opt_scrollBar_right))
633 window_vt_x = sb_w; 780 window_vt_x += sb_w;
634 } 781 }
782
635 if (menubar_visible ()) 783 if (menubar_visible ())
636 { 784 {
637 mb_h = menuBar_TotalHeight (); 785 mb_h = menuBar_TotalHeight ();
638 szHint.base_height += mb_h; 786 szHint.base_height += mb_h;
639 window_vt_y = mb_h; 787 window_vt_y += mb_h;
640 } 788 }
789
641 szHint.width_inc = TermWin.fwidth; 790 szHint.width_inc = TermWin.fwidth;
642 szHint.height_inc = TermWin.fheight; 791 szHint.height_inc = TermWin.fheight;
643 szHint.min_width = szHint.base_width + szHint.width_inc; 792 szHint.min_width = szHint.base_width + szHint.width_inc;
644 szHint.min_height = szHint.base_height + szHint.height_inc; 793 szHint.min_height = szHint.base_height + szHint.height_inc;
645 794
… …
651 else 800 else
652 { 801 {
653 MIN_IT (TermWin.width, max_width); 802 MIN_IT (TermWin.width, max_width);
654 szHint.width = szHint.base_width + TermWin.width; 803 szHint.width = szHint.base_width + TermWin.width;
655 } 804 }
805
656 if (height && height - szHint.base_height < max_height) 806 if (height && height - szHint.base_height < max_height)
657 { 807 {
658 szHint.height = height; 808 szHint.height = height;
659 TermWin.height = height - szHint.base_height; 809 TermWin.height = height - szHint.base_height;
660 } 810 }
661 else 811 else
662 { 812 {
663 MIN_IT (TermWin.height, max_height); 813 MIN_IT (TermWin.height, max_height);
664 szHint.height = szHint.base_height + TermWin.height; 814 szHint.height = szHint.base_height + TermWin.height;
665 } 815 }
816
666 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 817 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
667 window_sb_x = szHint.width - sb_w; 818 window_sb_x = szHint.width - sb_w;
668 819
669 if (recalc_x) 820 if (recalc_x)
670 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 821 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
… …
730 } 881 }
731 else 882 else
732 { 883 {
733 rxvt_fontset *fs = new rxvt_fontset (this); 884 rxvt_fontset *fs = new rxvt_fontset (this);
734 885
735 if (fs && fs->populate (fontname)) 886 if (fs && fs->populate (fontname ? fontname : "fixed"))
736 { 887 {
737 delete TermWin.fontset; 888 delete TermWin.fontset;
738 TermWin.fontset = fs; 889 TermWin.fontset = fs;
739 TermWin.fwidth = fs->base_font ()->width; 890 TermWin.fwidth = fs->base_font ()->width;
740 TermWin.fheight = fs->base_font ()->height; 891 TermWin.fheight = fs->base_font ()->height;
741 TermWin.fbase = fs->base_font ()->ascent; 892 TermWin.fbase = fs->base_font ()->ascent;
742 893
743 // TODO: screen needs to be told about new fonts
744
745 if (TermWin.parent[0]) 894 if (TermWin.parent[0])
746 { 895 {
747 resize_all_windows (0, 0, 0); 896 resize_all_windows (0, 0, 0);
748 scr_remap_chars (); 897 scr_remap_chars ();
749 scr_touch (true); 898 scr_touch (true);
750 } 899 }
751 900
901 for (unicode_t ch = 0x20; ch <= 0x7f; ch++)
902 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);
903
752 return true; 904 return true;
753 } 905 }
754 } 906 }
755 907
756 return false; 908 return false;
… …
766/*----------------------------------------------------------------------*/ 918/*----------------------------------------------------------------------*/
767/* xterm sequences - title, iconName, color (exptl) */ 919/* xterm sequences - title, iconName, color (exptl) */
768void 920void
769rxvt_term::set_title (const char *str) 921rxvt_term::set_title (const char *str)
770{ 922{
771#ifndef SMART_WINDOW_TITLE 923#ifdef SMART_WINDOW_TITLE
772 XStoreName (display->display, TermWin.parent[0], str); 924 char *name;
773#else
774 char *name;
775 925
776 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 926 if (!XFetchName (display->display, TermWin.parent[0], &name))
777 name = NULL; 927 name = NULL;
928
778 if (name == NULL || STRCMP (name, str)) 929 if (name == NULL || STRCMP (name, str))
930#endif
779 XStoreName (display->display, TermWin.parent[0], str); 931 XStoreName (display->display, TermWin.parent[0], str);
932
933#ifdef SMART_WINDOW_TITLE
780 if (name) 934 if (name)
781 XFree (name); 935 XFree (name);
782#endif 936#endif
783} 937}
784 938
785void 939void
786rxvt_term::set_iconName (const char *str) 940rxvt_term::set_icon_name (const char *str)
787{ 941{
788#ifndef SMART_WINDOW_TITLE 942#ifdef SMART_WINDOW_TITLE
789 XSetIconName (display->display, TermWin.parent[0], str); 943 char *name;
790#else
791 char *name;
792 944
793 if (XGetIconName (display->display, TermWin.parent[0], &name)) 945 if (!XGetIconName (display->display, TermWin.parent[0], &name))
794 name = NULL; 946 name = NULL;
947
795 if (name == NULL || STRCMP (name, str)) 948 if (name == NULL || STRCMP (name, str))
949#endif
796 XSetIconName (display->display, TermWin.parent[0], str); 950 XSetIconName (display->display, TermWin.parent[0], str);
951
952#ifdef SMART_WINDOW_TITLE
797 if (name) 953 if (name)
798 XFree (name); 954 XFree (name);
799#endif 955#endif
800} 956}
801 957
802#ifdef XTERM_COLOR_CHANGE 958#ifdef XTERM_COLOR_CHANGE
803void 959void
804rxvt_term::set_window_color (int idx, const char *color) 960rxvt_term::set_window_color (int idx, const char *color)
805{ 961{
806 rxvt_color xcol; 962 rxvt_color xcol;
807 int i; 963 int i;
808 964
809 if (color == NULL || *color == '\0') 965 if (color == NULL || *color == '\0')
810 return; 966 return;
811 967
812 /* handle color aliases */ 968 /* handle color aliases */
… …
815 i = atoi (color); 971 i = atoi (color);
816 if (i >= 8 && i <= 15) 972 if (i >= 8 && i <= 15)
817 { /* bright colors */ 973 { /* bright colors */
818 i -= 8; 974 i -= 8;
819# ifndef NO_BRIGHTCOLOR 975# ifndef NO_BRIGHTCOLOR
820 PixColors[idx] = PixColors[minBrightCOLOR + i]; 976 PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];
821 SET_PIXCOLOR (idx); 977 SET_PIXCOLOR (idx);
822 goto Done; 978 goto Done;
823# endif 979# endif
824 980
825 } 981 }
826 if (i >= 0 && i <= 7) 982 if (i >= 0 && i <= 7)
827 { /* normal colors */ 983 { /* normal colors */
828 PixColors[idx] = PixColors[minCOLOR + i]; 984 PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];
829 SET_PIXCOLOR (idx); 985 SET_PIXCOLOR (idx);
830 goto Done; 986 goto Done;
831 } 987 }
832 } 988 }
989
833 if (!rXParseAllocColor (& xcol, color)) 990 if (!rXParseAllocColor (& xcol, color))
834 return; 991 return;
992
835 /* XStoreColor (display->display, XCMAP, XColor*); */ 993 /* XStoreColor (display->display, display->cmap, XColor*); */
836 994
837 /* 995 /*
838 * 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,
839 * so just keep gobbling up the colormap 997 * so just keep gobbling up the colormap
840 */ 998 */
… …
843 if (PixColors[idx] == PixColors[i]) 1001 if (PixColors[idx] == PixColors[i])
844 break; 1002 break;
845 if (i > Color_White) 1003 if (i > Color_White)
846 { 1004 {
847 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 1005 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
848 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 1006 XFreeColors (display->display, display->cmap, (PixColors + idx), 1,
849 DisplayPlanes (display->display, display->screen)); 1007 DisplayPlanes (display->display, display->screen));
850 } 1008 }
851# endif 1009# endif
852 1010
853 PixColors[idx] = xcol; 1011 PixColorsFocused[idx] = xcol;
854 SET_PIXCOLOR (idx); 1012 SET_PIXCOLOR (idx);
855 1013
856 /* XSetWindowAttributes attr; */ 1014 /* XSetWindowAttributes attr; */
857 /* Cursor cursor; */ 1015 /* Cursor cursor; */
858Done: 1016Done:
1017#ifdef OFF_FOCUS_FADING
1018 PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));
1019#endif
859 if (idx == Color_bg && ! (Options & Opt_transparent)) 1020 if (idx == Color_bg && ! (Options & Opt_transparent))
860 XSetWindowBackground (display->display, TermWin.vt, 1021 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
861 PixColors[Color_bg]);
862 1022
863 /* handle Color_BD, scrollbar background, etc. */ 1023 /* handle Color_BD, scrollbar background, etc. */
864 1024
865 set_colorfgbg (); 1025 set_colorfgbg ();
866 recolour_cursor (); 1026 recolour_cursor ();
867 /* the only reasonable way to enforce a clean update */ 1027 scr_touch (true);
868 scr_poweron ();
869} 1028}
870 1029
871#else 1030#else
872# define set_window_color (idx,color) ((void)0) 1031# define set_window_color (idx,color) ((void)0)
873#endif /* XTERM_COLOR_CHANGE */ 1032#endif /* XTERM_COLOR_CHANGE */
874 1033
875void 1034void
876rxvt_term::recolour_cursor () 1035rxvt_term::recolour_cursor ()
877{ 1036{
878#if TODO
879 rxvt_color xcol[2]; 1037 XColor xcol[2];
880 1038
881 xcol[0] = PixColors[Color_pointer]; 1039 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];
882 xcol[1] = PixColors[Color_bg]; 1040 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];
883 XQueryColors (display->display, XCMAP, xcol, 2); 1041 XQueryColors (display->display, display->cmap, xcol, 2);
884 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1042 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
885#endif
886} 1043}
887 1044
888/*----------------------------------------------------------------------*/ 1045/*----------------------------------------------------------------------*/
889/* 1046/*
890 * 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
… …
939int 1096int
940rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1097rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
941{ 1098{
942 if (!screen_in_out->set (display, colour)) 1099 if (!screen_in_out->set (display, colour))
943 { 1100 {
944 rxvt_print_error ("can't allocate colour: %s", colour); 1101 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
945 return false; 1102 return false;
946 } 1103 }
947 1104
948 return true; 1105 return true;
949} 1106}
… …
960 int old_width = szHint.width, old_height = szHint.height; 1117 int old_width = szHint.width, old_height = szHint.height;
961#endif 1118#endif
962 1119
963 window_calc (width, height); 1120 window_calc (width, height);
964 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1121 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1122
965 if (!ignoreparent) 1123 if (!ignoreparent)
966 { 1124 {
967#ifdef SMART_RESIZE 1125#ifdef SMART_RESIZE
968 /* 1126 /*
969 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1127 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
1004 dy /= 2; 1162 dy /= 2;
1005 1163
1006 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1164 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
1007 szHint.width, szHint.height); 1165 szHint.width, szHint.height);
1008#else 1166#else
1009 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1167 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
1010 szHint.height);
1011#endif 1168#endif
1012
1013 } 1169 }
1014 1170
1015 fix_screen = (TermWin.ncol != prev_ncol 1171 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1016 || TermWin.nrow != prev_nrow);
1017 1172
1018 if (fix_screen || width != old_width || height != old_height) 1173 if (fix_screen || width != old_width || height != old_height)
1019 { 1174 {
1020 if (scrollbar_visible ()) 1175 if (scrollbar_visible ())
1021 { 1176 {
1022 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1177 XMoveResizeWindow (display->display, scrollBar.win,
1178 window_sb_x, 0,
1023 0, scrollbar_TotalWidth (), szHint.height); 1179 scrollbar_TotalWidth (), szHint.height);
1024 resize_scrollbar (); 1180 resize_scrollbar ();
1025 } 1181 }
1026 1182
1027 if (menubar_visible ()) 1183 if (menubar_visible ())
1028 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1184 XMoveResizeWindow (display->display, menuBar.win,
1185 window_vt_x, 0,
1029 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1186 TermWin_TotalWidth (), menuBar_TotalHeight ());
1030 1187
1031 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1188 XMoveResizeWindow (display->display, TermWin.vt,
1032 window_vt_y, TermWin_TotalWidth (), 1189 window_vt_x, window_vt_y,
1033 TermWin_TotalHeight ()); 1190 TermWin_TotalWidth (), TermWin_TotalHeight ());
1034 scr_clear (); 1191 scr_clear ();
1035#ifdef XPM_BACKGROUND 1192#ifdef XPM_BACKGROUND
1036 resize_pixmap (); 1193 resize_pixmap ();
1037#endif 1194#endif
1038
1039 } 1195 }
1040 1196
1041 if (fix_screen || old_height == 0) 1197 if (fix_screen || old_height == 0)
1042 { 1198 {
1043 int curr_screen = -1; 1199 int curr_screen = -1;
… …
1084 if (width == 0) 1240 if (width == 0)
1085 width = wattr.width - szHint.base_width; 1241 width = wattr.width - szHint.base_width;
1086 if (height == 0) 1242 if (height == 0)
1087 height = wattr.height - szHint.base_height; 1243 height = wattr.height - szHint.base_height;
1088 } 1244 }
1245
1089 if (width != TermWin.width || height != TermWin.height) 1246 if (width != TermWin.width || height != TermWin.height)
1090 { 1247 {
1091 width += szHint.base_width; 1248 width += szHint.base_width;
1092 height += szHint.base_height; 1249 height += szHint.base_height;
1093 resize_all_windows (width, height, 0); 1250 resize_all_windows (width, height, 0);
… …
1316 if (preedit_attr) XFree (preedit_attr); 1473 if (preedit_attr) XFree (preedit_attr);
1317 if (status_attr) XFree (status_attr); 1474 if (status_attr) XFree (status_attr);
1318 1475
1319 if (Input_Context == NULL) 1476 if (Input_Context == NULL)
1320 { 1477 {
1321 rxvt_print_error ("failed to create input context"); 1478 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1322 display->put_xim (input_method); 1479 display->put_xim (input_method);
1323 return false; 1480 return false;
1324 } 1481 }
1325 1482
1326 if (input_style & XIMPreeditArea) 1483 if (input_style & XIMPreeditArea)

Diff Legend

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