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.16 by pcg, Thu Dec 18 07:31:19 2003 UTC vs.
Revision 1.135 by root, Sun Feb 13 11:07:57 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines