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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines