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

Diff Legend

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