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.9 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.148 by root, Wed Nov 30 21:05:39 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines