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.51 by pcg, Sat Mar 6 00:05:01 2004 UTC vs.
Revision 1.174 by root, Thu Jan 12 00:11:13 2006 UTC

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

Diff Legend

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