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.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.181 by root, Tue Jan 17 06:06:42 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines