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

Diff Legend

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