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.177 by root, Mon Jan 16 06:37:52 2006 UTC

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

Diff Legend

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