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

Diff Legend

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