ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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