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.77 by root, Tue Aug 10 20:39:19 2004 UTC

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

Diff Legend

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