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

Diff Legend

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