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.45 by pcg, Tue Feb 24 21:46:15 2004 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC

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

Diff Legend

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