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.33 by pcg, Fri Feb 13 13:28:17 2004 UTC vs.
Revision 1.67 by pcg, Sun May 9 18:19:49 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
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
… …
43# include <termios.h> 44# include <termios.h>
44#endif 45#endif
45 46
46#include <cstring> 47#include <cstring>
47 48
49vector<rxvt_term *> rxvt_term::termlist;
50
48static char curlocale[128]; 51static char curlocale[128];
49 52
50void 53bool
51rxvt_set_locale (const char *locale) 54rxvt_set_locale (const char *locale)
52{ 55{
53 if (locale && STRNCMP (locale, curlocale, 128)) 56 if (!locale || !STRNCMP (locale, curlocale, 128))
54 { 57 return false;
58
55 STRNCPY (curlocale, locale, 128); 59 STRNCPY (curlocale, locale, 128);
56 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)
57 } 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;
58} 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
59 127
60void * 128void *
61rxvt_term::operator new (size_t s) 129rxvt_term::operator new (size_t s)
62{ 130{
63 void *p = malloc (s); 131 void *p = malloc (s);
… …
79 vt_ev (this, &rxvt_term::x_cb), 147 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb), 149 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif 150#endif
83#ifdef MENUBAR 151#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme 152 menubar_ev (this, &rxvt_term::x_cb),
85#endif 153#endif
86#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif 156#endif
89#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
90 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
91#endif 159#endif
92#ifdef POINTER_BLANK 160#ifdef POINTER_BLANK
93 pointer_ev (this, &rxvt_term::pointer_cb), 161 pointer_ev (this, &rxvt_term::pointer_cb),
162#endif
163#ifdef USE_XIM
164 im_ev (this, &rxvt_term::im_cb),
94#endif 165#endif
95 check_ev (this, &rxvt_term::check_cb), 166 check_ev (this, &rxvt_term::check_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb), 167 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb), 168 pty_ev (this, &rxvt_term::pty_cb),
98 incr_ev (this, &rxvt_term::incr_cb), 169 incr_ev (this, &rxvt_term::incr_cb)
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
102{ 170{
103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 171 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
172
173 termlist.push_back (this);
104} 174}
105 175
106rxvt_term::~rxvt_term () 176rxvt_term::~rxvt_term ()
107{ 177{
178 termlist.erase (find (termlist.begin (), termlist.end(), this));
179
108 if (cmd_fd >= 0) 180 if (cmd_fd >= 0)
109 close (cmd_fd); 181 close (cmd_fd);
110 182
183#ifndef NO_SETOWNER_TTYDEV
184 privileged_ttydev (RESTORE);
185#endif
186#ifdef UTMP_SUPPORT
187 privileged_utmp (RESTORE);
188#endif
189
190 delete TermWin.fontset;
191
192 if (display)
193 {
194 selection_clear ();
195
196#ifdef MENUBAR
197 if (menubarGC) XFreeGC (display->display, menubarGC);
198#endif
199#ifdef XTERM_SCROLLBAR
200 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
201 if (ShadowGC) XFreeGC (display->display, ShadowGC);
202#endif
203#ifdef PLAIN_SCROLLBAR
204 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
205#endif
206#ifdef NEXT_SCROLLBAR
207 if (blackGC) XFreeGC (display->display, blackGC);
208 if (whiteGC) XFreeGC (display->display, whiteGC);
209 if (grayGC) XFreeGC (display->display, grayGC);
210 if (darkGC) XFreeGC (display->display, darkGC);
211 if (stippleGC) XFreeGC (display->display, stippleGC);
212 if (dimple) XFreePixmap (display->display, dimple);
213 if (upArrow) XFreePixmap (display->display, upArrow);
214 if (downArrow) XFreePixmap (display->display, downArrow);
215 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
216 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
217#endif
218#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
219 if (topShadowGC) XFreeGC (display->display, topShadowGC);
220 if (botShadowGC) XFreeGC (display->display, botShadowGC);
221 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
222#endif
223 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
224
225#if defined(MENUBAR) && (MENUBAR_MAX > 1)
226 delete menuBar.drawable;
227 //if (menuBar.win)
228 // XDestroyWindow (display->display, menuBar.win);
229#endif
230 delete TermWin.drawable;
231 // destroy all windows
232 if (TermWin.parent[0])
233 XDestroyWindow (display->display, TermWin.parent[0]);
234 }
235
236 // TODO: free pixcolours, colours should become part of rxvt_display
237
238 delete PixColors;
239
240 displays.put (display);
241
111 scr_release (); 242 scr_release ();
112 243
244 /* clear all resources */
245 for (int i = 0; i < allocated.size (); i++)
246 free (allocated[i]);
247
248 free (selection.text);
249 // TODO: manage env vars in child only(!)
113 free (env_windowid); 250 free (env_windowid);
114 free (env_display); 251 free (env_display);
115 free (env_term); 252 free (env_term);
116 free (env_colorfgbg); 253 free (env_colorfgbg);
117 free (locale); 254 free (locale);
255#if 0
118 free (codeset); 256 free (codeset);
119
120#ifndef NO_SETOWNER_TTYDEV
121 privileged_ttydev (RESTORE);
122#endif 257#endif
123#ifdef UTMP_SUPPORT
124 privileged_utmp (RESTORE);
125#endif
126
127 // TODO: free pixcolours, colours should become part of rxvt_display
128
129 delete PixColors;
130 delete TermWin.fontset;
131
132 displays.put (display);
133 258
134 delete envv; 259 delete envv;
135 delete argv; 260 delete argv;
136} 261}
137 262
138void 263void
139rxvt_term::destroy () 264rxvt_term::destroy ()
140{ 265{
141 if (display) 266 if (display)
142 { 267 {
143 if (TermWin.parent[0])
144 XDestroyWindow (display->display, TermWin.parent[0]);
145
146 rootwin_ev.stop (display); 268 rootwin_ev.stop (display);
147 termwin_ev.stop (display); 269 termwin_ev.stop (display);
148 vt_ev.stop (display); 270 vt_ev.stop (display);
149
150#ifdef USE_XIM 271#ifdef USE_XIM
151 im_destroy (); 272 im_destroy ();
152 im_ev.stop (display); 273 im_ev.stop (display);
153#endif 274#endif
154#ifdef HAVE_SCROLLBARS 275#ifdef HAVE_SCROLLBARS
… …
182 delete this; 303 delete this;
183} 304}
184 305
185/*----------------------------------------------------------------------*/ 306/*----------------------------------------------------------------------*/
186/* rxvt_init () */ 307/* rxvt_init () */
187/* LIBPROTO */
188rxvt_t
189rxvt_init (int argc, const char *const *argv)
190{
191 SET_R (new rxvt_term);
192
193 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
194 {
195 delete GET_R;
196 SET_R (0);
197 }
198
199 return GET_R;
200}
201
202static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
203
204void
205rxvt_init_signals ()
206{
207 /* install exit handler for cleanup */
208#if 0
209#ifdef HAVE_ATEXIT
210 atexit (rxvt_clean_exit);
211#else
212#endif
213#endif
214
215 struct sigaction sa;
216
217 sigfillset (&sa.sa_mask);
218 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
219 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
220 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
221 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
222 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
223 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
224 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
225
226 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
227 /* signal (SIGURG, SIG_DFL); */
228
229 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
230 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
231}
232
233bool 308bool
234rxvt_term::init (int argc, const char *const *argv) 309rxvt_term::init (int argc, const char *const *argv)
235{ 310{
311 SET_R (this);
312
313 if (!init_vars ())
314 return false;
315
236 /* 316 /*
237 * Save and then give up any super-user privileges 317 * Save and then give up any super-user privileges
238 * If we need privileges in any area then we must specifically request it. 318 * If we need privileges in any area then we must specifically request it.
239 * We should only need to be root in these cases: 319 * We should only need to be root in these cases:
240 * 1. write utmp entries on some systems 320 * 1. write utmp entries on some systems
… …
247 327
248 const char **cmd_argv = init_resources (argc, argv); 328 const char **cmd_argv = init_resources (argc, argv);
249 329
250 set_locale (""); 330 set_locale ("");
251 331
252#if (MENUBAR_MAX) 332#if MENUBAR_MAX
253 menubar_read (rs[Rs_menu]); 333 menubar_read (rs[Rs_menu]);
254#endif 334#endif
255#ifdef HAVE_SCROLLBARS 335#ifdef HAVE_SCROLLBARS
256 if (Options & Opt_scrollBar) 336 if (Options & Opt_scrollBar)
257 scrollBar.setIdle (); /* set existence for size calculations */ 337 scrollBar.setIdle (); /* set existence for size calculations */
… …
260 create_windows (argc, argv); 340 create_windows (argc, argv);
261 341
262 init_xlocale (); 342 init_xlocale ();
263 343
264 scr_reset (); /* initialize screen */ 344 scr_reset (); /* initialize screen */
265#ifdef RXVT_GRAPHICS
266 Gr_reset (); /* reset graphics */
267#endif
268 345
269#if 0 346#if 0
270#ifdef DEBUG_X
271 XSynchronize (display->display, True); 347 XSynchronize (display->display, True);
272#endif
273#endif 348#endif
274 349
275#ifdef HAVE_SCROLLBARS 350#ifdef HAVE_SCROLLBARS
276 if (Options & Opt_scrollBar) 351 if (Options & Opt_scrollBar)
277 resize_scrollbar (); /* create and map scrollbar */ 352 resize_scrollbar (); /* create and map scrollbar */
278#endif 353#endif
279#if (MENUBAR_MAX) 354#if (MENUBAR_MAX)
280 if (menubar_visible (r)) 355 if (menubar_visible ())
281 XMapWindow (display->display, menuBar.win); 356 XMapWindow (display->display, menuBar.win);
282#endif 357#endif
283#ifdef TRANSPARENT 358#ifdef TRANSPARENT
284 if (Options & Opt_transparent) 359 if (Options & Opt_transparent)
285 { 360 {
… …
298 pty_ev.start (cmd_fd, EVENT_READ); 373 pty_ev.start (cmd_fd, EVENT_READ);
299 374
300 check_ev.start (); 375 check_ev.start ();
301 376
302 return true; 377 return true;
378}
379
380static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
381
382void
383rxvt_init_signals ()
384{
385 /* install exit handler for cleanup */
386#if 0
387#ifdef HAVE_ATEXIT
388 atexit (rxvt_clean_exit);
389#else
390#endif
391#endif
392
393 struct sigaction sa;
394
395 sigfillset (&sa.sa_mask);
396 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
397 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
398 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
399 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
400 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
401 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
402 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
403
404 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
405 /* signal (SIGURG, SIG_DFL); */
406
407 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
408 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
303} 409}
304 410
305/* ------------------------------------------------------------------------- * 411/* ------------------------------------------------------------------------- *
306 * SIGNAL HANDLING & EXIT HANDLER * 412 * SIGNAL HANDLING & EXIT HANDLER *
307 * ------------------------------------------------------------------------- */ 413 * ------------------------------------------------------------------------- */
308/* 414/*
309 * Catch a SIGCHLD signal and exit if the direct child has died 415 * Catch a SIGCHLD signal and exit if the direct child has died
310 */ 416 */
417
418void rxvt_term::child_exited (int pid)
419{
420 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
421 if (pid == (*t)->cmd_pid)
422 {
423 (*t)->destroy ();
424 break;
425 }
426}
427
311/* ARGSUSED */ 428/* ARGSUSED */
312/* EXTPROTO */ 429/* EXTPROTO */
313RETSIGTYPE 430RETSIGTYPE
314rxvt_Child_signal (int sig __attribute__ ((unused))) 431rxvt_Child_signal (int sig __attribute__ ((unused)))
315{ 432{
316 int pid, save_errno = errno; 433 int pid, save_errno = errno;
434
317 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 435 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
318 ; 436 rxvt_term::child_exited (pid);
437
319 errno = save_errno; 438 errno = save_errno;
320
321#if 0
322 if (pid == cmd_pid)
323 exit (EXIT_SUCCESS);
324#endif
325} 439}
326 440
327/* 441/*
328 * Catch a fatal signal and tidy up before quitting 442 * Catch a fatal signal and tidy up before quitting
329 */ 443 */
… …
331RETSIGTYPE 445RETSIGTYPE
332rxvt_Exit_signal (int sig) 446rxvt_Exit_signal (int sig)
333{ 447{
334 signal (sig, SIG_DFL); 448 signal (sig, SIG_DFL);
335#ifdef DEBUG_CMD 449#ifdef DEBUG_CMD
336 rxvt_print_error ("signal %d", sig); 450 rxvt_warn ("caught signal %d, exiting.\n", sig);
337#endif 451#endif
338 rxvt_clean_exit (); 452 rxvt_clean_exit ();
339 kill (getpid (), sig); 453 kill (getpid (), sig);
340} 454}
341 455
… …
379 493
380 p = malloc (size); 494 p = malloc (size);
381 if (p) 495 if (p)
382 return p; 496 return p;
383 497
384 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 498 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
385 rxvt_clean_exit (); 499 rxvt_clean_exit ();
386 exit (EXIT_FAILURE); 500 exit (EXIT_FAILURE);
387 /* NOTREACHED */ 501 /* NOTREACHED */
388} 502}
389 503
… …
395 509
396 p = calloc (number, size); 510 p = calloc (number, size);
397 if (p) 511 if (p)
398 return p; 512 return p;
399 513
400 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 514 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
401 rxvt_clean_exit (); 515 rxvt_clean_exit ();
402 exit (EXIT_FAILURE); 516 exit (EXIT_FAILURE);
403 /* NOTREACHED */ 517 /* NOTREACHED */
404} 518}
405 519
… …
414 else 528 else
415 p = malloc (size); 529 p = malloc (size);
416 if (p) 530 if (p)
417 return p; 531 return p;
418 532
419 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 533 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
420 rxvt_clean_exit (); 534 rxvt_clean_exit ();
421 exit (EXIT_FAILURE); 535 exit (EXIT_FAILURE);
422 /* NOTREACHED */ 536 /* NOTREACHED */
423} 537}
424 538
… …
616 else 730 else
617 szHint.win_gravity = SouthWestGravity; 731 szHint.win_gravity = SouthWestGravity;
618 } 732 }
619 } 733 }
620 } 734 }
735
621 /* TODO: BOUNDS */ 736 /* TODO: BOUNDS */
622 TermWin.width = TermWin.ncol * TermWin.fwidth; 737 TermWin.width = TermWin.ncol * TermWin.fwidth;
623 TermWin.height = TermWin.nrow * TermWin.fheight; 738 TermWin.height = TermWin.nrow * TermWin.fheight;
624 max_width = MAX_COLS * TermWin.fwidth; 739 max_width = MAX_COLS * TermWin.fwidth;
625 max_height = MAX_ROWS * TermWin.fheight; 740 max_height = MAX_ROWS * TermWin.fheight;
626 741
627 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 742 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
628 743
629 sb_w = mb_h = 0; 744 sb_w = mb_h = 0;
630 window_vt_x = window_vt_y = 0; 745 window_vt_x = window_vt_y = 0;
746
631 if (scrollbar_visible ()) 747 if (scrollbar_visible ())
632 { 748 {
633 sb_w = scrollbar_TotalWidth (); 749 sb_w = scrollbar_TotalWidth ();
634 szHint.base_width += sb_w; 750 szHint.base_width += sb_w;
635 if (! (Options & Opt_scrollBar_right)) 751 if (! (Options & Opt_scrollBar_right))
636 window_vt_x = sb_w; 752 window_vt_x = sb_w;
637 } 753 }
754
638 if (menubar_visible ()) 755 if (menubar_visible ())
639 { 756 {
640 mb_h = menuBar_TotalHeight (); 757 mb_h = menuBar_TotalHeight ();
641 szHint.base_height += mb_h; 758 szHint.base_height += mb_h;
642 window_vt_y = mb_h; 759 window_vt_y = mb_h;
643 } 760 }
761
644 szHint.width_inc = TermWin.fwidth; 762 szHint.width_inc = TermWin.fwidth;
645 szHint.height_inc = TermWin.fheight; 763 szHint.height_inc = TermWin.fheight;
646 szHint.min_width = szHint.base_width + szHint.width_inc; 764 szHint.min_width = szHint.base_width + szHint.width_inc;
647 szHint.min_height = szHint.base_height + szHint.height_inc; 765 szHint.min_height = szHint.base_height + szHint.height_inc;
648 766
… …
654 else 772 else
655 { 773 {
656 MIN_IT (TermWin.width, max_width); 774 MIN_IT (TermWin.width, max_width);
657 szHint.width = szHint.base_width + TermWin.width; 775 szHint.width = szHint.base_width + TermWin.width;
658 } 776 }
777
659 if (height && height - szHint.base_height < max_height) 778 if (height && height - szHint.base_height < max_height)
660 { 779 {
661 szHint.height = height; 780 szHint.height = height;
662 TermWin.height = height - szHint.base_height; 781 TermWin.height = height - szHint.base_height;
663 } 782 }
664 else 783 else
665 { 784 {
666 MIN_IT (TermWin.height, max_height); 785 MIN_IT (TermWin.height, max_height);
667 szHint.height = szHint.base_height + TermWin.height; 786 szHint.height = szHint.base_height + TermWin.height;
668 } 787 }
788
669 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 789 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
670 window_sb_x = szHint.width - sb_w; 790 window_sb_x = szHint.width - sb_w;
671 791
672 if (recalc_x) 792 if (recalc_x)
673 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 793 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
… …
718 * init = 1 - initialize 838 * init = 1 - initialize
719 * 839 *
720 * fontname == FONT_UP - switch to bigger font 840 * fontname == FONT_UP - switch to bigger font
721 * fontname == FONT_DN - switch to smaller font 841 * fontname == FONT_DN - switch to smaller font
722 */ 842 */
723void 843bool
724rxvt_term::change_font (int init, const char *fontname) 844rxvt_term::change_font (const char *fontname)
725{} 845{
846 if (fontname == FONT_UP)
847 {
848 // TODO
849 }
850 else if (fontname == FONT_DN)
851 {
852 // TODO
853 }
854 else
855 {
856 rxvt_fontset *fs = new rxvt_fontset (this);
726 857
727void 858 if (fs && fs->populate (fontname ? fontname : "fixed"))
859 {
860 delete TermWin.fontset;
861 TermWin.fontset = fs;
862 TermWin.fwidth = fs->base_font ()->width;
863 TermWin.fheight = fs->base_font ()->height;
864 TermWin.fbase = fs->base_font ()->ascent;
865
866 if (TermWin.parent[0])
867 {
868 resize_all_windows (0, 0, 0);
869 scr_remap_chars ();
870 scr_touch (true);
871 }
872
873 return true;
874 }
875 }
876
877 return false;
878}
879
880bool
728rxvt_term::font_up_down (int n, int direction) 881rxvt_term::font_up_down (int n, int direction)
729{} 882{
883 return false;
884}
730 885
731/*----------------------------------------------------------------------*/ 886/*----------------------------------------------------------------------*/
732/*----------------------------------------------------------------------*/ 887/*----------------------------------------------------------------------*/
733/* xterm sequences - title, iconName, color (exptl) */ 888/* xterm sequences - title, iconName, color (exptl) */
734void 889void
735rxvt_term::set_title (const char *str) 890rxvt_term::set_title (const char *str)
736{ 891{
737#ifndef SMART_WINDOW_TITLE 892#ifdef SMART_WINDOW_TITLE
738 XStoreName (display->display, TermWin.parent[0], str); 893 char *name;
739#else
740 char *name;
741 894
742 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 895 if (!XFetchName (display->display, TermWin.parent[0], &name))
743 name = NULL; 896 name = NULL;
897
744 if (name == NULL || STRCMP (name, str)) 898 if (name == NULL || STRCMP (name, str))
899#endif
745 XStoreName (display->display, TermWin.parent[0], str); 900 XStoreName (display->display, TermWin.parent[0], str);
901
902#ifdef SMART_WINDOW_TITLE
746 if (name) 903 if (name)
747 XFree (name); 904 XFree (name);
748#endif 905#endif
749} 906}
750 907
751void 908void
752rxvt_term::set_iconName (const char *str) 909rxvt_term::set_icon_name (const char *str)
753{ 910{
754#ifndef SMART_WINDOW_TITLE 911#ifdef SMART_WINDOW_TITLE
755 XSetIconName (display->display, TermWin.parent[0], str); 912 char *name;
756#else
757 char *name;
758 913
759 if (XGetIconName (display->display, TermWin.parent[0], &name)) 914 if (!XGetIconName (display->display, TermWin.parent[0], &name))
760 name = NULL; 915 name = NULL;
916
761 if (name == NULL || STRCMP (name, str)) 917 if (name == NULL || STRCMP (name, str))
918#endif
762 XSetIconName (display->display, TermWin.parent[0], str); 919 XSetIconName (display->display, TermWin.parent[0], str);
920
921#ifdef SMART_WINDOW_TITLE
763 if (name) 922 if (name)
764 XFree (name); 923 XFree (name);
765#endif 924#endif
766} 925}
767 926
768#ifdef XTERM_COLOR_CHANGE 927#ifdef XTERM_COLOR_CHANGE
769void 928void
770rxvt_term::set_window_color (int idx, const char *color) 929rxvt_term::set_window_color (int idx, const char *color)
771{ 930{
772 rxvt_color xcol; 931 rxvt_color xcol;
773 int i; 932 int i;
774 933
775 if (color == NULL || *color == '\0') 934 if (color == NULL || *color == '\0')
776 return; 935 return;
777 936
778 /* handle color aliases */ 937 /* handle color aliases */
… …
794 PixColors[idx] = PixColors[minCOLOR + i]; 953 PixColors[idx] = PixColors[minCOLOR + i];
795 SET_PIXCOLOR (idx); 954 SET_PIXCOLOR (idx);
796 goto Done; 955 goto Done;
797 } 956 }
798 } 957 }
958
799 if (!rXParseAllocColor (& xcol, color)) 959 if (!rXParseAllocColor (& xcol, color))
800 return; 960 return;
961
801 /* XStoreColor (display->display, XCMAP, XColor*); */ 962 /* XStoreColor (display->display, XCMAP, XColor*); */
802 963
803 /* 964 /*
804 * FIXME: should free colors here, but no idea how to do it so instead, 965 * FIXME: should free colors here, but no idea how to do it so instead,
805 * so just keep gobbling up the colormap 966 * so just keep gobbling up the colormap
… …
828 989
829 /* handle Color_BD, scrollbar background, etc. */ 990 /* handle Color_BD, scrollbar background, etc. */
830 991
831 set_colorfgbg (); 992 set_colorfgbg ();
832 recolour_cursor (); 993 recolour_cursor ();
833 /* the only reasonable way to enforce a clean update */ 994 scr_touch (true);
834 scr_poweron ();
835} 995}
836 996
837#else 997#else
838# define set_window_color (idx,color) ((void)0) 998# define set_window_color (idx,color) ((void)0)
839#endif /* XTERM_COLOR_CHANGE */ 999#endif /* XTERM_COLOR_CHANGE */
840 1000
841void 1001void
842rxvt_term::recolour_cursor () 1002rxvt_term::recolour_cursor ()
843{ 1003{
844#if TODO
845 rxvt_color xcol[2]; 1004 XColor xcol[2];
846 1005
847 xcol[0] = PixColors[Color_pointer]; 1006 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg];
848 xcol[1] = PixColors[Color_bg]; 1007 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg];
849 XQueryColors (display->display, XCMAP, xcol, 2); 1008 XQueryColors (display->display, XCMAP, xcol, 2);
850 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1009 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
851#endif
852} 1010}
853 1011
854/*----------------------------------------------------------------------*/ 1012/*----------------------------------------------------------------------*/
855/* 1013/*
856 * find if fg/bg matches any of the normal (low-intensity) colors 1014 * find if fg/bg matches any of the normal (low-intensity) colors
… …
905int 1063int
906rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1064rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
907{ 1065{
908 if (!screen_in_out->set (display, colour)) 1066 if (!screen_in_out->set (display, colour))
909 { 1067 {
910 rxvt_print_error ("can't allocate colour: %s", colour); 1068 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
911 return false; 1069 return false;
912 } 1070 }
913 1071
914 return true; 1072 return true;
915} 1073}
… …
926 int old_width = szHint.width, old_height = szHint.height; 1084 int old_width = szHint.width, old_height = szHint.height;
927#endif 1085#endif
928 1086
929 window_calc (width, height); 1087 window_calc (width, height);
930 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1088 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1089
931 if (!ignoreparent) 1090 if (!ignoreparent)
932 { 1091 {
933#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
934 /* 1093 /*
935 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1094 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
970 dy /= 2; 1129 dy /= 2;
971 1130
972 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
973 szHint.width, szHint.height); 1132 szHint.width, szHint.height);
974#else 1133#else
975 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1134 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
976 szHint.height);
977#endif 1135#endif
978
979 } 1136 }
980 1137
981 fix_screen = (TermWin.ncol != prev_ncol 1138 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
982 || TermWin.nrow != prev_nrow);
983 1139
984 if (fix_screen || width != old_width || height != old_height) 1140 if (fix_screen || width != old_width || height != old_height)
985 { 1141 {
986 if (scrollbar_visible ()) 1142 if (scrollbar_visible ())
987 { 1143 {
988 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1144 XMoveResizeWindow (display->display, scrollBar.win,
1145 window_sb_x, 0,
989 0, scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
990 resize_scrollbar (); 1147 resize_scrollbar ();
991 } 1148 }
992 1149
993 if (menubar_visible ()) 1150 if (menubar_visible ())
994 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1151 XMoveResizeWindow (display->display, menuBar.win,
1152 window_vt_x, 0,
995 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1153 TermWin_TotalWidth (), menuBar_TotalHeight ());
996 1154
997 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1155 XMoveResizeWindow (display->display, TermWin.vt,
998 window_vt_y, TermWin_TotalWidth (), 1156 window_vt_x, window_vt_y,
999 TermWin_TotalHeight ()); 1157 TermWin_TotalWidth (), TermWin_TotalHeight ());
1000#ifdef RXVT_GRAPHICS
1001 if (old_height)
1002 Gr_Resize (old_width - szHint.base_width,
1003 old_height - szHint.base_height);
1004#endif
1005 scr_clear (); 1158 scr_clear ();
1006#ifdef XPM_BACKGROUND 1159#ifdef XPM_BACKGROUND
1007 resize_pixmap (); 1160 resize_pixmap ();
1008#endif 1161#endif
1009
1010 } 1162 }
1011 1163
1012 if (fix_screen || old_height == 0) 1164 if (fix_screen || old_height == 0)
1013 { 1165 {
1014 int curr_screen = -1; 1166 int curr_screen = -1;
… …
1287 if (preedit_attr) XFree (preedit_attr); 1439 if (preedit_attr) XFree (preedit_attr);
1288 if (status_attr) XFree (status_attr); 1440 if (status_attr) XFree (status_attr);
1289 1441
1290 if (Input_Context == NULL) 1442 if (Input_Context == NULL)
1291 { 1443 {
1292 rxvt_print_error ("failed to create input context"); 1444 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1293 display->put_xim (input_method); 1445 display->put_xim (input_method);
1294 return false; 1446 return false;
1295 } 1447 }
1296 1448
1297 if (input_style & XIMPreeditArea) 1449 if (input_style & XIMPreeditArea)
… …
1315 if (Input_Context) 1467 if (Input_Context)
1316 return; 1468 return;
1317 1469
1318#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1470#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1319 if (rs[Rs_imLocale]) 1471 if (rs[Rs_imLocale])
1320 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1472 SET_LOCALE (rs[Rs_imLocale]);
1321#endif 1473#endif
1322 1474
1323 p = rs[Rs_inputMethod]; 1475 p = rs[Rs_inputMethod];
1324 if (p && *p) 1476 if (p && *p)
1325 { 1477 {
… …
1356 goto done; 1508 goto done;
1357 1509
1358done: 1510done:
1359#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1511#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1360 if (rs[Rs_imLocale]) 1512 if (rs[Rs_imLocale])
1361 setlocale (LC_CTYPE, locale); 1513 SET_LOCALE (locale);
1362#endif 1514#endif
1363} 1515}
1364 1516
1365void 1517void
1366rxvt_term::IMSetStatusPosition () 1518rxvt_term::IMSetStatusPosition ()

Diff Legend

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