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.44 by pcg, Tue Feb 24 16:25:44 2004 UTC vs.
Revision 1.177 by root, Mon Jan 16 06:37:52 2006 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 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * 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
19 * 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
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35#include "keyboard.h"
36#include "rxvtperl.h"
36 37
38#include <limits>
39
37#include <signal.h> 40#include <csignal>
41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
40# include <grp.h> 44# include <grp.h>
41#endif 45#endif
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#include <cstring> 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
52static uid_t saved_euid;
53static gid_t saved_egid;
54#endif
48 55
56bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
49static char curlocale[128]; 68static char curlocale[128], savelocale[128];
50 69
51void 70bool
52rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
53{ 72{
54 if (locale && STRNCMP (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
55 { 74 return false;
75
56 STRNCPY (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
58 } 78 return true;
59} 79}
60 80
61void * 81void
62rxvt_term::operator new (size_t s) 82rxvt_push_locale (const char *locale)
63{ 83{
64 void *p = malloc (s); 84 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale);
86}
65 87
66 MEMSET (p, 0, s); 88void
89rxvt_pop_locale ()
90{
91 rxvt_set_locale (savelocale);
92}
93
94void
95rxvt_term::make_current () const
96{
97 SET_R (this);
98 rxvt_set_locale (locale);
99 set_environ (envv);
100}
101
102#if ENABLE_COMBINING
103class rxvt_composite_vec rxvt_composite;
104
105text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
106{
107 compose_char *cc;
108
109 // break compose chains, as stupid readline really likes to duplicate
110 // composing characters for some reason near the end of a line.
111 cc = (*this)[c1];
112 while (cc)
113 {
114 if (cc->c2 == c2) return c1;
115 cc = (*this)[cc->c1];
116 }
117
118 // check to see wether this combination already exists otherwise
119 for (cc = v.end (); cc-- > v.begin (); )
120 {
121 if (cc->c1 == c1 && cc->c2 == c2)
122 return COMPOSE_LO + (cc - v.begin ());
123 }
124
125 // allocate a new combination
126 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
127 {
128 static int seen;
129
130 if (!seen++)
131 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
132
133 return REPLACEMENT_CHAR;
134 }
135
136 v.push_back (compose_char (c1, c2));
137
138 return v.size () - 1 + COMPOSE_LO;
139}
140
141int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
142{
143 compose_char *cc = (*this)[c];
144
145 if (!cc)
146 {
147 if (r) *r = c;
148 return 1;
149 }
150
151 int len = expand (cc->c1, r);
152
153 if (r) r += len;
154
155 if (cc->c2 != NOCHAR)
156 {
157 len++;
158 if (r) *r++ = cc->c2;
159 }
160
67 return p; 161 return len;
68}
69 162
70void
71rxvt_term::operator delete (void *p, size_t s)
72{
73 free (p);
74} 163}
164#endif
75 165
76rxvt_term::rxvt_term () 166rxvt_term::rxvt_term ()
77 : 167 :
168#if TRANSPARENT
78 rootwin_ev (this, &rxvt_term::rootwin_cb), 169 rootwin_ev (this, &rxvt_term::rootwin_cb),
170#endif
171#ifdef HAVE_SCROLLBARS
172 scrollbar_ev (this, &rxvt_term::x_cb),
173#endif
174#ifdef MENUBAR
175 menubar_ev (this, &rxvt_term::x_cb),
176#endif
177#ifdef CURSOR_BLINK
178 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
179#endif
180#ifdef TEXT_BLINK
181 text_blink_ev (this, &rxvt_term::text_blink_cb),
182#endif
183#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
184 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
185#endif
186#ifdef SELECTION_SCROLLING
187 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
188#endif
189#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
190 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
191#endif
192#ifdef POINTER_BLANK
193 pointer_ev (this, &rxvt_term::pointer_cb),
194#endif
195#ifdef USE_XIM
196 im_ev (this, &rxvt_term::im_cb),
197#endif
79 termwin_ev (this, &rxvt_term::x_cb), 198 termwin_ev (this, &rxvt_term::x_cb),
80 vt_ev (this, &rxvt_term::x_cb), 199 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
91 text_blink_ev (this, &rxvt_term::text_blink_cb),
92#endif
93#ifdef POINTER_BLANK
94 pointer_ev (this, &rxvt_term::pointer_cb),
95#endif
96#ifdef USE_XIM
97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb), 200 check_ev (this, &rxvt_term::check_cb),
201 flush_ev (this, &rxvt_term::flush_cb),
100 destroy_ev (this, &rxvt_term::destroy_cb), 202 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb), 203 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb) 204 incr_ev (this, &rxvt_term::incr_cb)
103{ 205{
104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 206 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
105}
106 207
107rxvt_term::~rxvt_term () 208 termlist.push_back (this);
209
210#ifdef KEYSYM_RESOURCE
211 keyboard = new keyboard_manager;
212
213 if (!keyboard)
214 rxvt_fatal ("out of memory, aborting.\n");
215#endif
216}
217
218// clean up the most important stuff, do *not* call x or free mem etc.
219// for use before an emergency exit
220void rxvt_term::emergency_cleanup ()
108{ 221{
109 if (cmd_fd >= 0) 222 if (cmd_pid)
110 close (cmd_fd); 223 kill (-cmd_pid, SIGHUP);
111 224
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT 225#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE); 226 privileged_utmp (RESTORE);
117#endif 227#endif
118 228
229 pty.put ();
230}
231
232rxvt_term::~rxvt_term ()
233{
234 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
235
236 termlist.erase (find (termlist.begin (), termlist.end(), this));
237
238 emergency_cleanup ();
239
240#if ENABLE_STYLES
241 for (int i = RS_styleCount; --i; )
242 if (fontset[i] != fontset[0])
243 delete fontset[i];
244#endif
119 delete TermWin.fontset; 245 delete fontset[0];
120 246
121 if (display) 247 if (display)
122 { 248 {
123 if (TermWin.parent[0]) 249 dDisp;
124 XDestroyWindow (display->display, TermWin.parent[0]); 250
251 selection_clear ();
252
253#ifdef USE_XIM
254 im_destroy ();
255#endif
256#ifdef MENUBAR
257 if (menubarGC) XFreeGC (disp, menubarGC);
258#endif
259#ifdef XTERM_SCROLLBAR
260 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
261 if (ShadowGC) XFreeGC (disp, ShadowGC);
262#endif
263#ifdef PLAIN_SCROLLBAR
264 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
265#endif
266#ifdef NEXT_SCROLLBAR
267 if (blackGC) XFreeGC (disp, blackGC);
268 if (whiteGC) XFreeGC (disp, whiteGC);
269 if (grayGC) XFreeGC (disp, grayGC);
270 if (darkGC) XFreeGC (disp, darkGC);
271 if (stippleGC) XFreeGC (disp, stippleGC);
272 if (dimple) XFreePixmap (disp, dimple);
273 if (upArrow) XFreePixmap (disp, upArrow);
274 if (downArrow) XFreePixmap (disp, downArrow);
275 if (upArrowHi) XFreePixmap (disp, upArrowHi);
276 if (downArrowHi) XFreePixmap (disp, downArrowHi);
277#endif
278#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
279 if (topShadowGC) XFreeGC (disp, topShadowGC);
280 if (botShadowGC) XFreeGC (disp, botShadowGC);
281 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
282#endif
283 if (gc) XFreeGC (disp, gc);
284
125#if defined(MENUBAR) && (MENUBAR_MAX > 1) 285#if defined(MENUBAR) && (MENUBAR_MAX > 1)
126 if (menuBar.win)
127 XDestroyWindow (display->display, menuBar.win);
128 delete menuBar.drawable; 286 delete menuBar.drawable;
287 //if (menuBar.win)
288 // XDestroyWindow (disp, menuBar.win);
129#endif 289#endif
290 delete drawable;
291 // destroy all windows
292 if (parent[0])
293 XDestroyWindow (disp, parent[0]);
130 } 294 }
131 295
132 // TODO: free pixcolours, colours should become part of rxvt_display 296 // TODO: free pixcolours, colours should become part of rxvt_display
133 297 delete pix_colors_focused;
134 delete PixColors; 298#if OFF_FOCUS_FADING
299 delete pix_colors_unfocused;
300#endif
135 301
136 displays.put (display); 302 displays.put (display);
137 303
138 scr_release (); 304 scr_release ();
139 305
306 /* clear all resources */
307 for (int i = 0; i < allocated.size (); i++)
308 free (allocated [i]);
309
310 free (selection.text);
311 // TODO: manage env vars in child only(!)
140 free (env_windowid); 312 free (env_windowid);
141 free (env_display); 313 free (env_display);
142 free (env_term); 314 free (env_term);
143 free (env_colorfgbg); 315 free (env_colorfgbg);
144 free (locale); 316 free (locale);
145 free (codeset); 317 free (v_buffer);
318 free (incr_buf);
146 319
147 delete envv; 320 delete envv;
148 delete argv; 321 delete argv;
322
323#ifdef KEYSYM_RESOURCE
324 delete keyboard;
325#endif
326}
327
328void
329rxvt_term::child_exit ()
330{
331 cmd_pid = 0;
332
333 if (!OPTION (Opt_hold))
334 destroy ();
149} 335}
150 336
151void 337void
152rxvt_term::destroy () 338rxvt_term::destroy ()
153{ 339{
340 if (destroy_ev.active)
341 return;
342
343#if ENABLE_OVERLAY
344 scr_overlay_off ();
345#endif
346
154 if (display) 347 if (display)
155 { 348 {
349#if USE_XIM
350 im_ev.stop (display);
351#endif
352#if HAVE_SCROLLBARS
353 scrollbar_ev.stop (display);
354#endif
355#if MENUBAR
356 menubar_ev.stop (display);
357#endif
358#if TRANSPARENT
156 rootwin_ev.stop (display); 359 rootwin_ev.stop (display);
360#endif
361 incr_ev.stop ();
157 termwin_ev.stop (display); 362 termwin_ev.stop (display);
158 vt_ev.stop (display); 363 vt_ev.stop (display);
159#ifdef USE_XIM
160 im_destroy ();
161 im_ev.stop (display);
162#endif
163#ifdef HAVE_SCROLLBARS
164 scrollbar_ev.stop (display);
165#endif
166#ifdef MENUBAR
167 menubar_ev.stop (display);
168#endif
169 } 364 }
170 365
171 check_ev.stop (); 366 check_ev.stop ();
172 pty_ev.stop (); 367 pty_ev.stop ();
173#ifdef CURSOR_BLINK 368#ifdef CURSOR_BLINK
174 cursor_blink_ev.stop (); 369 cursor_blink_ev.stop ();
175#endif 370#endif
176#ifdef TEXT_BLINK 371#ifdef TEXT_BLINK
177 text_blink_ev.stop (); 372 text_blink_ev.stop ();
178#endif 373#endif
374#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
375 cont_scroll_ev.stop ();
376#endif
377#ifdef SELECTION_SCROLLING
378 sel_scroll_ev.stop ();
379#endif
179#ifdef POINTER_BLANK 380#ifdef POINTER_BLANK
180 pointer_ev.stop (); 381 pointer_ev.stop ();
181#endif 382#endif
182 383
183 destroy_ev.start (0); 384 destroy_ev.start (0);
184} 385}
185 386
186void 387void
187rxvt_term::destroy_cb (time_watcher &w) 388rxvt_term::destroy_cb (time_watcher &w)
188{ 389{
189 SET_R (this); 390 make_current ();
190 391
191 delete this; 392 delete this;
192} 393}
193 394
194/*----------------------------------------------------------------------*/ 395/*----------------------------------------------------------------------*/
195/* rxvt_init () */ 396/*
196/* LIBPROTO */ 397 * Exit gracefully, clearing the utmp entry and restoring tty attributes
197rxvt_t 398 * TODO: if debugging, this should free up any known resources if we can
198rxvt_init (int argc, const char *const *argv) 399 */
199{ 400static XErrorHandler old_xerror_handler;
200 SET_R (new rxvt_term);
201 401
202 if (!GET_R->init_vars () || !GET_R->init (argc, argv)) 402static void
403rxvt_emergency_cleanup ()
404{
405 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
406 (*t)->emergency_cleanup ();
407}
408
409#if ENABLE_FRILLS
410static void
411print_x_error (Display *dpy, XErrorEvent *event)
412{
413 char buffer[BUFSIZ];
414 char mesg[BUFSIZ];
415 char number[32];
416 char *mtype = "XlibMessage";
417 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
418 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
419 rxvt_warn ("An X Error occured, trying to continue after report.\n");
420 rxvt_warn ("%s: %s\n", mesg, buffer);
421 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
423 sprintf(number, "%d", event->request_code);
424 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
425 rxvt_warn ("(which is %s)\n", buffer);
426 if (event->request_code >= 128) {
427 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
428 mesg, BUFSIZ);
429 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
203 { 430 }
204 delete GET_R; 431 if ((event->error_code == BadWindow) ||
205 SET_R (0); 432 (event->error_code == BadPixmap) ||
433 (event->error_code == BadCursor) ||
434 (event->error_code == BadFont) ||
435 (event->error_code == BadDrawable) ||
436 (event->error_code == BadColor) ||
437 (event->error_code == BadGC) ||
438 (event->error_code == BadIDChoice) ||
439 (event->error_code == BadValue) ||
440 (event->error_code == BadAtom)) {
441 if (event->error_code == BadValue)
442 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
443 mesg, BUFSIZ);
444 else if (event->error_code == BadAtom)
445 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
446 mesg, BUFSIZ);
447 else
448 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
449 mesg, BUFSIZ);
450 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
206 } 451 }
207 452 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
208 return GET_R; 453 mesg, BUFSIZ);
454 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
209} 455}
456#endif
210 457
458int
211static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 459rxvt_xerror_handler (Display *display, XErrorEvent *event)
212
213void
214rxvt_init_signals ()
215{ 460{
216 /* install exit handler for cleanup */ 461 if (GET_R->allowedxerror == -1)
217#if 0 462 GET_R->allowedxerror = event->error_code;
218#ifdef HAVE_ATEXIT 463 else
219 atexit (rxvt_clean_exit); 464 {
465 // GET_R is most likely not the terminal which caused the error,
466 // so just output the error and continue
467#if ENABLE_FRILLS
468 print_x_error (display, event);
220#else 469#else
470 old_xerror_handler (display, event);
221#endif 471#endif
222#endif 472 }
223 473
224 struct sigaction sa; 474 return 0;
225
226 sigfillset (&sa.sa_mask);
227 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
228 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
229 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
230 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
231 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
232 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
233 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
234
235 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
236 /* signal (SIGURG, SIG_DFL); */
237
238 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
239 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
240} 475}
241 476
477int
478rxvt_xioerror_handler (Display *display)
479{
480 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
481 DisplayString (display));
482 rxvt_emergency_cleanup ();
483 _exit (EXIT_FAILURE);
484}
485
486/*----------------------------------------------------------------------*/
242bool 487bool
243rxvt_term::init (int argc, const char *const *argv) 488rxvt_term::init (int argc, const char *const *argv)
244{ 489{
490 SET_R (this);
491 set_locale ("");
492 set_environ (envv); // few things in X do not call setlocale :(
493
494 if (!init_vars ())
495 return false;
496
497 init_secondary ();
498
499 const char **cmd_argv = init_resources (argc, argv);
500
501#ifdef KEYSYM_RESOURCE
502 keyboard->register_done ();
503#endif
504
505#if MENUBAR_MAX
506 menubar_read (rs[Rs_menu]);
507#endif
508#ifdef HAVE_SCROLLBARS
509 if (OPTION (Opt_scrollBar))
510 scrollBar.setIdle (); /* set existence for size calculations */
511#endif
512
513#if ENABLE_PERL
514 if (!rs[Rs_perl_ext_1])
515 rs[Rs_perl_ext_1] = "default";
516
517 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
518 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
519 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
520 {
521#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
522 // ignore some perl-related arguments if some bozo installed us set[ug]id
523 if (rxvt_tainted ())
524 {
525 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
526 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
527 {
528 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
529 rs[Rs_perl_lib] = 0;
530 rs[Rs_perl_eval] = 0;
531 }
532 }
533#endif
534 rxvt_perl.init ();
535 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
536 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
537 }
538#endif
539
540 create_windows (argc, argv);
541
542 dDisp;
543
544 init_xlocale ();
545
546 scr_reset (); // initialize screen
547
548#if 0
549 XSynchronize (disp, True);
550#endif
551
552#ifdef HAVE_SCROLLBARS
553 if (OPTION (Opt_scrollBar))
554 resize_scrollbar (); /* create and map scrollbar */
555#endif
556#if (MENUBAR_MAX)
557 if (menubar_visible ())
558 XMapWindow (disp, menuBar.win);
559#endif
560#ifdef TRANSPARENT
561 if (OPTION (Opt_transparent))
562 {
563 XSelectInput (disp, display->root, PropertyChangeMask);
564 check_our_parents ();
565 rootwin_ev.start (display, display->root);
566 }
567#endif
568
569 XMapWindow (disp, vt);
570 XMapWindow (disp, parent[0]);
571
572 set_colorfgbg ();
573
574 init_command (cmd_argv);
575
576 free (cmd_argv);
577
578 if (pty.pty >= 0)
579 pty_ev.start (pty.pty, EVENT_READ);
580
581 check_ev.start ();
582
583 HOOK_INVOKE ((this, HOOK_START, DT_END));
584
585 return true;
586}
587
588static struct sig_handlers
589{
590 sig_watcher sw_chld, sw_term, sw_int;
591
592 void sig_chld (sig_watcher &w)
593 {
594 // we are being called for every SIGCHLD, find the corresponding term
595 int pid;
596
597 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
598 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
599 if (pid == (*t)->cmd_pid)
600 {
601 (*t)->child_exit ();
602 break;
603 }
604 }
605
606 /*
607 * Catch a fatal signal and tidy up before quitting
608 */
609 void
610 sig_term (sig_watcher &w)
611 {
612#ifdef DEBUG_CMD
613 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
614#endif
615 rxvt_emergency_cleanup ();
616 signal (w.signum, SIG_DFL);
617 kill (getpid (), w.signum);
618 }
619
620 sig_handlers ()
621 : sw_chld (this, &sig_handlers::sig_chld),
622 sw_term (this, &sig_handlers::sig_term),
623 sw_int (this, &sig_handlers::sig_term)
624 {
625 }
626} sig_handlers;
627
628char **rxvt_environ; // startup environment
629
630void
631rxvt_init ()
632{
633 rxvt_environ = environ;
634
245 /* 635 /*
246 * Save and then give up any super-user privileges 636 * Save and then give up any super-user privileges
247 * If we need privileges in any area then we must specifically request it. 637 * If we need privileges in any area then we must specifically request it.
248 * We should only need to be root in these cases: 638 * We should only need to be root in these cases:
249 * 1. write utmp entries on some systems 639 * 1. write utmp entries on some systems
250 * 2. chown tty on some systems 640 * 2. chown tty on some systems
251 */ 641 */
252 privileges (SAVE); 642 rxvt_privileges (SAVE);
253 privileges (IGNORE); 643 rxvt_privileges (IGNORE);
254 644
255 init_secondary (); 645 signal (SIGHUP, SIG_IGN);
646 signal (SIGPIPE, SIG_IGN);
256 647
257 const char **cmd_argv = init_resources (argc, argv); 648 sig_handlers.sw_chld.start (SIGCHLD);
649 sig_handlers.sw_term.start (SIGTERM);
650 sig_handlers.sw_int.start (SIGINT);
258 651
259 set_locale (""); 652 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
653 /* signal (SIGURG, SIG_DFL); */
260 654
261#if MENUBAR_MAX 655 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
262 menubar_read (rs[Rs_menu]); 656 // TODO: handle this with exceptions and tolerate the memory loss
263#endif 657 XSetIOErrorHandler (rxvt_xioerror_handler);
264#ifdef HAVE_SCROLLBARS
265 if (Options & Opt_scrollBar)
266 scrollBar.setIdle (); /* set existence for size calculations */
267#endif
268 658
269 create_windows (argc, argv); 659 XrmInitialize ();
270
271 init_xlocale ();
272
273 scr_reset (); /* initialize screen */
274
275#if 0
276 XSynchronize (display->display, True);
277#endif
278
279#ifdef HAVE_SCROLLBARS
280 if (Options & Opt_scrollBar)
281 resize_scrollbar (); /* create and map scrollbar */
282#endif
283#if (MENUBAR_MAX)
284 if (menubar_visible ())
285 XMapWindow (display->display, menuBar.win);
286#endif
287#ifdef TRANSPARENT
288 if (Options & Opt_transparent)
289 {
290 XSelectInput (display->display, display->root, PropertyChangeMask);
291 check_our_parents ();
292 }
293#endif
294
295 rootwin_ev.start (display, display->root);
296
297 XMapWindow (display->display, TermWin.vt);
298 XMapWindow (display->display, TermWin.parent[0]);
299
300 init_command (cmd_argv);
301
302 pty_ev.start (cmd_fd, EVENT_READ);
303
304 check_ev.start ();
305
306 return true;
307}
308
309/* ------------------------------------------------------------------------- *
310 * SIGNAL HANDLING & EXIT HANDLER *
311 * ------------------------------------------------------------------------- */
312/*
313 * Catch a SIGCHLD signal and exit if the direct child has died
314 */
315/* ARGSUSED */
316/* EXTPROTO */
317RETSIGTYPE
318rxvt_Child_signal (int sig __attribute__ ((unused)))
319{
320 int pid, save_errno = errno;
321 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
322 ;
323 errno = save_errno;
324
325#if 0
326 if (pid == cmd_pid)
327 exit (EXIT_SUCCESS);
328#endif
329}
330
331/*
332 * Catch a fatal signal and tidy up before quitting
333 */
334/* EXTPROTO */
335RETSIGTYPE
336rxvt_Exit_signal (int sig)
337{
338 signal (sig, SIG_DFL);
339#ifdef DEBUG_CMD
340 rxvt_print_error ("signal %d", sig);
341#endif
342 rxvt_clean_exit ();
343 kill (getpid (), sig);
344}
345
346/* INTPROTO */
347int
348rxvt_xerror_handler (Display *display, XErrorEvent *event)
349{
350 if (GET_R->allowedxerror == -1)
351 GET_R->allowedxerror = event->error_code;
352 else
353 {
354 old_xerror_handler (display, event);
355 GET_R->destroy ();
356 }
357
358 return 0;
359}
360
361/*----------------------------------------------------------------------*/
362/*
363 * Exit gracefully, clearing the utmp entry and restoring tty attributes
364 * TODO: if debugging, this should free up any known resources if we can
365 */
366/* EXTPROTO */
367void
368rxvt_clean_exit ()
369{
370 // TODO: rxvtd should clean up all ressources
371 if (GET_R)
372 GET_R->destroy ();
373} 660}
374 661
375/* ------------------------------------------------------------------------- * 662/* ------------------------------------------------------------------------- *
376 * MEMORY ALLOCATION WRAPPERS * 663 * MEMORY ALLOCATION WRAPPERS *
377 * ------------------------------------------------------------------------- */ 664 * ------------------------------------------------------------------------- */
378/* EXTPROTO */ 665void *
379void *
380rxvt_malloc (size_t size) 666rxvt_malloc (size_t size)
381{ 667{
382 void *p;
383
384 p = malloc (size); 668 void *p = malloc (size);
669
385 if (p) 670 if (!p)
671 rxvt_fatal ("memory allocation failure. aborting.\n");
672
386 return p; 673 return p;
387
388 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
389 rxvt_clean_exit ();
390 exit (EXIT_FAILURE);
391 /* NOTREACHED */
392} 674}
393 675
394/* EXTPROTO */ 676void *
395void *
396rxvt_calloc (size_t number, size_t size) 677rxvt_calloc (size_t number, size_t size)
397{ 678{
398 void *p;
399
400 p = calloc (number, size); 679 void *p = calloc (number, size);
680
401 if (p) 681 if (!p)
682 rxvt_fatal ("memory allocation failure. aborting.\n");
683
402 return p; 684 return p;
403
404 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
405 rxvt_clean_exit ();
406 exit (EXIT_FAILURE);
407 /* NOTREACHED */
408} 685}
409 686
410/* EXTPROTO */
411void * 687void *
412rxvt_realloc (void *ptr, size_t size) 688rxvt_realloc (void *ptr, size_t size)
413{ 689{
414 void *p;
415
416 if (ptr)
417 p = realloc (ptr, size); 690 void *p = realloc (ptr, size);
418 else 691
419 p = malloc (size);
420 if (p) 692 if (!p)
693 rxvt_fatal ("memory allocation failure. aborting.\n");
694
421 return p; 695 return p;
422
423 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
424 rxvt_clean_exit ();
425 exit (EXIT_FAILURE);
426 /* NOTREACHED */
427} 696}
428 697
429/* ------------------------------------------------------------------------- * 698/* ------------------------------------------------------------------------- *
430 * PRIVILEGED OPERATIONS * 699 * PRIVILEGED OPERATIONS *
431 * ------------------------------------------------------------------------- */ 700 * ------------------------------------------------------------------------- */
432/* take care of suid/sgid super-user (root) privileges */ 701/* take care of suid/sgid super-user (root) privileges */
433void 702void
434rxvt_term::privileges (int mode) 703rxvt_privileges (rxvt_privaction action)
435{ 704{
436#if ! defined(__CYGWIN32__) 705#if ! defined(__CYGWIN32__)
437# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 706# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
438 /* setreuid () is the poor man's setuid (), seteuid () */ 707 /* setreuid () is the poor man's setuid (), seteuid () */
439# define seteuid(a) setreuid(-1, (a)) 708# define seteuid(a) setreuid(-1, (a))
440# define setegid(a) setregid(-1, (a)) 709# define setegid(a) setregid(-1, (a))
441# define HAVE_SETEUID 710# define HAVE_SETEUID
442# endif 711# endif
443# ifdef HAVE_SETEUID 712# ifdef HAVE_SETEUID
444 switch (mode) 713 switch (action)
445 { 714 {
446 case IGNORE: 715 case IGNORE:
447 /* 716 /*
448 * change effective uid/gid - not real uid/gid - so we can switch 717 * change effective uid/gid - not real uid/gid - so we can switch
449 * back to root later, as required 718 * back to root later, as required
450 */ 719 */
720 setegid (getgid ());
451 seteuid (getuid ()); 721 seteuid (getuid ());
452 setegid (getgid ());
453 break; 722 break;
454 case SAVE: 723 case SAVE:
455 euid = geteuid ();
456 egid = getegid (); 724 saved_egid = getegid ();
725 saved_euid = geteuid ();
457 break; 726 break;
458 case RESTORE: 727 case RESTORE:
459 seteuid (euid);
460 setegid (egid); 728 setegid (saved_egid);
729 seteuid (saved_euid);
461 break; 730 break;
462 } 731 }
463# else 732# else
464 switch (mode) 733 switch (action)
465 { 734 {
466 case IGNORE: 735 case IGNORE:
736 setgid (getgid ());
467 setuid (getuid ()); 737 setuid (getuid ());
468 setgid (getgid ());
469 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
470 case SAVE: 739 case SAVE:
471 /* FALLTHROUGH */ 740 /* FALLTHROUGH */
472 case RESTORE: 741 case RESTORE:
473 break; 742 break;
… …
476#endif 745#endif
477} 746}
478 747
479#ifdef UTMP_SUPPORT 748#ifdef UTMP_SUPPORT
480void 749void
481rxvt_term::privileged_utmp (char action) 750rxvt_term::privileged_utmp (rxvt_privaction action)
482{ 751{
483 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)", 752 if (OPTION (Opt_utmpInhibit)
484 action, next_utmp_action, getpid ())); 753 || !pty.name || !*pty.name)
485 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
486 || (Options & Opt_utmpInhibit)
487 || ttydev == NULL || *ttydev == '\0')
488 return; 754 return;
489 755
490 privileges (RESTORE); 756 rxvt_privileges (RESTORE);
757
491 if (action == SAVE) 758 if (action == SAVE)
492 {
493 next_utmp_action = RESTORE;
494 makeutent (ttydev, rs[Rs_display_name]); 759 makeutent (pty.name, rs[Rs_display_name]);
495 }
496 else 760 else
497 { /* action == RESTORE */
498 next_utmp_action = IGNORE;
499 cleanutent (); 761 cleanutent ();
500 } 762
501 privileges (IGNORE); 763 rxvt_privileges (IGNORE);
502}
503#endif
504
505#ifndef NO_SETOWNER_TTYDEV
506void
507rxvt_term::privileged_ttydev (char action)
508{
509 D_MAIN ((stderr,
510 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
511 action, next_tty_action, getpid ()));
512 if (next_tty_action != action || (action != SAVE && action != RESTORE)
513 || ttydev == NULL || *ttydev == '\0')
514 return;
515
516 privileges (RESTORE);
517
518 if (action == SAVE)
519 {
520 next_tty_action = RESTORE;
521# ifndef RESET_TTY_TO_COMMON_DEFAULTS
522 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
523 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
524 next_tty_action = IGNORE;
525 else
526# endif
527
528 {
529 chown (ttydev, getuid (), ttygid); /* fail silently */
530 chmod (ttydev, ttymode);
531# ifdef HAVE_REVOKE
532 revoke (ttydev);
533# endif
534
535 }
536 }
537 else
538 { /* action == RESTORE */
539 next_tty_action = IGNORE;
540# ifndef RESET_TTY_TO_COMMON_DEFAULTS
541 chmod (ttydev, ttyfd_stat.st_mode);
542 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
543# else
544 chmod (ttydev,
545 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
546 chown (ttydev, 0, 0);
547# endif
548
549 }
550
551 privileges (IGNORE);
552
553# ifndef RESET_TTY_TO_COMMON_DEFAULTS
554 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
555 action == RESTORE ? "Restoring" : (action ==
556 SAVE ? "Saving" :
557 "UNKNOWN ERROR for"), ttydev,
558 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
559 ttyfd_stat.st_gid));
560# endif
561} 764}
562#endif 765#endif
563 766
564/*----------------------------------------------------------------------*/ 767/*----------------------------------------------------------------------*/
565/* 768/*
566 * window size/position calculcations for XSizeHint and other storage. 769 * window size/position calculcations for XSizeHint and other storage.
567 * if width/height are non-zero then override calculated width/height 770 * if width/height are non-zero then override calculated width/height
568 */ 771 */
569void 772void
570rxvt_term::window_calc (unsigned int width, unsigned int height) 773rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
571{ 774{
572 short recalc_x, recalc_y; 775 short recalc_x, recalc_y;
573 int x, y, sb_w, mb_h, flags; 776 int x, y, sb_w, mb_h, flags;
574 unsigned int w, h; 777 unsigned int w, h;
575 unsigned int max_width, max_height; 778 unsigned int max_width, max_height;
779 dDisp;
576 780
577 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 781 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
578 TermWin.ncol, TermWin.nrow, szHint.width, 782 ncol, nrow, szHint.width, szHint.height));
579 szHint.height)); 783
580 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 784 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
581 szHint.win_gravity = NorthWestGravity; 785 szHint.win_gravity = NorthWestGravity;
582 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 786 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
583 787
584 recalc_x = recalc_y = 0; 788 recalc_x = recalc_y = 0;
585 flags = 0; 789 flags = 0;
790
586 if (!parsed_geometry) 791 if (!parsed_geometry)
587 { 792 {
588 parsed_geometry = 1; 793 parsed_geometry = 1;
794
589 if (rs[Rs_geometry]) 795 if (rs[Rs_geometry])
590 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 796 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
797
591 if (flags & WidthValue) 798 if (flags & WidthValue)
592 { 799 {
593 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 800 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
594 szHint.flags |= USSize; 801 szHint.flags |= USSize;
595 } 802 }
803
596 if (flags & HeightValue) 804 if (flags & HeightValue)
597 { 805 {
598 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 806 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
599 szHint.flags |= USSize; 807 szHint.flags |= USSize;
600 } 808 }
809
601 if (flags & XValue) 810 if (flags & XValue)
602 { 811 {
603 szHint.x = x; 812 szHint.x = x;
604 szHint.flags |= USPosition; 813 szHint.flags |= USPosition;
814
605 if (flags & XNegative) 815 if (flags & XNegative)
606 { 816 {
607 recalc_x = 1; 817 recalc_x = 1;
608 szHint.win_gravity = NorthEastGravity; 818 szHint.win_gravity = NorthEastGravity;
609 } 819 }
610 } 820 }
821
611 if (flags & YValue) 822 if (flags & YValue)
612 { 823 {
613 szHint.y = y; 824 szHint.y = y;
614 szHint.flags |= USPosition; 825 szHint.flags |= USPosition;
826
615 if (flags & YNegative) 827 if (flags & YNegative)
616 { 828 {
617 recalc_y = 1; 829 recalc_y = 1;
830
618 if (szHint.win_gravity == NorthEastGravity) 831 if (szHint.win_gravity == NorthEastGravity)
619 szHint.win_gravity = SouthEastGravity; 832 szHint.win_gravity = SouthEastGravity;
620 else 833 else
621 szHint.win_gravity = SouthWestGravity; 834 szHint.win_gravity = SouthWestGravity;
622 } 835 }
623 } 836 }
624 } 837 }
838
625 /* TODO: BOUNDS */ 839 /* TODO: BOUNDS */
626 TermWin.width = TermWin.ncol * TermWin.fwidth; 840 width = ncol * fwidth;
627 TermWin.height = TermWin.nrow * TermWin.fheight; 841 height = nrow * fheight;
628 max_width = MAX_COLS * TermWin.fwidth; 842 max_width = MAX_COLS * fwidth;
629 max_height = MAX_ROWS * TermWin.fheight; 843 max_height = MAX_ROWS * fheight;
630 844
631 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 845 szHint.base_width = szHint.base_height = 2 * int_bwidth;
632 846
633 sb_w = mb_h = 0; 847 sb_w = mb_h = 0;
634 window_vt_x = window_vt_y = 0; 848 window_vt_x = window_vt_y = int_bwidth;
849
635 if (scrollbar_visible ()) 850 if (scrollbar_visible ())
636 { 851 {
637 sb_w = scrollbar_TotalWidth (); 852 sb_w = scrollbar_TotalWidth ();
638 szHint.base_width += sb_w; 853 szHint.base_width += sb_w;
639 if (! (Options & Opt_scrollBar_right)) 854 if (!OPTION (Opt_scrollBar_right))
640 window_vt_x = sb_w; 855 window_vt_x += sb_w;
641 } 856 }
857
642 if (menubar_visible ()) 858 if (menubar_visible ())
643 { 859 {
644 mb_h = menuBar_TotalHeight (); 860 mb_h = menuBar_TotalHeight ();
645 szHint.base_height += mb_h; 861 szHint.base_height += mb_h;
646 window_vt_y = mb_h; 862 window_vt_y += mb_h;
647 } 863 }
864
648 szHint.width_inc = TermWin.fwidth; 865 szHint.width_inc = fwidth;
649 szHint.height_inc = TermWin.fheight; 866 szHint.height_inc = fheight;
650 szHint.min_width = szHint.base_width + szHint.width_inc; 867 szHint.min_width = szHint.base_width + szHint.width_inc;
651 szHint.min_height = szHint.base_height + szHint.height_inc; 868 szHint.min_height = szHint.base_height + szHint.height_inc;
652 869
653 if (width && width - szHint.base_width < max_width) 870 if (newwidth && newwidth - szHint.base_width < max_width)
654 { 871 {
655 szHint.width = width; 872 szHint.width = newwidth;
656 TermWin.width = width - szHint.base_width; 873 width = newwidth - szHint.base_width;
657 } 874 }
658 else 875 else
659 { 876 {
660 MIN_IT (TermWin.width, max_width); 877 min_it (width, max_width);
661 szHint.width = szHint.base_width + TermWin.width; 878 szHint.width = szHint.base_width + width;
662 } 879 }
880
663 if (height && height - szHint.base_height < max_height) 881 if (newheight && newheight - szHint.base_height < max_height)
664 { 882 {
665 szHint.height = height; 883 szHint.height = newheight;
666 TermWin.height = height - szHint.base_height; 884 height = newheight - szHint.base_height;
667 } 885 }
668 else 886 else
669 { 887 {
670 MIN_IT (TermWin.height, max_height); 888 min_it (height, max_height);
671 szHint.height = szHint.base_height + TermWin.height; 889 szHint.height = szHint.base_height + height;
672 } 890 }
891
673 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 892 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
674 window_sb_x = szHint.width - sb_w; 893 window_sb_x = szHint.width - sb_w;
675 894
676 if (recalc_x) 895 if (recalc_x)
677 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 896 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
678 - szHint.width - 2 * TermWin.ext_bwidth);
679 if (recalc_y) 897 if (recalc_y)
680 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 898 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
681 - szHint.height - 2 * TermWin.ext_bwidth);
682 899
683 TermWin.ncol = TermWin.width / TermWin.fwidth; 900 ncol = width / fwidth;
684 TermWin.nrow = TermWin.height / TermWin.fheight; 901 nrow = height / fheight;
685 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 902 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
686 TermWin.ncol, TermWin.nrow, szHint.width, 903 ncol, nrow, szHint.width,
687 szHint.height)); 904 szHint.height));
688 return; 905 return;
689} 906}
690 907
691/*----------------------------------------------------------------------*/ 908/*----------------------------------------------------------------------*/
… …
694 * Called after a window size change. 911 * Called after a window size change.
695 */ 912 */
696void 913void
697rxvt_term::tt_winch () 914rxvt_term::tt_winch ()
698{ 915{
916 if (pty.pty < 0)
917 return;
918
699 struct winsize ws; 919 struct winsize ws;
700 920
701 if (cmd_fd < 0)
702 return;
703
704 ws.ws_col = TermWin.ncol; 921 ws.ws_col = ncol;
705 ws.ws_row = TermWin.nrow; 922 ws.ws_row = nrow;
706 ws.ws_xpixel = ws.ws_ypixel = 0; 923 ws.ws_xpixel = width;
707#ifndef DEBUG_SIZE 924 ws.ws_ypixel = height;
708 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 925 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
709#else 926
710 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 927#if 0
711 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 928 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
712# ifdef SIGWINCH
713 else if (cmd_pid) /* force through to the command */ 929 if (cmd_pid) /* force through to the command */
714 kill (cmd_pid, SIGWINCH); 930 kill (-cmd_pid, SIGWINCH);
715# endif
716#endif 931#endif
717} 932}
718 933
719/*----------------------------------------------------------------------*/ 934/*----------------------------------------------------------------------*/
720/* rxvt_change_font () - Switch to a new font */ 935/* set_fonts () - load and set the various fonts
721/* 936 *
722 * init = 1 - initialize 937 * init = 1 - initialize
723 * 938 *
724 * fontname == FONT_UP - switch to bigger font 939 * fontname == FONT_UP - switch to bigger font
725 * fontname == FONT_DN - switch to smaller font 940 * fontname == FONT_DN - switch to smaller font
726 */ 941 */
727bool 942bool
728rxvt_term::change_font (const char *fontname) 943rxvt_term::set_fonts ()
729{ 944{
730 if (fontname == FONT_UP)
731 {
732 // TODO
733 }
734 else if (fontname == FONT_DN)
735 {
736 // TODO
737 }
738 else
739 {
740 rxvt_fontset *fs = new rxvt_fontset (this); 945 rxvt_fontset *fs = new rxvt_fontset (this);
946 rxvt_fontprop prop;
741 947
742 if (fs && fs->populate (fontname)) 948 if (!fs
949 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
950 || !fs->realize_font (1))
951 {
952 delete fs;
953 return false;
954 }
955
956#if ENABLE_STYLES
957 for (int i = RS_styleCount; --i; )
958 if (fontset[i] != fontset[0])
959 delete fontset[i];
960#endif
961
962 delete fontset[0];
963 fontset[0] = fs;
964
965 prop = (*fs)[1]->properties ();
966 prop.height += lineSpace;
967 fs->set_prop (prop);
968
969 fwidth = prop.width;
970 fheight = prop.height;
971 fbase = prop.ascent;
972
973 for (int style = 1; style < 4; style++)
974 {
975#if ENABLE_STYLES
976 const char *res = rs[Rs_font + style];
977
978 if (res && !*res)
979 fontset[style] = fontset[0];
980 else
743 { 981 {
744 delete TermWin.fontset; 982 fontset[style] = fs = new rxvt_fontset (this);
745 TermWin.fontset = fs; 983 rxvt_fontprop prop2 = prop;
746 TermWin.fwidth = fs->base_font ()->width;
747 TermWin.fheight = fs->base_font ()->height;
748 TermWin.fbase = fs->base_font ()->ascent;
749 984
750 // TODO: screen needs to be told about new fonts 985 if (res)
986 prop2.weight = prop2.slant = rxvt_fontprop::unset;
751 987 else
752 if (TermWin.parent[0])
753 { 988 {
754 resize_all_windows (0, 0, 0); 989 res = fontset[0]->fontdesc;
755 scr_remap_chars (); 990
756 scr_touch (true); 991 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
992 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
757 } 993 }
758 994
759 return true; 995 fs->populate (res);
996 fs->set_prop (prop2);
760 } 997 }
998#else
999 fontset[style] = fontset[0];
1000#endif
1001 }
1002
1003 if (parent[0])
761 } 1004 {
1005 resize_all_windows (0, 0, 0);
1006 scr_remap_chars ();
1007 scr_touch (true);
1008 }
762 1009
763 return false; 1010 return true;
764} 1011}
765 1012
766bool 1013void rxvt_term::set_string_property (Atom prop, const char *str, int len)
767rxvt_term::font_up_down (int n, int direction)
768{ 1014{
769 return false; 1015 XChangeProperty (display->display, parent[0],
1016 prop, XA_STRING, 8, PropModeReplace,
1017 (const unsigned char *)str, len >= 0 ? len : strlen (str));
1018}
1019
1020void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
1021{
1022 wchar_t *ws = rxvt_mbstowcs (str, len);
1023 char *s = rxvt_wcstoutf8 (ws);
1024
1025 XChangeProperty (display->display, parent[0],
1026 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1027 (const unsigned char *)s, strlen (s));
1028
1029 free (s);
1030 free (ws);
770} 1031}
771 1032
772/*----------------------------------------------------------------------*/ 1033/*----------------------------------------------------------------------*/
773/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
774/* xterm sequences - title, iconName, color (exptl) */ 1035/* xterm sequences - title, iconName, color (exptl) */
775void 1036void
776rxvt_term::set_title (const char *str) 1037rxvt_term::set_title (const char *str)
777{ 1038{
778#ifndef SMART_WINDOW_TITLE 1039 set_string_property (XA_WM_NAME, str);
779 XStoreName (display->display, TermWin.parent[0], str); 1040#if ENABLE_EWMH
780#else 1041 set_utf8_property (xa[XA_NET_WM_NAME], str);
781 char *name;
782
783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
784 name = NULL;
785 if (name == NULL || STRCMP (name, str))
786 XStoreName (display->display, TermWin.parent[0], str);
787 if (name)
788 XFree (name);
789#endif 1042#endif
790} 1043}
791 1044
792void 1045void
793rxvt_term::set_iconName (const char *str) 1046rxvt_term::set_icon_name (const char *str)
794{ 1047{
795#ifndef SMART_WINDOW_TITLE 1048 set_string_property (XA_WM_ICON_NAME, str);
796 XSetIconName (display->display, TermWin.parent[0], str); 1049#if ENABLE_EWMH
797#else 1050 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
798 char *name;
799
800 if (XGetIconName (display->display, TermWin.parent[0], &name))
801 name = NULL;
802 if (name == NULL || STRCMP (name, str))
803 XSetIconName (display->display, TermWin.parent[0], str);
804 if (name)
805 XFree (name);
806#endif 1051#endif
807} 1052}
808 1053
809#ifdef XTERM_COLOR_CHANGE 1054#ifdef XTERM_COLOR_CHANGE
810void 1055void
811rxvt_term::set_window_color (int idx, const char *color) 1056rxvt_term::set_window_color (int idx, const char *color)
812{ 1057{
813 rxvt_color xcol; 1058 rxvt_color xcol;
814 int i; 1059 int i;
815 1060
816 if (color == NULL || *color == '\0') 1061 if (color == NULL || *color == '\0')
817 return; 1062 return;
818 1063
819 /* handle color aliases */ 1064 /* handle color aliases */
820 if (isdigit (*color)) 1065 if (isdigit (*color))
821 { 1066 {
822 i = atoi (color); 1067 i = atoi (color);
1068
823 if (i >= 8 && i <= 15) 1069 if (i >= 8 && i <= 15)
824 { /* bright colors */ 1070 { /* bright colors */
825 i -= 8; 1071 i -= 8;
826# ifndef NO_BRIGHTCOLOR
827 PixColors[idx] = PixColors[minBrightCOLOR + i]; 1072 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
828 SET_PIXCOLOR (idx); 1073 SET_PIXCOLOR (idx);
829 goto Done; 1074 goto done;
830# endif
831
832 } 1075 }
1076
833 if (i >= 0 && i <= 7) 1077 if (i >= 0 && i <= 7)
834 { /* normal colors */ 1078 { /* normal colors */
835 PixColors[idx] = PixColors[minCOLOR + i]; 1079 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
836 SET_PIXCOLOR (idx); 1080 SET_PIXCOLOR (idx);
837 goto Done; 1081 goto done;
838 } 1082 }
839 } 1083 }
1084
840 if (!rXParseAllocColor (& xcol, color)) 1085 if (!rXParseAllocColor (&xcol, color))
841 return; 1086 return;
1087
842 /* XStoreColor (display->display, XCMAP, XColor*); */ 1088 /* XStoreColor (display->display, display->cmap, XColor*); */
843 1089
844 /* 1090 /*
845 * FIXME: should free colors here, but no idea how to do it so instead, 1091 * FIXME: should free colors here, but no idea how to do it so instead,
846 * so just keep gobbling up the colormap 1092 * so just keep gobbling up the colormap
847 */ 1093 */
848# if 0 1094# if 0
849 for (i = Color_Black; i <= Color_White; i++) 1095 for (i = Color_Black; i <= Color_White; i++)
850 if (PixColors[idx] == PixColors[i]) 1096 if (pix_colors[idx] == pix_colors[i])
851 break; 1097 break;
852 if (i > Color_White) 1098 if (i > Color_White)
853 { 1099 {
854 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 1100 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
855 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 1101 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
856 DisplayPlanes (display->display, display->screen)); 1102 DisplayPlanes (display->display, display->screen));
857 } 1103 }
858# endif 1104# endif
859 1105
860 PixColors[idx] = xcol; 1106 pix_colors_focused[idx] = xcol;
861 SET_PIXCOLOR (idx); 1107 SET_PIXCOLOR (idx);
862 1108
863 /* XSetWindowAttributes attr; */ 1109 /* XSetWindowAttributes attr; */
864 /* Cursor cursor; */ 1110 /* Cursor cursor; */
865Done: 1111done:
866 if (idx == Color_bg && ! (Options & Opt_transparent))
867 XSetWindowBackground (display->display, TermWin.vt,
868 PixColors[Color_bg]);
869 1112
1113#if OFF_FOCUS_FADING
1114 if (rs[Rs_fade])
1115 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1116#endif
1117
870 /* handle Color_BD, scrollbar background, etc. */ 1118 /*TODO: handle Color_BD, scrollbar background, etc. */
871 1119
872 set_colorfgbg ();
873 recolour_cursor (); 1120 recolour_cursor ();
874 /* the only reasonable way to enforce a clean update */ 1121 scr_recolour ();
875 scr_poweron ();
876} 1122}
877 1123
878#else 1124#else
879# define set_window_color (idx,color) ((void)0) 1125# define set_window_color (idx,color) ((void)0)
880#endif /* XTERM_COLOR_CHANGE */ 1126#endif /* XTERM_COLOR_CHANGE */
881 1127
882void 1128void
883rxvt_term::recolour_cursor () 1129rxvt_term::recolour_cursor ()
884{ 1130{
885#if TODO
886 rxvt_color xcol[2]; 1131 XColor xcol[2];
887 1132
888 xcol[0] = PixColors[Color_pointer]; 1133 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
889 xcol[1] = PixColors[Color_bg]; 1134 ? pix_colors_focused[Color_pointer_fg]
1135 : pix_colors_focused[Color_fg];
1136 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1137 ? pix_colors_focused[Color_pointer_bg]
1138 : pix_colors_focused[Color_bg];
1139
890 XQueryColors (display->display, XCMAP, xcol, 2); 1140 XQueryColors (display->display, display->cmap, xcol, 2);
891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1141 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
892#endif
893} 1142}
894 1143
895/*----------------------------------------------------------------------*/ 1144/*----------------------------------------------------------------------*/
896/* 1145/*
897 * find if fg/bg matches any of the normal (low-intensity) colors 1146 * find if fg/bg matches any of the normal (low-intensity) colors
898 */ 1147 */
899void 1148void
900rxvt_term::set_colorfgbg () 1149rxvt_term::set_colorfgbg ()
901{ 1150{
902 unsigned int i; 1151 unsigned int i;
903 const char *xpmb = "\0"; 1152 const char *xpmb = "\0";
904 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1153 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
905 1154
906 env_colorfgbg =
907 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1155 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
908 STRCPY (fstr, "default"); 1156 strcpy (fstr, "default");
909 STRCPY (bstr, "default"); 1157 strcpy (bstr, "default");
910 for (i = Color_Black; i <= Color_White; i++) 1158 for (i = Color_Black; i <= Color_White; i++)
911 if (PixColors[Color_fg] == PixColors[i]) 1159 if (pix_colors[Color_fg] == pix_colors[i])
912 { 1160 {
913 sprintf (fstr, "%d", (i - Color_Black)); 1161 sprintf (fstr, "%d", (i - Color_Black));
914 break; 1162 break;
915 } 1163 }
1164
916 for (i = Color_Black; i <= Color_White; i++) 1165 for (i = Color_Black; i <= Color_White; i++)
917 if (PixColors[Color_bg] == PixColors[i]) 1166 if (pix_colors[Color_bg] == pix_colors[i])
918 { 1167 {
919 sprintf (bstr, "%d", (i - Color_Black)); 1168 sprintf (bstr, "%d", (i - Color_Black));
920#ifdef XPM_BACKGROUND 1169#ifdef XPM_BACKGROUND
921 xpmb = "default;"; 1170 xpmb = "default;";
922#endif 1171#endif
923 break; 1172 break;
924 } 1173 }
925 1174
926 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1175 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
927
928#ifndef NO_BRIGHTCOLOR
929 colorfgbg = DEFAULT_RSTYLE;
930 for (i = minCOLOR; i <= maxCOLOR; i++)
931 {
932 if (PixColors[Color_fg] == PixColors[i])
933 colorfgbg = SET_FGCOLOR (colorfgbg, i);
934 if (PixColors[Color_bg] == PixColors[i])
935 colorfgbg = SET_BGCOLOR (colorfgbg, i);
936 }
937#endif
938} 1176}
939 1177
940/*----------------------------------------------------------------------*/ 1178/*----------------------------------------------------------------------*/
941/*
942 * Colour determination for low colour displays, routine from
943 * Hans de Goede <hans@highrise.nl>
944 */
945 1179
946int 1180int
947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1181rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
948{ 1182{
949 if (!screen_in_out->set (display, colour)) 1183 if (!screen_in_out->set (display, colour))
950 { 1184 {
951 rxvt_print_error ("can't allocate colour: %s", colour); 1185 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
952 return false; 1186 return false;
953 } 1187 }
954 1188
955 return true; 1189 return true;
956} 1190}
957 1191
958/* -------------------------------------------------------------------- * 1192/* -------------------------------------------------------------------- *
959 * - WINDOW RESIZING - * 1193 * - WINDOW RESIZING - *
960 * -------------------------------------------------------------------- */ 1194 * -------------------------------------------------------------------- */
961void 1195void
962rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1196rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
963{ 1197{
964 int fix_screen; 1198 int fix_screen;
965
966#ifdef SMART_RESIZE
967 int old_width = szHint.width, old_height = szHint.height; 1199 int old_width = szHint.width, old_height = szHint.height;
968#endif 1200 dDisp;
969 1201
970 window_calc (width, height); 1202 window_calc (newwidth, newheight);
971 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1203 XSetWMNormalHints (disp, parent[0], &szHint);
1204
972 if (!ignoreparent) 1205 if (!ignoreparent)
973 { 1206 {
974#ifdef SMART_RESIZE 1207#ifdef SMART_RESIZE
975 /* 1208 /*
976 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1209 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
979 int x, y, x1, y1; 1212 int x, y, x1, y1;
980 int dx, dy; 1213 int dx, dy;
981 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1214 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
982 Window unused_cr; 1215 Window unused_cr;
983 1216
984 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1217 XTranslateCoordinates (disp, parent[0], display->root,
985 0, 0, &x, &y, &unused_cr); 1218 0, 0, &x, &y, &unused_cr);
986 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1219 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
987 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1220 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
988 /* 1221 /*
989 * if display->root isn't the parent window, a WM will probably have offset 1222 * if display->root isn't the parent window, a WM will probably have offset
990 * our position for handles and decorations. Counter it 1223 * our position for handles and decorations. Counter it
991 */ 1224 */
… …
993 { 1226 {
994 x -= x1; 1227 x -= x1;
995 y -= y1; 1228 y -= y1;
996 } 1229 }
997 1230
998 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1231 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
999 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1232 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1000 dx = old_width - szHint.width; 1233 dx = old_width - szHint.width;
1001 dy = old_height - szHint.height; 1234 dy = old_height - szHint.height;
1002 1235
1003 /* Check position of the center of the window */ 1236 /* Check position of the center of the window */
1004 if (x < x1) /* left half */ 1237 if (x < x1) /* left half */
… …
1008 if (y < y1) /* top half */ 1241 if (y < y1) /* top half */
1009 dy = 0; 1242 dy = 0;
1010 else if (y == y1) /* exact center */ 1243 else if (y == y1) /* exact center */
1011 dy /= 2; 1244 dy /= 2;
1012 1245
1013 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1246 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1014 szHint.width, szHint.height); 1247 szHint.width, szHint.height);
1015#else 1248#else
1016 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1249 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1017 szHint.height);
1018#endif 1250#endif
1019
1020 } 1251 }
1021 1252
1022 fix_screen = (TermWin.ncol != prev_ncol 1253 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1023 || TermWin.nrow != prev_nrow);
1024 1254
1025 if (fix_screen || width != old_width || height != old_height) 1255 if (fix_screen || newwidth != old_width || newheight != old_height)
1026 { 1256 {
1027 if (scrollbar_visible ()) 1257 if (scrollbar_visible ())
1028 { 1258 {
1029 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1259 XMoveResizeWindow (disp, scrollBar.win,
1260 window_sb_x, 0,
1030 0, scrollbar_TotalWidth (), szHint.height); 1261 scrollbar_TotalWidth (), szHint.height);
1031 resize_scrollbar (); 1262 resize_scrollbar ();
1032 } 1263 }
1033 1264
1034 if (menubar_visible ()) 1265 if (menubar_visible ())
1035 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1266 XMoveResizeWindow (disp, menuBar.win,
1267 window_vt_x, 0,
1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1268 width, menuBar_TotalHeight ());
1037 1269
1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1270 XMoveResizeWindow (disp, vt,
1039 window_vt_y, TermWin_TotalWidth (), 1271 window_vt_x, window_vt_y,
1040 TermWin_TotalHeight ()); 1272 width, height);
1273
1041 scr_clear (); 1274 scr_clear ();
1042#ifdef XPM_BACKGROUND 1275#ifdef XPM_BACKGROUND
1043 resize_pixmap (); 1276 resize_pixmap ();
1044#endif 1277#endif
1045
1046 } 1278 }
1047 1279
1048 if (fix_screen || old_height == 0) 1280 if (fix_screen || old_height == 0)
1049 { 1281 {
1050 int curr_screen = -1; 1282 int curr_screen = -1;
1051 int old_ncol = prev_ncol; 1283 int old_ncol = prev_ncol;
1052 1284
1053 /* scr_reset only works on the primary screen */ 1285 /* scr_reset only works on the primary screen */
1054 if (old_height) /* this is not the first time through */ 1286 if (old_height) /* this is not the first time through */
1055 { 1287 {
1056 unsigned int ncol = TermWin.ncol; 1288 unsigned int ocol = ncol;
1057 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1289 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1058 curr_screen = scr_change_screen (PRIMARY); 1290 curr_screen = scr_change_screen (PRIMARY);
1059 TermWin.ncol = ncol; 1291 ncol = ocol;
1060 } 1292 }
1061 1293
1062 scr_reset (); 1294 scr_reset ();
1063 1295
1064 if (curr_screen >= 0) /* this is not the first time through */ 1296 if (curr_screen >= 0) /* this is not the first time through */
1065 { 1297 {
1066 scr_change_screen (curr_screen); 1298 scr_change_screen (curr_screen);
1067 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1299 selection_check (old_ncol != ncol ? 4 : 0);
1068 } 1300 }
1069 } 1301 }
1070 1302
1071 old_width = szHint.width; 1303 old_width = szHint.width;
1072 old_height = szHint.height; 1304 old_height = szHint.height;
1305
1306#ifdef XPM_BACKGROUND
1307 if (pixmap)
1308 scr_touch (false);
1309#endif
1073 1310
1074#ifdef USE_XIM 1311#ifdef USE_XIM
1075 IMSetStatusPosition (); 1312 IMSetStatusPosition ();
1076#endif 1313#endif
1077} 1314}
… …
1079/* 1316/*
1080 * Set the width/height of the vt window in characters. Units are pixels. 1317 * Set the width/height of the vt window in characters. Units are pixels.
1081 * good for toggling 80/132 columns 1318 * good for toggling 80/132 columns
1082 */ 1319 */
1083void 1320void
1084rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1321rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1085{ 1322{
1086 XWindowAttributes wattr; 1323 XWindowAttributes wattr;
1087 1324
1088 if (width == 0 || height == 0) 1325 if (newwidth == 0 || newheight == 0)
1089 { 1326 {
1090 XGetWindowAttributes (display->display, display->root, &wattr); 1327 XGetWindowAttributes (display->display, display->root, &wattr);
1328
1091 if (width == 0) 1329 if (newwidth == 0)
1092 width = wattr.width - szHint.base_width; 1330 newwidth = wattr.width - szHint.base_width;
1093 if (height == 0) 1331 if (newheight == 0)
1094 height = wattr.height - szHint.base_height; 1332 newheight = wattr.height - szHint.base_height;
1095 }
1096 if (width != TermWin.width || height != TermWin.height)
1097 { 1333 }
1334
1335 if (newwidth != width || newheight != height)
1336 {
1098 width += szHint.base_width; 1337 newwidth += szHint.base_width;
1099 height += szHint.base_height; 1338 newheight += szHint.base_height;
1100 resize_all_windows (width, height, 0); 1339 resize_all_windows (newwidth, newheight, 0);
1101 } 1340 }
1102} 1341}
1103 1342
1104/* -------------------------------------------------------------------- * 1343/* -------------------------------------------------------------------- *
1105 * - X INPUT METHOD ROUTINES - * 1344 * - X INPUT METHOD ROUTINES - *
1106 * -------------------------------------------------------------------- */ 1345 * -------------------------------------------------------------------- */
1107#ifdef USE_XIM 1346#ifdef USE_XIM
1108 1347
1109void 1348void
1349rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1350{
1351 fg = pix_colors[Color_fg];
1352 bg = pix_colors[Color_bg];
1353}
1354
1355void
1110rxvt_term::im_set_size (XRectangle *size) 1356rxvt_term::im_set_size (XRectangle &size)
1111{ 1357{
1112 size->x = TermWin.int_bwidth; 1358 // the int_bwidth terms make no sense to me
1113 size->y = TermWin.int_bwidth; 1359 size.x = int_bwidth;
1114 size->width = Width2Pixel (TermWin.ncol); 1360 size.y = int_bwidth;
1115 size->height = Height2Pixel (TermWin.nrow); 1361 size.width = Width2Pixel (ncol) + int_bwidth;
1362 size.height = Height2Pixel (nrow) + int_bwidth;
1116} 1363}
1117 1364
1118void 1365void
1119rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1366rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1367 XRectangle &status_rect,
1368 const XRectangle &needed_rect)
1120{ 1369{
1121 *fg = PixColors[Color_fg]; 1370 preedit_rect.x = needed_rect.width;
1122 *bg = PixColors[Color_bg]; 1371 preedit_rect.y = 0;
1372 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1373 preedit_rect.height = fheight;
1374
1375 status_rect.x = 0;
1376 status_rect.y = 0;
1377 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1378 status_rect.height = fheight;
1123} 1379}
1124 1380
1125/* Checking whether input method is running. */ 1381/* Checking whether input method is running. */
1126bool 1382bool
1127rxvt_term::IMisRunning () 1383rxvt_term::IMisRunning ()
1128{ 1384{
1129 char *p; 1385 char *p;
1130 Atom atom; 1386 Atom atom;
1131 Window win; 1387 Window win;
1132 char server[IMBUFSIZ]; 1388 char server[IMBUFSIZ];
1133 1389
1134 /* get current locale modifier */ 1390 /* get current locale modifier */
1135 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1391 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1136 { 1392 {
1137 STRCPY (server, "@server="); 1393 strcpy (server, "@server=");
1138 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1394 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1395
1139 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1396 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1140 *p = '\0'; 1397 *p = '\0';
1141 1398
1142 atom = XInternAtom (display->display, server, False); 1399 atom = XInternAtom (display->display, server, False);
1143 win = XGetSelectionOwner (display->display, atom); 1400 win = XGetSelectionOwner (display->display, atom);
1401
1144 if (win != None) 1402 if (win != None)
1145 return True; 1403 return True;
1146 } 1404 }
1405
1147 return False; 1406 return False;
1148} 1407}
1149 1408
1150void 1409void
1151rxvt_term::IMSendSpot () 1410rxvt_term::IMSendSpot ()
1152{ 1411{
1153 XPoint spot; 1412 XPoint nspot;
1154 XVaNestedList preedit_attr; 1413 XVaNestedList preedit_attr;
1155 1414
1156 if (Input_Context == NULL 1415 if (!Input_Context
1416 || !focus
1157 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1417 || !(input_style & XIMPreeditPosition))
1158 || ! (event_type == KeyPress
1159 || event_type == Expose
1160 || event_type == NoExpose
1161 || event_type == SelectionNotify
1162 || event_type == ButtonRelease || event_type == FocusIn)
1163 || !IMisRunning ())
1164 return; 1418 return;
1165 1419
1166 im_set_position (&spot); 1420 im_set_position (nspot);
1421
1422 if (nspot.x == spot.x && nspot.y == spot.y)
1423 return;
1424
1425 spot = nspot;
1167 1426
1168 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1427 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1169 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1428 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1170 XFree (preedit_attr); 1429 XFree (preedit_attr);
1171} 1430}
1172 1431
1173void 1432void
1174rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1175 XRectangle * needed_rect)
1176{
1177 int mbh, vtx = 0;
1178
1179 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1180 vtx = scrollbar_TotalWidth ();
1181
1182 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1183 mbh -= TermWin.lineSpace;
1184
1185 preedit_rect->x = needed_rect->width + vtx;
1186 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1187
1188 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1189 preedit_rect->height = Height2Pixel (1);
1190
1191 status_rect->x = vtx;
1192 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1193
1194 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1195 status_rect->height = Height2Pixel (1);
1196}
1197
1198void
1199rxvt_term::im_destroy () 1433rxvt_term::im_destroy ()
1200{ 1434{
1201 if (Input_Context)
1202 {
1203 XDestroyIC (Input_Context);
1204 Input_Context = NULL;
1205 }
1206
1207 if (input_method) 1435 if (input_method)
1208 { 1436 {
1437 if (Input_Context && input_method->xim)
1438 XDestroyIC (Input_Context);
1439
1209 display->put_xim (input_method); 1440 display->put_xim (input_method);
1210 input_method = 0; 1441 input_method = 0;
1211 } 1442 }
1443
1444 Input_Context = 0;
1212} 1445}
1213 1446
1214/* 1447/*
1215 * Try to open a XIM with the current modifiers, then see if we can 1448 * Try to open a XIM with the current modifiers, then see if we can
1216 * open a suitable preedit type 1449 * open a suitable preedit type
1217 */ 1450 */
1218bool 1451bool
1219rxvt_term::IM_get_IC (const char *modifiers) 1452rxvt_term::IM_get_IC (const char *modifiers)
1220{ 1453{
1221 int i, j, found; 1454 int i, j, found;
1222 XIM xim; 1455 XIM xim;
1223 XPoint spot; 1456 XPoint spot;
1224 XRectangle rect, status_rect, needed_rect; 1457 XRectangle rect, status_rect, needed_rect;
1225 unsigned long fg, bg; 1458 unsigned long fg, bg;
1226 const char *p; 1459 const char *p;
1227 char **s; 1460 char **s;
1228 XIMStyles *xim_styles; 1461 XIMStyles *xim_styles;
1229 XVaNestedList preedit_attr, status_attr; 1462
1463 set_environ (envv);
1230 1464
1231 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1465 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1232 return false; 1466 return false;
1233 1467
1234 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1468 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1235 input_method = display->get_xim (locale, modifiers); 1469 input_method = display->get_xim (locale, modifiers);
1236 if (input_method == NULL) 1470 if (input_method == NULL)
1237 return false; 1471 return false;
1238 1472
1239 xim = input_method->xim; 1473 xim = input_method->xim;
1474 spot.x = spot.y = -1;
1240 1475
1241 xim_styles = NULL; 1476 xim_styles = NULL;
1242 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1477 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1243 || !xim_styles || !xim_styles->count_styles) 1478 || !xim_styles || !xim_styles->count_styles)
1244 { 1479 {
1245 display->put_xim (input_method); 1480 im_destroy ();
1246 return false; 1481 return false;
1247 } 1482 }
1248 1483
1249 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1484 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1485
1486 for (int pi = 0; pi < 2; pi++)
1487 {
1488 p = pet[pi];
1489
1490 if (!p)
1491 continue;
1492
1250 s = rxvt_splitcommastring (p); 1493 s = rxvt_splitcommastring (p);
1494
1251 for (i = found = 0; !found && s[i]; i++) 1495 for (i = found = 0; !found && s[i]; i++)
1252 { 1496 {
1253 if (!STRCMP (s[i], "OverTheSpot")) 1497 if (!strcmp (s[i], "OverTheSpot"))
1254 input_style = (XIMPreeditPosition | XIMStatusNothing); 1498 input_style = (XIMPreeditPosition | XIMStatusNothing);
1255 else if (!STRCMP (s[i], "OffTheSpot")) 1499 else if (!strcmp (s[i], "OffTheSpot"))
1256 input_style = (XIMPreeditArea | XIMStatusArea); 1500 input_style = (XIMPreeditArea | XIMStatusArea);
1257 else if (!STRCMP (s[i], "Root")) 1501 else if (!strcmp (s[i], "Root"))
1258 input_style = (XIMPreeditNothing | XIMStatusNothing); 1502 input_style = (XIMPreeditNothing | XIMStatusNothing);
1503 else if (!strcmp (s[i], "None"))
1504 input_style = (XIMPreeditNone | XIMStatusNone);
1259 1505
1260 for (j = 0; j < xim_styles->count_styles; j++) 1506 for (j = 0; j < xim_styles->count_styles; j++)
1261 if (input_style == xim_styles->supported_styles[j]) 1507 if (input_style == xim_styles->supported_styles[j])
1262 { 1508 {
1509 rxvt_freecommastring (s);
1510
1263 found = 1; 1511 found = 1;
1264 break; 1512 goto foundpet;
1513 }
1514
1265 } 1515 }
1266 }
1267 1516
1268 for (i = 0; s[i]; i++) 1517 rxvt_freecommastring (s);
1269 free (s[i]); 1518 }
1270 1519
1271 free (s); 1520foundpet:
1521
1272 XFree (xim_styles); 1522 XFree (xim_styles);
1273 1523
1274 if (!found) 1524 if (!found)
1275 { 1525 {
1276 display->put_xim (input_method); 1526 im_destroy ();
1277 return false; 1527 return false;
1278 } 1528 }
1279 1529
1280 preedit_attr = status_attr = NULL; 1530 XFontSet fs = 0;
1531 XVaNestedList preedit_attr = 0, status_attr = 0;
1532
1533 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1534 {
1535 // fake us a font-set, please
1536 char **missing_charset_list;
1537 int missing_charset_count;
1538 char *def_string;
1539 char pat[512];
1540
1541 sprintf (pat,
1542 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1543 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1544 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1545 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1546 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1547 "*",
1548 fheight,
1549 fheight + 1, fheight - 1,
1550 fheight - 2, fheight + 2);
1551
1552 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1553 &missing_charset_list, &missing_charset_count, &def_string);
1554
1555 if (missing_charset_list)
1556 XFreeStringList (missing_charset_list);
1557
1558 if (!fs)
1559 {
1560 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1561 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1562 }
1563 }
1281 1564
1282 if (input_style & XIMPreeditPosition) 1565 if (input_style & XIMPreeditPosition)
1283 { 1566 {
1284 im_set_size (&rect); 1567 im_set_size (rect);
1285 im_set_position (&spot); 1568 im_set_position (spot);
1286 im_set_color (&fg, &bg); 1569 im_set_color (fg, bg);
1287 1570
1288 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1571 preedit_attr = XVaCreateNestedList (0,
1572 XNForeground, fg,
1573 XNBackground, bg,
1574 XNArea, &rect,
1289 XNSpotLocation, &spot, 1575 XNSpotLocation, &spot,
1290 XNForeground, fg, XNBackground, bg,
1291 //XNFontSet, TermWin.fontset, 1576 XNFontSet, fs,
1292 NULL); 1577 NULL);
1293 } 1578 }
1294 else if (input_style & XIMPreeditArea) 1579 else if (input_style & XIMPreeditArea)
1295 { 1580 {
1296 im_set_color (&fg, &bg); 1581 im_set_color (fg, bg);
1297 1582
1298 /* 1583 /*
1299 * The necessary width of preedit area is unknown 1584 * The necessary width of preedit area is unknown
1300 * until create input context. 1585 * until create input context.
1301 */ 1586 */
1302 needed_rect.width = 0; 1587 needed_rect.width = 0;
1303
1304 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1588 im_set_preedit_area (rect, status_rect, needed_rect);
1305 1589
1306 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1590 preedit_attr = XVaCreateNestedList (0,
1591 XNForeground, fg,
1307 XNForeground, fg, XNBackground, bg, 1592 XNBackground, bg,
1593 XNArea, &rect,
1594 XNFontSet, fs,
1595 NULL);
1596 status_attr = XVaCreateNestedList (0,
1597 XNForeground, fg,
1598 XNBackground, bg,
1599 XNArea, &status_rect,
1308 //XNFontSet, TermWin.fontset, 1600 XNFontSet, fs,
1309 NULL); 1601 NULL);
1310 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1311 XNForeground, fg, XNBackground, bg,
1312 //XNFontSet, TermWin.fontset,
1313 NULL);
1314 } 1602 }
1315 1603
1316 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1604 Input_Context = XCreateIC (xim,
1605 XNInputStyle, input_style,
1317 XNClientWindow, TermWin.parent[0], 1606 XNClientWindow, vt,
1318 XNFocusWindow, TermWin.parent[0], 1607 XNFocusWindow, parent[0],
1319 preedit_attr ? XNPreeditAttributes : NULL, 1608 preedit_attr ? XNPreeditAttributes : NULL,
1320 preedit_attr, 1609 preedit_attr,
1321 status_attr ? XNStatusAttributes : NULL, 1610 status_attr ? XNStatusAttributes : NULL,
1322 status_attr, NULL); 1611 status_attr, NULL);
1612
1323 if (preedit_attr) XFree (preedit_attr); 1613 if (preedit_attr) XFree (preedit_attr);
1324 if (status_attr) XFree (status_attr); 1614 if (status_attr) XFree (status_attr);
1615 if (fs) XFreeFontSet (display->display, fs);
1325 1616
1326 if (Input_Context == NULL) 1617 if (Input_Context == NULL)
1327 { 1618 {
1328 rxvt_print_error ("failed to create input context"); 1619 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1329 display->put_xim (input_method); 1620 im_destroy ();
1330 return false; 1621 return false;
1331 } 1622 }
1332 1623
1333 if (input_style & XIMPreeditArea) 1624 if (input_style & XIMPreeditArea)
1334 IMSetStatusPosition (); 1625 IMSetStatusPosition ();
… …
1338} 1629}
1339 1630
1340void 1631void
1341rxvt_term::im_cb () 1632rxvt_term::im_cb ()
1342{ 1633{
1343 int i, found, had_im; 1634 int i;
1344 const char *p; 1635 const char *p;
1345 char **s; 1636 char **s;
1346 char buf[IMBUFSIZ]; 1637 char buf[IMBUFSIZ];
1347 1638
1639 make_current ();
1640
1348 im_destroy (); 1641 im_destroy ();
1349 1642
1350 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1643 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1351 if (Input_Context) 1644 if (Input_Context)
1352 return; 1645 return;
… …
1360 if (p && *p) 1653 if (p && *p)
1361 { 1654 {
1362 bool found = false; 1655 bool found = false;
1363 1656
1364 s = rxvt_splitcommastring (p); 1657 s = rxvt_splitcommastring (p);
1658
1365 for (i = 0; s[i]; i++) 1659 for (i = 0; s[i]; i++)
1366 { 1660 {
1367 if (*s[i]) 1661 if (*s[i])
1368 { 1662 {
1369 STRCPY (buf, "@im="); 1663 strcpy (buf, "@im=");
1370 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1664 strncat (buf, s[i], IMBUFSIZ - 5);
1371 if (IM_get_IC (buf)) 1665 if (IM_get_IC (buf))
1372 { 1666 {
1373 found = true; 1667 found = true;
1374 break; 1668 break;
1375 } 1669 }
1376 } 1670 }
1377 } 1671 }
1378 for (i = 0; s[i]; i++) 1672
1379 free (s[i]); 1673 rxvt_freecommastring (s);
1380 free (s);
1381 1674
1382 if (found) 1675 if (found)
1383 goto done; 1676 goto done;
1384 } 1677 }
1385 1678
… …
1399} 1692}
1400 1693
1401void 1694void
1402rxvt_term::IMSetStatusPosition () 1695rxvt_term::IMSetStatusPosition ()
1403{ 1696{
1404 XRectangle preedit_rect, status_rect, *needed_rect; 1697 XRectangle preedit_rect, status_rect, *needed_rect;
1405 XVaNestedList preedit_attr, status_attr; 1698 XVaNestedList preedit_attr, status_attr;
1406 1699
1407 if (Input_Context == NULL 1700 if (!Input_Context
1701 || !focus
1408 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1702 || !(input_style & XIMPreeditArea)
1409 || !IMisRunning ()) 1703 || !IMisRunning ())
1410 return; 1704 return;
1411 1705
1412 /* Getting the necessary width of preedit area */ 1706 /* Getting the necessary width of preedit area */
1413 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1707 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1414 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1708 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1415 XFree (status_attr); 1709 XFree (status_attr);
1416 1710
1417 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1711 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1712 XFree (needed_rect);
1418 1713
1419 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1714 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1420 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1715 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1421 1716
1422 XSetICValues (Input_Context, 1717 XSetICValues (Input_Context,
1423 XNPreeditAttributes, preedit_attr, 1718 XNPreeditAttributes, preedit_attr,
1424 XNStatusAttributes, status_attr, NULL); 1719 XNStatusAttributes, status_attr, NULL);
1425 1720
1426 XFree (preedit_attr); 1721 XFree (preedit_attr);
1427 XFree (status_attr); 1722 XFree (status_attr);
1428} 1723}
1429#endif /* USE_XIM */ 1724#endif /* USE_XIM */

Diff Legend

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