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

Diff Legend

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