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

Diff Legend

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