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.12 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.182 by root, Tue Jan 17 10:14:26 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines