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.32 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.70 by root, Mon Jul 26 18:01: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
… …
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
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
92#ifdef POINTER_BLANK 169#ifdef POINTER_BLANK
93 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
94#endif 174#endif
95 check_ev (this, &rxvt_term::check_cb), 175 check_ev (this, &rxvt_term::check_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb), 176 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb), 177 pty_ev (this, &rxvt_term::pty_cb),
98 incr_ev (this, &rxvt_term::incr_cb), 178 incr_ev (this, &rxvt_term::incr_cb)
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
102{ 179{
103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 180 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
181
182 termlist.push_back (this);
104} 183}
105 184
106rxvt_term::~rxvt_term () 185rxvt_term::~rxvt_term ()
107{ 186{
187 termlist.erase (find (termlist.begin (), termlist.end(), this));
188
108 if (cmd_fd >= 0) 189 if (cmd_fd >= 0)
109 close (cmd_fd); 190 close (cmd_fd);
110 191
111 scr_release ();
112
113 free (locale);
114 free (codeset);
115
116#ifndef NO_SETOWNER_TTYDEV 192#ifndef NO_SETOWNER_TTYDEV
117 privileged_ttydev (RESTORE); 193 privileged_ttydev (RESTORE);
118#endif 194#endif
119#ifdef UTMP_SUPPORT 195#ifdef UTMP_SUPPORT
120 privileged_utmp (RESTORE); 196 privileged_utmp (RESTORE);
121#endif 197#endif
122 198
123 // TODO: free pixcolours, colours should become part of rxvt_display
124
125 delete PixColors;
126 delete TermWin.fontset; 199 delete TermWin.fontset;
127 200
128 displays.put (display);
129}
130
131void
132rxvt_term::destroy ()
133{
134 if (display) 201 if (display)
135 { 202 {
203 selection_clear ();
204
205#ifdef MENUBAR
206 if (menubarGC) XFreeGC (display->display, menubarGC);
207#endif
208#ifdef XTERM_SCROLLBAR
209 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
210 if (ShadowGC) XFreeGC (display->display, ShadowGC);
211#endif
212#ifdef PLAIN_SCROLLBAR
213 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
214#endif
215#ifdef NEXT_SCROLLBAR
216 if (blackGC) XFreeGC (display->display, blackGC);
217 if (whiteGC) XFreeGC (display->display, whiteGC);
218 if (grayGC) XFreeGC (display->display, grayGC);
219 if (darkGC) XFreeGC (display->display, darkGC);
220 if (stippleGC) XFreeGC (display->display, stippleGC);
221 if (dimple) XFreePixmap (display->display, dimple);
222 if (upArrow) XFreePixmap (display->display, upArrow);
223 if (downArrow) XFreePixmap (display->display, downArrow);
224 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
225 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
226#endif
227#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
228 if (topShadowGC) XFreeGC (display->display, topShadowGC);
229 if (botShadowGC) XFreeGC (display->display, botShadowGC);
230 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
231#endif
232 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
233
234#if defined(MENUBAR) && (MENUBAR_MAX > 1)
235 delete menuBar.drawable;
236 //if (menuBar.win)
237 // XDestroyWindow (display->display, menuBar.win);
238#endif
239 delete TermWin.drawable;
240 // destroy all windows
136 if (TermWin.parent[0]) 241 if (TermWin.parent[0])
137 XDestroyWindow (display->display, TermWin.parent[0]); 242 XDestroyWindow (display->display, TermWin.parent[0]);
243 }
138 244
245 // TODO: free pixcolours, colours should become part of rxvt_display
246
247 delete PixColors;
248
249 displays.put (display);
250
251 scr_release ();
252
253 /* clear all resources */
254 for (int i = 0; i < allocated.size (); i++)
255 free (allocated[i]);
256
257 free (selection.text);
258 // TODO: manage env vars in child only(!)
259 free (env_windowid);
260 free (env_display);
261 free (env_term);
262 free (env_colorfgbg);
263 free (locale);
264#if 0
265 free (codeset);
266#endif
267
268 delete envv;
269 delete argv;
270}
271
272void
273rxvt_term::destroy ()
274{
275 if (display)
276 {
139 rootwin_ev.stop (display); 277 rootwin_ev.stop (display);
140 termwin_ev.stop (display); 278 termwin_ev.stop (display);
141 vt_ev.stop (display); 279 vt_ev.stop (display);
142
143#ifdef USE_XIM 280#ifdef USE_XIM
144 im_destroy (); 281 im_destroy ();
145 im_ev.stop (display); 282 im_ev.stop (display);
146#endif 283#endif
147#ifdef HAVE_SCROLLBARS 284#ifdef HAVE_SCROLLBARS
… …
158 cursor_blink_ev.stop (); 295 cursor_blink_ev.stop ();
159#endif 296#endif
160#ifdef TEXT_BLINK 297#ifdef TEXT_BLINK
161 text_blink_ev.stop (); 298 text_blink_ev.stop ();
162#endif 299#endif
300#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
301 cont_scroll_ev.stop ();
302#endif
303#ifdef SELECTION_SCROLLING
304 sel_scroll_ev.stop ();
305#endif
163#ifdef POINTER_BLANK 306#ifdef POINTER_BLANK
164 pointer_ev.stop (); 307 pointer_ev.stop ();
165#endif 308#endif
166 309
167 destroy_ev.start (0); 310 destroy_ev.start (0);
… …
175 delete this; 318 delete this;
176} 319}
177 320
178/*----------------------------------------------------------------------*/ 321/*----------------------------------------------------------------------*/
179/* rxvt_init () */ 322/* rxvt_init () */
180/* LIBPROTO */
181rxvt_t
182rxvt_init (int argc, const char *const *argv)
183{
184 SET_R (new rxvt_term);
185
186 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
187 {
188 delete GET_R;
189 SET_R (0);
190 }
191
192 return GET_R;
193}
194
195static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
196
197void
198rxvt_init_signals ()
199{
200 /* install exit handler for cleanup */
201#if 0
202#ifdef HAVE_ATEXIT
203 atexit (rxvt_clean_exit);
204#else
205#endif
206#endif
207
208 struct sigaction sa;
209
210 sigfillset (&sa.sa_mask);
211 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
212 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
213 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
214 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
215 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
216 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
217 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
218
219 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
220 /* signal (SIGURG, SIG_DFL); */
221
222 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
223 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
224}
225
226bool 323bool
227rxvt_term::init (int argc, const char *const *argv) 324rxvt_term::init (int argc, const char *const *argv)
228{ 325{
326 SET_R (this);
327
328 if (!init_vars ())
329 return false;
330
229 /* 331 /*
230 * Save and then give up any super-user privileges 332 * Save and then give up any super-user privileges
231 * If we need privileges in any area then we must specifically request it. 333 * If we need privileges in any area then we must specifically request it.
232 * We should only need to be root in these cases: 334 * We should only need to be root in these cases:
233 * 1. write utmp entries on some systems 335 * 1. write utmp entries on some systems
… …
240 342
241 const char **cmd_argv = init_resources (argc, argv); 343 const char **cmd_argv = init_resources (argc, argv);
242 344
243 set_locale (""); 345 set_locale ("");
244 346
245#if (MENUBAR_MAX) 347#if MENUBAR_MAX
246 menubar_read (rs[Rs_menu]); 348 menubar_read (rs[Rs_menu]);
247#endif 349#endif
248#ifdef HAVE_SCROLLBARS 350#ifdef HAVE_SCROLLBARS
249 if (Options & Opt_scrollBar) 351 if (Options & Opt_scrollBar)
250 scrollBar.setIdle (); /* set existence for size calculations */ 352 scrollBar.setIdle (); /* set existence for size calculations */
… …
253 create_windows (argc, argv); 355 create_windows (argc, argv);
254 356
255 init_xlocale (); 357 init_xlocale ();
256 358
257 scr_reset (); /* initialize screen */ 359 scr_reset (); /* initialize screen */
258#ifdef RXVT_GRAPHICS
259 Gr_reset (); /* reset graphics */
260#endif
261 360
262#if 0 361#if 0
263#ifdef DEBUG_X
264 XSynchronize (display->display, True); 362 XSynchronize (display->display, True);
265#endif
266#endif 363#endif
267 364
268#ifdef HAVE_SCROLLBARS 365#ifdef HAVE_SCROLLBARS
269 if (Options & Opt_scrollBar) 366 if (Options & Opt_scrollBar)
270 resize_scrollbar (); /* create and map scrollbar */ 367 resize_scrollbar (); /* create and map scrollbar */
271#endif 368#endif
272#if (MENUBAR_MAX) 369#if (MENUBAR_MAX)
273 if (menubar_visible (r)) 370 if (menubar_visible ())
274 XMapWindow (display->display, menuBar.win); 371 XMapWindow (display->display, menuBar.win);
275#endif 372#endif
276#ifdef TRANSPARENT 373#ifdef TRANSPARENT
277 if (Options & Opt_transparent) 374 if (Options & Opt_transparent)
278 { 375 {
… …
284 rootwin_ev.start (display, display->root); 381 rootwin_ev.start (display, display->root);
285 382
286 XMapWindow (display->display, TermWin.vt); 383 XMapWindow (display->display, TermWin.vt);
287 XMapWindow (display->display, TermWin.parent[0]); 384 XMapWindow (display->display, TermWin.parent[0]);
288 385
289 init_env ();
290 init_command (cmd_argv); 386 init_command (cmd_argv);
291 387
292 pty_ev.start (cmd_fd, EVENT_READ); 388 pty_ev.start (cmd_fd, EVENT_READ);
293 389
294 check_ev.start (); 390 check_ev.start ();
295 391
296 return true; 392 return true;
393}
394
395static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
396
397void
398rxvt_init_signals ()
399{
400 /* install exit handler for cleanup */
401#if 0
402#ifdef HAVE_ATEXIT
403 atexit (rxvt_clean_exit);
404#else
405#endif
406#endif
407
408 struct sigaction sa;
409
410 sigfillset (&sa.sa_mask);
411 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
412 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
413 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
414 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
415 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
416 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
417 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
418
419 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
420 /* signal (SIGURG, SIG_DFL); */
421
422 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
423 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
297} 424}
298 425
299/* ------------------------------------------------------------------------- * 426/* ------------------------------------------------------------------------- *
300 * SIGNAL HANDLING & EXIT HANDLER * 427 * SIGNAL HANDLING & EXIT HANDLER *
301 * ------------------------------------------------------------------------- */ 428 * ------------------------------------------------------------------------- */
302/* 429/*
303 * Catch a SIGCHLD signal and exit if the direct child has died 430 * Catch a SIGCHLD signal and exit if the direct child has died
304 */ 431 */
432
433void rxvt_term::child_exited (int pid)
434{
435 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
436 if (pid == (*t)->cmd_pid)
437 {
438 (*t)->destroy ();
439 break;
440 }
441}
442
305/* ARGSUSED */ 443/* ARGSUSED */
306/* EXTPROTO */ 444/* EXTPROTO */
307RETSIGTYPE 445RETSIGTYPE
308rxvt_Child_signal (int sig __attribute__ ((unused))) 446rxvt_Child_signal (int sig __attribute__ ((unused)))
309{ 447{
310 int pid, save_errno = errno; 448 int pid, save_errno = errno;
449
311 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 450 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
312 ; 451 rxvt_term::child_exited (pid);
452
313 errno = save_errno; 453 errno = save_errno;
314
315#if 0
316 if (pid == cmd_pid)
317 exit (EXIT_SUCCESS);
318#endif
319} 454}
320 455
321/* 456/*
322 * Catch a fatal signal and tidy up before quitting 457 * Catch a fatal signal and tidy up before quitting
323 */ 458 */
… …
325RETSIGTYPE 460RETSIGTYPE
326rxvt_Exit_signal (int sig) 461rxvt_Exit_signal (int sig)
327{ 462{
328 signal (sig, SIG_DFL); 463 signal (sig, SIG_DFL);
329#ifdef DEBUG_CMD 464#ifdef DEBUG_CMD
330 rxvt_print_error ("signal %d", sig); 465 rxvt_warn ("caught signal %d, exiting.\n", sig);
331#endif 466#endif
332 rxvt_clean_exit (); 467 rxvt_clean_exit ();
333 kill (getpid (), sig); 468 kill (getpid (), sig);
334} 469}
335 470
… …
373 508
374 p = malloc (size); 509 p = malloc (size);
375 if (p) 510 if (p)
376 return p; 511 return p;
377 512
378 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 513 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
379 rxvt_clean_exit (); 514 rxvt_clean_exit ();
380 exit (EXIT_FAILURE); 515 exit (EXIT_FAILURE);
381 /* NOTREACHED */ 516 /* NOTREACHED */
382} 517}
383 518
… …
389 524
390 p = calloc (number, size); 525 p = calloc (number, size);
391 if (p) 526 if (p)
392 return p; 527 return p;
393 528
394 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 529 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
395 rxvt_clean_exit (); 530 rxvt_clean_exit ();
396 exit (EXIT_FAILURE); 531 exit (EXIT_FAILURE);
397 /* NOTREACHED */ 532 /* NOTREACHED */
398} 533}
399 534
… …
408 else 543 else
409 p = malloc (size); 544 p = malloc (size);
410 if (p) 545 if (p)
411 return p; 546 return p;
412 547
413 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 548 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
414 rxvt_clean_exit (); 549 rxvt_clean_exit ();
415 exit (EXIT_FAILURE); 550 exit (EXIT_FAILURE);
416 /* NOTREACHED */ 551 /* NOTREACHED */
417} 552}
418 553
… …
610 else 745 else
611 szHint.win_gravity = SouthWestGravity; 746 szHint.win_gravity = SouthWestGravity;
612 } 747 }
613 } 748 }
614 } 749 }
750
615 /* TODO: BOUNDS */ 751 /* TODO: BOUNDS */
616 TermWin.width = TermWin.ncol * TermWin.fwidth; 752 TermWin.width = TermWin.ncol * TermWin.fwidth;
617 TermWin.height = TermWin.nrow * TermWin.fheight; 753 TermWin.height = TermWin.nrow * TermWin.fheight;
618 max_width = MAX_COLS * TermWin.fwidth; 754 max_width = MAX_COLS * TermWin.fwidth;
619 max_height = MAX_ROWS * TermWin.fheight; 755 max_height = MAX_ROWS * TermWin.fheight;
620 756
621 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 757 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
622 758
623 sb_w = mb_h = 0; 759 sb_w = mb_h = 0;
624 window_vt_x = window_vt_y = 0; 760 window_vt_x = window_vt_y = TermWin.int_bwidth;
761
625 if (scrollbar_visible ()) 762 if (scrollbar_visible ())
626 { 763 {
627 sb_w = scrollbar_TotalWidth (); 764 sb_w = scrollbar_TotalWidth ();
628 szHint.base_width += sb_w; 765 szHint.base_width += sb_w;
629 if (! (Options & Opt_scrollBar_right)) 766 if (!(Options & Opt_scrollBar_right))
630 window_vt_x = sb_w; 767 window_vt_x += sb_w;
631 } 768 }
769
632 if (menubar_visible ()) 770 if (menubar_visible ())
633 { 771 {
634 mb_h = menuBar_TotalHeight (); 772 mb_h = menuBar_TotalHeight ();
635 szHint.base_height += mb_h; 773 szHint.base_height += mb_h;
636 window_vt_y = mb_h; 774 window_vt_y += mb_h;
637 } 775 }
776
638 szHint.width_inc = TermWin.fwidth; 777 szHint.width_inc = TermWin.fwidth;
639 szHint.height_inc = TermWin.fheight; 778 szHint.height_inc = TermWin.fheight;
640 szHint.min_width = szHint.base_width + szHint.width_inc; 779 szHint.min_width = szHint.base_width + szHint.width_inc;
641 szHint.min_height = szHint.base_height + szHint.height_inc; 780 szHint.min_height = szHint.base_height + szHint.height_inc;
642 781
… …
648 else 787 else
649 { 788 {
650 MIN_IT (TermWin.width, max_width); 789 MIN_IT (TermWin.width, max_width);
651 szHint.width = szHint.base_width + TermWin.width; 790 szHint.width = szHint.base_width + TermWin.width;
652 } 791 }
792
653 if (height && height - szHint.base_height < max_height) 793 if (height && height - szHint.base_height < max_height)
654 { 794 {
655 szHint.height = height; 795 szHint.height = height;
656 TermWin.height = height - szHint.base_height; 796 TermWin.height = height - szHint.base_height;
657 } 797 }
658 else 798 else
659 { 799 {
660 MIN_IT (TermWin.height, max_height); 800 MIN_IT (TermWin.height, max_height);
661 szHint.height = szHint.base_height + TermWin.height; 801 szHint.height = szHint.base_height + TermWin.height;
662 } 802 }
803
663 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 804 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
664 window_sb_x = szHint.width - sb_w; 805 window_sb_x = szHint.width - sb_w;
665 806
666 if (recalc_x) 807 if (recalc_x)
667 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 808 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
… …
712 * init = 1 - initialize 853 * init = 1 - initialize
713 * 854 *
714 * fontname == FONT_UP - switch to bigger font 855 * fontname == FONT_UP - switch to bigger font
715 * fontname == FONT_DN - switch to smaller font 856 * fontname == FONT_DN - switch to smaller font
716 */ 857 */
717void 858bool
718rxvt_term::change_font (int init, const char *fontname) 859rxvt_term::change_font (const char *fontname)
719{} 860{
861 if (fontname == FONT_UP)
862 {
863 // TODO
864 }
865 else if (fontname == FONT_DN)
866 {
867 // TODO
868 }
869 else
870 {
871 rxvt_fontset *fs = new rxvt_fontset (this);
720 872
721void 873 if (fs && fs->populate (fontname ? fontname : "fixed"))
874 {
875 delete TermWin.fontset;
876 TermWin.fontset = fs;
877 TermWin.fwidth = fs->base_font ()->width;
878 TermWin.fheight = fs->base_font ()->height;
879 TermWin.fbase = fs->base_font ()->ascent;
880
881 if (TermWin.parent[0])
882 {
883 resize_all_windows (0, 0, 0);
884 scr_remap_chars ();
885 scr_touch (true);
886 }
887
888 return true;
889 }
890 }
891
892 return false;
893}
894
895bool
722rxvt_term::font_up_down (int n, int direction) 896rxvt_term::font_up_down (int n, int direction)
723{} 897{
898 return false;
899}
724 900
725/*----------------------------------------------------------------------*/ 901/*----------------------------------------------------------------------*/
726/*----------------------------------------------------------------------*/ 902/*----------------------------------------------------------------------*/
727/* xterm sequences - title, iconName, color (exptl) */ 903/* xterm sequences - title, iconName, color (exptl) */
728void 904void
729rxvt_term::set_title (const char *str) 905rxvt_term::set_title (const char *str)
730{ 906{
731#ifndef SMART_WINDOW_TITLE 907#ifdef SMART_WINDOW_TITLE
732 XStoreName (display->display, TermWin.parent[0], str); 908 char *name;
733#else
734 char *name;
735 909
736 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 910 if (!XFetchName (display->display, TermWin.parent[0], &name))
737 name = NULL; 911 name = NULL;
912
738 if (name == NULL || STRCMP (name, str)) 913 if (name == NULL || STRCMP (name, str))
914#endif
739 XStoreName (display->display, TermWin.parent[0], str); 915 XStoreName (display->display, TermWin.parent[0], str);
916
917#ifdef SMART_WINDOW_TITLE
740 if (name) 918 if (name)
741 XFree (name); 919 XFree (name);
742#endif 920#endif
743} 921}
744 922
745void 923void
746rxvt_term::set_iconName (const char *str) 924rxvt_term::set_icon_name (const char *str)
747{ 925{
748#ifndef SMART_WINDOW_TITLE 926#ifdef SMART_WINDOW_TITLE
749 XSetIconName (display->display, TermWin.parent[0], str); 927 char *name;
750#else
751 char *name;
752 928
753 if (XGetIconName (display->display, TermWin.parent[0], &name)) 929 if (!XGetIconName (display->display, TermWin.parent[0], &name))
754 name = NULL; 930 name = NULL;
931
755 if (name == NULL || STRCMP (name, str)) 932 if (name == NULL || STRCMP (name, str))
933#endif
756 XSetIconName (display->display, TermWin.parent[0], str); 934 XSetIconName (display->display, TermWin.parent[0], str);
935
936#ifdef SMART_WINDOW_TITLE
757 if (name) 937 if (name)
758 XFree (name); 938 XFree (name);
759#endif 939#endif
760} 940}
761 941
762#ifdef XTERM_COLOR_CHANGE 942#ifdef XTERM_COLOR_CHANGE
763void 943void
764rxvt_term::set_window_color (int idx, const char *color) 944rxvt_term::set_window_color (int idx, const char *color)
765{ 945{
766 rxvt_color xcol; 946 rxvt_color xcol;
767 int i; 947 int i;
768 948
769 if (color == NULL || *color == '\0') 949 if (color == NULL || *color == '\0')
770 return; 950 return;
771 951
772 /* handle color aliases */ 952 /* handle color aliases */
… …
788 PixColors[idx] = PixColors[minCOLOR + i]; 968 PixColors[idx] = PixColors[minCOLOR + i];
789 SET_PIXCOLOR (idx); 969 SET_PIXCOLOR (idx);
790 goto Done; 970 goto Done;
791 } 971 }
792 } 972 }
973
793 if (!rXParseAllocColor (& xcol, color)) 974 if (!rXParseAllocColor (& xcol, color))
794 return; 975 return;
976
795 /* XStoreColor (display->display, XCMAP, XColor*); */ 977 /* XStoreColor (display->display, XCMAP, XColor*); */
796 978
797 /* 979 /*
798 * FIXME: should free colors here, but no idea how to do it so instead, 980 * FIXME: should free colors here, but no idea how to do it so instead,
799 * so just keep gobbling up the colormap 981 * so just keep gobbling up the colormap
… …
822 1004
823 /* handle Color_BD, scrollbar background, etc. */ 1005 /* handle Color_BD, scrollbar background, etc. */
824 1006
825 set_colorfgbg (); 1007 set_colorfgbg ();
826 recolour_cursor (); 1008 recolour_cursor ();
827 /* the only reasonable way to enforce a clean update */ 1009 scr_touch (true);
828 scr_poweron ();
829} 1010}
830 1011
831#else 1012#else
832# define set_window_color (idx,color) ((void)0) 1013# define set_window_color (idx,color) ((void)0)
833#endif /* XTERM_COLOR_CHANGE */ 1014#endif /* XTERM_COLOR_CHANGE */
834 1015
835void 1016void
836rxvt_term::recolour_cursor () 1017rxvt_term::recolour_cursor ()
837{ 1018{
838#if TODO
839 rxvt_color xcol[2]; 1019 XColor xcol[2];
840 1020
841 xcol[0] = PixColors[Color_pointer]; 1021 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg];
842 xcol[1] = PixColors[Color_bg]; 1022 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg];
843 XQueryColors (display->display, XCMAP, xcol, 2); 1023 XQueryColors (display->display, XCMAP, xcol, 2);
844 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1024 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
845#endif
846} 1025}
847 1026
848/*----------------------------------------------------------------------*/ 1027/*----------------------------------------------------------------------*/
849/* 1028/*
850 * find if fg/bg matches any of the normal (low-intensity) colors 1029 * find if fg/bg matches any of the normal (low-intensity) colors
… …
873#ifdef XPM_BACKGROUND 1052#ifdef XPM_BACKGROUND
874 xpmb = "default;"; 1053 xpmb = "default;";
875#endif 1054#endif
876 break; 1055 break;
877 } 1056 }
1057
878 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1058 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
879 putenv (env_colorfgbg);
880 1059
881#ifndef NO_BRIGHTCOLOR 1060#ifndef NO_BRIGHTCOLOR
882 colorfgbg = DEFAULT_RSTYLE; 1061 colorfgbg = DEFAULT_RSTYLE;
883 for (i = minCOLOR; i <= maxCOLOR; i++) 1062 for (i = minCOLOR; i <= maxCOLOR; i++)
884 { 1063 {
… …
899int 1078int
900rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1079rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
901{ 1080{
902 if (!screen_in_out->set (display, colour)) 1081 if (!screen_in_out->set (display, colour))
903 { 1082 {
904 rxvt_print_error ("can't allocate colour: %s", colour); 1083 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
905 return false; 1084 return false;
906 } 1085 }
907 1086
908 return true; 1087 return true;
909} 1088}
… …
920 int old_width = szHint.width, old_height = szHint.height; 1099 int old_width = szHint.width, old_height = szHint.height;
921#endif 1100#endif
922 1101
923 window_calc (width, height); 1102 window_calc (width, height);
924 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1103 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1104
925 if (!ignoreparent) 1105 if (!ignoreparent)
926 { 1106 {
927#ifdef SMART_RESIZE 1107#ifdef SMART_RESIZE
928 /* 1108 /*
929 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1109 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
964 dy /= 2; 1144 dy /= 2;
965 1145
966 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1146 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
967 szHint.width, szHint.height); 1147 szHint.width, szHint.height);
968#else 1148#else
969 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1149 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
970 szHint.height);
971#endif 1150#endif
972
973 } 1151 }
974 1152
975 fix_screen = (TermWin.ncol != prev_ncol 1153 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
976 || TermWin.nrow != prev_nrow);
977 1154
978 if (fix_screen || width != old_width || height != old_height) 1155 if (fix_screen || width != old_width || height != old_height)
979 { 1156 {
980 if (scrollbar_visible ()) 1157 if (scrollbar_visible ())
981 { 1158 {
982 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1159 XMoveResizeWindow (display->display, scrollBar.win,
1160 window_sb_x, 0,
983 0, scrollbar_TotalWidth (), szHint.height); 1161 scrollbar_TotalWidth (), szHint.height);
984 resize_scrollbar (); 1162 resize_scrollbar ();
985 } 1163 }
986 1164
987 if (menubar_visible ()) 1165 if (menubar_visible ())
988 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1166 XMoveResizeWindow (display->display, menuBar.win,
1167 window_vt_x, 0,
989 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1168 TermWin_TotalWidth (), menuBar_TotalHeight ());
990 1169
991 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1170 XMoveResizeWindow (display->display, TermWin.vt,
992 window_vt_y, TermWin_TotalWidth (), 1171 window_vt_x, window_vt_y,
993 TermWin_TotalHeight ()); 1172 TermWin_TotalWidth (), TermWin_TotalHeight ());
994#ifdef RXVT_GRAPHICS
995 if (old_height)
996 Gr_Resize (old_width - szHint.base_width,
997 old_height - szHint.base_height);
998#endif
999 scr_clear (); 1173 scr_clear ();
1000#ifdef XPM_BACKGROUND 1174#ifdef XPM_BACKGROUND
1001 resize_pixmap (); 1175 resize_pixmap ();
1002#endif 1176#endif
1003
1004 } 1177 }
1005 1178
1006 if (fix_screen || old_height == 0) 1179 if (fix_screen || old_height == 0)
1007 { 1180 {
1008 int curr_screen = -1; 1181 int curr_screen = -1;
… …
1281 if (preedit_attr) XFree (preedit_attr); 1454 if (preedit_attr) XFree (preedit_attr);
1282 if (status_attr) XFree (status_attr); 1455 if (status_attr) XFree (status_attr);
1283 1456
1284 if (Input_Context == NULL) 1457 if (Input_Context == NULL)
1285 { 1458 {
1286 rxvt_print_error ("failed to create input context"); 1459 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1287 display->put_xim (input_method); 1460 display->put_xim (input_method);
1288 return false; 1461 return false;
1289 } 1462 }
1290 1463
1291 if (input_style & XIMPreeditArea) 1464 if (input_style & XIMPreeditArea)
… …
1309 if (Input_Context) 1482 if (Input_Context)
1310 return; 1483 return;
1311 1484
1312#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1485#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1313 if (rs[Rs_imLocale]) 1486 if (rs[Rs_imLocale])
1314 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1487 SET_LOCALE (rs[Rs_imLocale]);
1315#endif 1488#endif
1316 1489
1317 p = rs[Rs_inputMethod]; 1490 p = rs[Rs_inputMethod];
1318 if (p && *p) 1491 if (p && *p)
1319 { 1492 {
… …
1350 goto done; 1523 goto done;
1351 1524
1352done: 1525done:
1353#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1526#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1354 if (rs[Rs_imLocale]) 1527 if (rs[Rs_imLocale])
1355 setlocale (LC_CTYPE, locale); 1528 SET_LOCALE (locale);
1356#endif 1529#endif
1357} 1530}
1358 1531
1359void 1532void
1360rxvt_term::IMSetStatusPosition () 1533rxvt_term::IMSetStatusPosition ()

Diff Legend

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