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.19 by pcg, Wed Dec 24 09:22:29 2003 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC

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

Diff Legend

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