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

Diff Legend

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