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.139 by root, Wed Feb 16 21:37:10 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 sw_term (this, &rxvt_term::sig_term),
163 sw_int (this, &rxvt_term::sig_term),
164 sw_chld (this, &rxvt_term::sig_chld),
165 termwin_ev (this, &rxvt_term::x_cb),
70 x_ev (this, &rxvt_term::x_cb), 166 vt_ev (this, &rxvt_term::x_cb),
167 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb), 169 destroy_ev (this, &rxvt_term::destroy_cb),
72 check_ev (this, &rxvt_term::check_cb), 170 pty_ev (this, &rxvt_term::pty_cb),
73 incr_ev (this, &rxvt_term::incr_cb) 171 incr_ev (this, &rxvt_term::incr_cb)
74{ 172{
75 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 173 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
174
175 termlist.push_back (this);
176
177#ifdef KEYSYM_RESOURCE
178 keyboard = new keyboard_manager;
179
180 if (!keyboard)
181 rxvt_fatal ("out of memory, aborting.\n");
182#endif
183}
184
185// clean up the most important stuff, do *not* call x or free mem etc.
186// for use before an emergency exit
187void rxvt_term::emergency_cleanup ()
188{
189 if (cmd_pid)
190 kill (-cmd_pid, SIGHUP);
191
192#ifdef UTMP_SUPPORT
193 privileged_utmp (RESTORE);
194#endif
195
196 pty.put ();
76} 197}
77 198
78rxvt_term::~rxvt_term () 199rxvt_term::~rxvt_term ()
79{ 200{
201 termlist.erase (find (termlist.begin (), termlist.end(), this));
202
203 emergency_cleanup ();
204
205#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0])
208 delete TermWin.fontset[i];
209#endif
210 delete TermWin.fontset[0];
211
212 if (display)
213 {
214 dDisp;
215
216 selection_clear ();
217
218#ifdef USE_XIM
219 im_destroy ();
220#endif
221#ifdef MENUBAR
222 if (menubarGC) XFreeGC (disp, menubarGC);
223#endif
224#ifdef XTERM_SCROLLBAR
225 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
226 if (ShadowGC) XFreeGC (disp, ShadowGC);
227#endif
228#ifdef PLAIN_SCROLLBAR
229 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
230#endif
231#ifdef NEXT_SCROLLBAR
232 if (blackGC) XFreeGC (disp, blackGC);
233 if (whiteGC) XFreeGC (disp, whiteGC);
234 if (grayGC) XFreeGC (disp, grayGC);
235 if (darkGC) XFreeGC (disp, darkGC);
236 if (stippleGC) XFreeGC (disp, stippleGC);
237 if (dimple) XFreePixmap (disp, dimple);
238 if (upArrow) XFreePixmap (disp, upArrow);
239 if (downArrow) XFreePixmap (disp, downArrow);
240 if (upArrowHi) XFreePixmap (disp, upArrowHi);
241 if (downArrowHi) XFreePixmap (disp, downArrowHi);
242#endif
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
244 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc);
249
250#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable;
252 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win);
254#endif
255 delete TermWin.drawable;
256 // destroy all windows
257 if (TermWin.parent[0]
258#if ENABLE_FRILLS
259 && !rs[Rs_embed]
260#endif
261 )
262 XDestroyWindow (disp, TermWin.parent[0]);
263 }
264
265 // TODO: free pixcolours, colours should become part of rxvt_display
266
267 delete pix_colors_focused;
268#ifdef OFF_FOCUS_FADING
269 delete pix_colors_unfocused;
270#endif
271
272 displays.put (display);
273
80 scr_release (); 274 scr_release ();
81 275
82#ifndef NO_SETOWNER_TTYDEV 276 /* clear all resources */
83 rxvt_privileged_ttydev (this, RESTORE); 277 for (int i = 0; i < allocated.size (); i++)
84#endif 278 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 279
96 if (cmd_fd >= 0) 280 free (selection.text);
97 close (cmd_fd); 281 // TODO: manage env vars in child only(!)
282 free (env_windowid);
283 free (env_display);
284 free (env_term);
285 free (env_colorfgbg);
286 free (locale);
287 free (v_buffer);
288 free (incr_buf);
98 289
99 if (Xfd >= 0) 290 delete envv;
100 XCloseDisplay (Xdisplay); 291 delete argv;
101 292
102 delete PixColors; 293#ifdef KEYSYM_RESOURCE
294 delete keyboard;
295#endif
103} 296}
104 297
105void 298void
106rxvt_term::destroy () 299rxvt_term::destroy ()
107{ 300{
301 if (destroy_ev.active)
302 return;
303
304#if ENABLE_OVERLAY
305 scr_overlay_off ();
306#endif
307
308 if (display)
309 {
310#if USE_XIM
311 im_ev.stop (display);
312#endif
313#if HAVE_SCROLLBARS
314 scrollbar_ev.stop (display);
315#endif
316#if MENUBAR
317 menubar_ev.stop (display);
318#endif
319#if TRANSPARENT
320 rootwin_ev.stop (display);
321#endif
322 incr_ev.stop ();
323 termwin_ev.stop (display);
324 vt_ev.stop (display);
325 }
326
108 check_ev.stop (); 327 check_ev.stop ();
109 pty_ev.stop (); 328 pty_ev.stop ();
110 x_ev.stop ();
111#ifdef CURSOR_BLINK 329#ifdef CURSOR_BLINK
330 cursor_blink_ev.stop ();
331#endif
332#ifdef TEXT_BLINK
112 blink_ev.stop (); 333 text_blink_ev.stop ();
334#endif
335#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
336 cont_scroll_ev.stop ();
337#endif
338#ifdef SELECTION_SCROLLING
339 sel_scroll_ev.stop ();
113#endif 340#endif
114#ifdef POINTER_BLANK 341#ifdef POINTER_BLANK
115 pointer_ev.stop (); 342 pointer_ev.stop ();
116#endif 343#endif
117 344
125 352
126 delete this; 353 delete this;
127} 354}
128 355
129/*----------------------------------------------------------------------*/ 356/*----------------------------------------------------------------------*/
130/* rxvt_init() */ 357/*
131/* LIBPROTO */ 358 * Exit gracefully, clearing the utmp entry and restoring tty attributes
132rxvt_t 359 * TODO: if debugging, this should free up any known resources if we can
133rxvt_init (int argc, const char *const *argv) 360 */
134{ 361static XErrorHandler old_xerror_handler;
135 SET_R (new rxvt_term);
136 dR;
137 362
138 if (!R->init_vars () || !R->init (argc, argv)) 363static void
364rxvt_emergency_cleanup ()
365{
366 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
367 (*t)->emergency_cleanup ();
368}
369
370#if ENABLE_FRILLS
371static void
372print_x_error (Display *dpy, XErrorEvent *event)
373{
374 char buffer[BUFSIZ];
375 char mesg[BUFSIZ];
376 char number[32];
377 char *mtype = "XlibMessage";
378 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
379 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
380 rxvt_warn ("An X Error occured, trying to continue after report.\n");
381 rxvt_warn ("%s: %s\n", mesg, buffer);
382 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
383 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
384 sprintf(number, "%d", event->request_code);
385 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
386 rxvt_warn ("(which is %s)\n", buffer);
387 if (event->request_code >= 128) {
388 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
389 mesg, BUFSIZ);
390 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
139 { 391 }
140 delete R; 392 if ((event->error_code == BadWindow) ||
141 return NULL; 393 (event->error_code == BadPixmap) ||
394 (event->error_code == BadCursor) ||
395 (event->error_code == BadFont) ||
396 (event->error_code == BadDrawable) ||
397 (event->error_code == BadColor) ||
398 (event->error_code == BadGC) ||
399 (event->error_code == BadIDChoice) ||
400 (event->error_code == BadValue) ||
401 (event->error_code == BadAtom)) {
402 if (event->error_code == BadValue)
403 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
404 mesg, BUFSIZ);
405 else if (event->error_code == BadAtom)
406 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
407 mesg, BUFSIZ);
408 else
409 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
410 mesg, BUFSIZ);
411 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
412 }
413 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
414 mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
416}
417#endif
418
419int
420rxvt_xerror_handler (Display *display, XErrorEvent *event)
421{
422 if (GET_R->allowedxerror == -1)
423 GET_R->allowedxerror = event->error_code;
424 else
142 } 425 {
143 426 //TODO: GET_R is most likely not the terminal which caused the error
144 return R; 427 //TODO: maybe just output the error and continue?
145} 428#if ENABLE_FRILLS
146 429 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 430#else
431 old_xerror_handler (display, event);
156#endif 432#endif
157#endif 433 }
158 434
159 struct sigaction sa; 435 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} 436}
176 437
438int
439rxvt_xioerror_handler (Display *display)
440{
441 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
442 DisplayString (display));
443 rxvt_emergency_cleanup ();
444 _exit (EXIT_FAILURE);
445}
446
447/*
448 * Catch a fatal signal and tidy up before quitting
449 */
450void
451rxvt_term::sig_term (sig_watcher &w)
452{
453#ifdef DEBUG_CMD
454 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
455#endif
456 rxvt_emergency_cleanup ();
457 signal (w.signum, SIG_DFL);
458 kill (getpid (), w.signum);
459}
460
461/*----------------------------------------------------------------------*/
462/* rxvt_init () */
177bool 463bool
178rxvt_term::init (int argc, const char *const *argv) 464rxvt_term::init (int argc, const char *const *argv)
179{ 465{
180 dR;//TODO (scrollbar, setidle) 466 SET_R (this);
181 467
468 set_locale ("");
469
470 if (!init_vars ())
471 return false;
472
473 init_secondary ();
474
475 const char **cmd_argv = init_resources (argc, argv);
476
477#ifdef KEYSYM_RESOURCE
478 keyboard->register_done ();
479#endif
480
481#if MENUBAR_MAX
482 menubar_read (rs[Rs_menu]);
483#endif
484#ifdef HAVE_SCROLLBARS
485 if (options & Opt_scrollBar)
486 scrollBar.setIdle (); /* set existence for size calculations */
487#endif
488
489 create_windows (argc, argv);
490
491 dDisp;
492
493 init_xlocale ();
494
495 scr_reset (); /* initialize screen */
496
497#if 0
498 XSynchronize (disp, True);
499#endif
500
501#ifdef HAVE_SCROLLBARS
502 if (options & Opt_scrollBar)
503 resize_scrollbar (); /* create and map scrollbar */
504#endif
505#if (MENUBAR_MAX)
506 if (menubar_visible ())
507 XMapWindow (disp, menuBar.win);
508#endif
509#ifdef TRANSPARENT
510 if (options & Opt_transparent)
511 {
512 XSelectInput (disp, display->root, PropertyChangeMask);
513 check_our_parents ();
514 rootwin_ev.start (display, display->root);
515 }
516#endif
517
518 XMapWindow (disp, TermWin.vt);
519 XMapWindow (disp, TermWin.parent[0]);
520
521 set_colorfgbg ();
522
523 init_command (cmd_argv);
524
525 free (cmd_argv);
526
527 pty_ev.start (pty.pty, EVENT_READ);
528
529 check_ev.start ();
530
531 return true;
532}
533
534void
535rxvt_init ()
536{
182 /* 537 /*
183 * Save and then give up any super-user privileges 538 * Save and then give up any super-user privileges
184 * If we need privileges in any area then we must specifically request it. 539 * If we need privileges in any area then we must specifically request it.
185 * We should only need to be root in these cases: 540 * We should only need to be root in these cases:
186 * 1. write utmp entries on some systems 541 * 1. write utmp entries on some systems
187 * 2. chown tty on some systems 542 * 2. chown tty on some systems
188 */ 543 */
189 rxvt_privileges (this, SAVE); 544 rxvt_privileges (SAVE);
190 rxvt_privileges (this, IGNORE); 545 rxvt_privileges (IGNORE);
191 546
192 rxvt_init_secondary (this); 547 signal (SIGHUP, SIG_IGN);
548 signal (SIGPIPE, SIG_IGN);
193 549
194 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 550 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
551 /* signal (SIGURG, SIG_DFL); */
195 552
196#if (MENUBAR_MAX) 553 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
197 rxvt_menubar_read (this, rs[Rs_menu]); 554 // TODO: handle this with exceptions and tolerate the memory loss
198#endif 555 XSetIOErrorHandler (rxvt_xioerror_handler);
199#ifdef HAVE_SCROLLBARS
200 if (Options & Opt_scrollBar)
201 scrollbar_setIdle (); /* set existence for size calculations */
202#endif
203
204 rxvt_Create_Windows (this, argc, argv);
205
206 rxvt_init_xlocale (this);
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} 556}
249 557
250/* ------------------------------------------------------------------------- * 558/* ------------------------------------------------------------------------- *
251 * SIGNAL HANDLING & EXIT HANDLER * 559 * SIGNAL HANDLING & EXIT HANDLER *
252 * ------------------------------------------------------------------------- */ 560 * ------------------------------------------------------------------------- */
253/* 561/*
254 * Catch a SIGCHLD signal and exit if the direct child has died 562 * Catch a SIGCHLD signal and exit if the direct child has died
255 */ 563 */
256/* ARGSUSED */ 564
257/* EXTPROTO */ 565void
258RETSIGTYPE 566rxvt_term::sig_chld (sig_watcher &w)
259rxvt_Child_signal(int sig __attribute__ ((unused)))
260{ 567{
261 int pid, save_errno = errno; 568 // we are being called for every SIGCHLD, not just ours
569 int pid;
570
262 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 571 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
263 ; 572 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
264 errno = save_errno;
265
266#if 0
267 if (pid == R->cmd_pid) 573 if (pid == (*t)->cmd_pid)
268 exit (EXIT_SUCCESS); 574 {
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 (); 575 (*t)->destroy ();
304 } 576 break;
305 577 }
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
327void * 594void *
328rxvt_malloc(size_t size) 595rxvt_calloc (size_t number, size_t size)
329{ 596{
330 void *p; 597 void *p = calloc (number, size);
331 598
332 p = malloc(size);
333 if (p) 599 if (!p)
600 rxvt_fatal ("memory allocation failure. aborting.\n");
601
334 return p; 602 return p;
335
336 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
337 rxvt_clean_exit();
338 exit(EXIT_FAILURE);
339/* NOTREACHED */
340} 603}
341 604
342/* EXTPROTO */
343void * 605void *
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_FRILLS
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_FRILLS
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)) 1038#ifdef OFF_FOCUS_FADING
758 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1039 if (rs[Rs_fade])
759 R->PixColors[Color_bg]); 1040 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
1041#endif
760 1042
761/* handle Color_BD, scrollbar background, etc. */ 1043 /*TODO: handle Color_BD, scrollbar background, etc. */
762 1044
763 rxvt_set_colorfgbg(aR);
764 rxvt_recolour_cursor(aR); 1045 recolour_cursor ();
765/* the only reasonable way to enforce a clean update */ 1046 scr_recolour ();
766 rxvt_scr_poweron(aR);
767} 1047}
768 1048
769#else 1049#else
770# define rxvt_set_window_color(aR_ idx,color) ((void)0) 1050# define set_window_color (idx,color) ((void)0)
771#endif /* XTERM_COLOR_CHANGE */ 1051#endif /* XTERM_COLOR_CHANGE */
772 1052
773/* EXTPROTO */
774void 1053void
775rxvt_recolour_cursor(pR) 1054rxvt_term::recolour_cursor ()
776{ 1055{
777 rxvt_color xcol[2]; 1056 XColor xcol[2];
778 1057
779#if TODO 1058 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
780 xcol[0] = R->PixColors[Color_pointer]; 1059 ? pix_colors_focused[Color_pointer_fg]
781 xcol[1] = R->PixColors[Color_bg]; 1060 : pix_colors_focused[Color_fg];
782 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 1061 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1062 ? pix_colors_focused[Color_pointer_bg]
1063 : pix_colors_focused[Color_bg];
1064
1065 XQueryColors (display->display, display->cmap, xcol, 2);
783 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 1066 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
784#endif
785} 1067}
786 1068
787/*----------------------------------------------------------------------*/ 1069/*----------------------------------------------------------------------*/
788/* 1070/*
789 * find if fg/bg matches any of the normal (low-intensity) colors 1071 * find if fg/bg matches any of the normal (low-intensity) colors
790 */ 1072 */
791/* INTPROTO */
792void 1073void
793rxvt_set_colorfgbg(pR) 1074rxvt_term::set_colorfgbg ()
794{ 1075{
795 unsigned int i; 1076 unsigned int i;
796 const char *xpmb = "\0"; 1077 const char *xpmb = "\0";
797 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 1078 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
798 1079
799 R->env_colorfgbg =
800 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 1080 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
801 STRCPY(fstr, "default"); 1081 strcpy (fstr, "default");
802 STRCPY(bstr, "default"); 1082 strcpy (bstr, "default");
803 for (i = Color_Black; i <= Color_White; i++) 1083 for (i = Color_Black; i <= Color_White; i++)
804 if (R->PixColors[Color_fg] == R->PixColors[i]) { 1084 if (pix_colors[Color_fg] == pix_colors[i])
1085 {
805 sprintf(fstr, "%d", (i - Color_Black)); 1086 sprintf (fstr, "%d", (i - Color_Black));
806 break; 1087 break;
807 } 1088 }
1089
808 for (i = Color_Black; i <= Color_White; i++) 1090 for (i = Color_Black; i <= Color_White; i++)
809 if (R->PixColors[Color_bg] == R->PixColors[i]) { 1091 if (pix_colors[Color_bg] == pix_colors[i])
1092 {
810 sprintf(bstr, "%d", (i - Color_Black)); 1093 sprintf (bstr, "%d", (i - Color_Black));
811#ifdef XPM_BACKGROUND 1094#ifdef XPM_BACKGROUND
812 xpmb = "default;"; 1095 xpmb = "default;";
813#endif 1096#endif
814 break; 1097 break;
815 } 1098 }
1099
816 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1100 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} 1101}
829 1102
830/*----------------------------------------------------------------------*/ 1103/*----------------------------------------------------------------------*/
831/*
832 * Colour determination for low colour displays, routine from
833 * Hans de Goede <hans@highrise.nl>
834 */
835 1104
836/* EXTPROTO */
837int 1105int
838rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 1106rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
839{ 1107{
840 screen_in_out->set(aR_ colour);
841
842 if (!screen_in_out->set(aR_ colour)) { 1108 if (!screen_in_out->set (display, colour))
843 rxvt_print_error("can't allocate colour: %s", colour); 1109 {
1110 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
844 return false; 1111 return false;
845 } 1112 }
846 1113
847 return true; 1114 return true;
848} 1115}
849 1116
850/* -------------------------------------------------------------------- * 1117/* -------------------------------------------------------------------- *
851 * - WINDOW RESIZING - * 1118 * - WINDOW RESIZING - *
852 * -------------------------------------------------------------------- */ 1119 * -------------------------------------------------------------------- */
853/* EXTPROTO */
854void 1120void
855rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 1121rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
856 int ignoreparent)
857{ 1122{
858 int fix_screen; 1123 int fix_screen;
859
860#ifdef SMART_RESIZE 1124#ifdef SMART_RESIZE
861 int old_width = R->szHint.width, old_height = R->szHint.height; 1125 int old_width = szHint.width, old_height = szHint.height;
862#endif 1126#endif
1127 dDisp;
863 1128
864 rxvt_window_calc(aR_ width, height); 1129 window_calc (width, height);
865 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 1130 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1131
866 if (!ignoreparent) { 1132 if (!ignoreparent)
1133 {
867#ifdef SMART_RESIZE 1134#ifdef SMART_RESIZE
868/* 1135 /*
869 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1136 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
870 * reposition window on resize depending on placement on screen 1137 * reposition window on resize depending on placement on screen
871 */ 1138 */
872 int x, y, x1, y1; 1139 int x, y, x1, y1;
873 int dx, dy; 1140 int dx, dy;
874 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1141 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
875 Window unused_cr; 1142 Window unused_cr;
876 1143
877 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1144 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
878 0, 0, &x, &y, &unused_cr); 1145 0, 0, &x, &y, &unused_cr);
879 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 1146 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
880 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1147 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
881 /* 1148 /*
882 * if Xroot isn't the parent window, a WM will probably have offset 1149 * if display->root isn't the parent window, a WM will probably have offset
883 * our position for handles and decorations. Counter it 1150 * our position for handles and decorations. Counter it
884 */ 1151 */
885 if (x1 != x || y1 != y) { 1152 if (x1 != x || y1 != y)
1153 {
886 x -= x1; 1154 x -= x1;
887 y -= y1; 1155 y -= y1;
888 } 1156 }
889 1157
890 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 1158 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
891 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 1159 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
892 dx = old_width - R->szHint.width; 1160 dx = old_width - szHint.width;
893 dy = old_height - R->szHint.height; 1161 dy = old_height - szHint.height;
894 1162
895 /* Check position of the center of the window */ 1163 /* Check position of the center of the window */
896 if (x < x1) /* left half */ 1164 if (x < x1) /* left half */
897 dx = 0; 1165 dx = 0;
898 else if (x == x1) /* exact center */ 1166 else if (x == x1) /* exact center */
899 dx /= 2; 1167 dx /= 2;
900 if (y < y1) /* top half */ 1168 if (y < y1) /* top half */
901 dy = 0; 1169 dy = 0;
902 else if (y == y1) /* exact center */ 1170 else if (y == y1) /* exact center */
903 dy /= 2; 1171 dy /= 2;
904 1172
905 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1173 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
906 R->szHint.width, R->szHint.height); 1174 szHint.width, szHint.height);
907#else 1175#else
908 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1176 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
909 R->szHint.height);
910#endif 1177#endif
911 } 1178 }
912 1179
913 fix_screen = (R->TermWin.ncol != R->prev_ncol 1180 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
914 || R->TermWin.nrow != R->prev_nrow); 1181
915 if (fix_screen || width != R->old_width || height != R->old_height) { 1182 if (fix_screen || width != old_width || height != old_height)
1183 {
916 if (scrollbar_visible(R)) { 1184 if (scrollbar_visible ())
1185 {
917 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1186 XMoveResizeWindow (disp, scrollBar.win,
1187 window_sb_x, 0,
918 0, scrollbar_TotalWidth(), R->szHint.height); 1188 scrollbar_TotalWidth (), szHint.height);
919 rxvt_Resize_scrollBar(aR); 1189 resize_scrollbar ();
920 } 1190 }
1191
921 if (menubar_visible(R)) 1192 if (menubar_visible ())
922 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1193 XMoveResizeWindow (disp, menuBar.win,
1194 window_vt_x, 0,
923 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1195 TermWin_TotalWidth (), menuBar_TotalHeight ());
924 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1196
925 R->window_vt_y, TermWin_TotalWidth(), 1197 XMoveResizeWindow (disp, TermWin.vt,
1198 window_vt_x, window_vt_y,
926 TermWin_TotalHeight()); 1199 TermWin_TotalWidth (), TermWin_TotalHeight ());
927#ifdef RXVT_GRAPHICS 1200
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); 1201 scr_clear ();
933#ifdef XPM_BACKGROUND 1202#ifdef XPM_BACKGROUND
934 rxvt_resize_pixmap(aR); 1203 resize_pixmap ();
935#endif 1204#endif
936 } 1205 }
937 1206
938 if (fix_screen || R->old_height == 0) { 1207 if (fix_screen || old_height == 0)
1208 {
939 int curr_screen = -1; 1209 int curr_screen = -1;
940 uint16_t old_ncol = R->prev_ncol; 1210 int old_ncol = prev_ncol;
941 1211
942 /* scr_reset only works on the primary screen */ 1212 /* scr_reset only works on the primary screen */
943 if (R->old_height) /* this is not the first time through */ 1213 if (old_height) /* this is not the first time through */
1214 {
1215 unsigned int ncol = TermWin.ncol;
1216 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
944 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1217 curr_screen = scr_change_screen (PRIMARY);
945 1218 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 } 1219 }
952 }
953 1220
1221 scr_reset ();
1222
1223 if (curr_screen >= 0) /* this is not the first time through */
1224 {
1225 scr_change_screen (curr_screen);
1226 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1227 }
1228 }
1229
954 R->old_width = R->szHint.width; 1230 old_width = szHint.width;
955 R->old_height = R->szHint.height; 1231 old_height = szHint.height;
1232
1233#ifdef XPM_BACKGROUND
1234 if (TermWin.pixmap)
1235 scr_touch (false);
1236#endif
956 1237
957#ifdef USE_XIM 1238#ifdef USE_XIM
958 rxvt_IMSetStatusPosition(aR); 1239 IMSetStatusPosition ();
959#endif 1240#endif
960} 1241}
961 1242
962/* 1243/*
963 * Set the width/height of the vt window in characters. Units are pixels. 1244 * Set the width/height of the vt window in characters. Units are pixels.
964 * good for toggling 80/132 columns 1245 * good for toggling 80/132 columns
965 */ 1246 */
966/* EXTPROTO */
967void 1247void
968rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1248rxvt_term::set_widthheight (unsigned int width, unsigned int height)
969{ 1249{
970 XWindowAttributes wattr; 1250 XWindowAttributes wattr;
971 1251
972 if (width == 0 || height == 0) { 1252 if (width == 0 || height == 0)
1253 {
973 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1254 XGetWindowAttributes (display->display, display->root, &wattr);
974 if (width == 0) 1255 if (width == 0)
975 width = wattr.width - R->szHint.base_width; 1256 width = wattr.width - szHint.base_width;
976 if (height == 0) 1257 if (height == 0)
977 height = wattr.height - R->szHint.base_height; 1258 height = wattr.height - szHint.base_height;
978 } 1259 }
1260
979 if (width != R->TermWin.width || height != R->TermWin.height) { 1261 if (width != TermWin.width || height != TermWin.height)
1262 {
980 width += R->szHint.base_width; 1263 width += szHint.base_width;
981 height += R->szHint.base_height; 1264 height += szHint.base_height;
982 rxvt_resize_all_windows(aR_ width, height, 0); 1265 resize_all_windows (width, height, 0);
983 } 1266 }
984} 1267}
985 1268
986/* -------------------------------------------------------------------- * 1269/* -------------------------------------------------------------------- *
987 * - X INPUT METHOD ROUTINES - * 1270 * - X INPUT METHOD ROUTINES - *
988 * -------------------------------------------------------------------- */ 1271 * -------------------------------------------------------------------- */
989#ifdef USE_XIM 1272#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 1273
1000/* INTPROTO */
1001void 1274void
1002rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1275rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1003{ 1276{
1004 *fg = R->PixColors[Color_fg]; 1277 fg = pix_colors[Color_fg];
1005 *bg = R->PixColors[Color_bg]; 1278 bg = pix_colors[Color_bg];
1279}
1280
1281void
1282rxvt_term::im_set_size (XRectangle &size)
1283{
1284 // the int_bwidth terms make no sense to me
1285 size.x = TermWin.int_bwidth;
1286 size.y = TermWin.int_bwidth;
1287 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1288 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1289}
1290
1291void
1292rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1293 XRectangle &status_rect,
1294 const XRectangle &needed_rect)
1295{
1296 preedit_rect.x = needed_rect.width;
1297 preedit_rect.y = 0;
1298 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
1299 preedit_rect.height = TermWin.fheight;
1300
1301 status_rect.x = 0;
1302 status_rect.y = 0;
1303 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
1304 status_rect.height = TermWin.fheight;
1006} 1305}
1007 1306
1008/* Checking whether input method is running. */ 1307/* Checking whether input method is running. */
1009/* INTPROTO */
1010Bool 1308bool
1011rxvt_IMisRunning(pR) 1309rxvt_term::IMisRunning ()
1012{ 1310{
1013 char *p; 1311 char *p;
1014 Atom atom; 1312 Atom atom;
1015 Window win; 1313 Window win;
1016 char server[IMBUFSIZ]; 1314 char server[IMBUFSIZ];
1017 1315
1018/* get current locale modifier */ 1316 /* get current locale modifier */
1019 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1317 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1318 {
1020 STRCPY(server, "@server="); 1319 strcpy (server, "@server=");
1021 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1320 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1321
1022 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1322 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1023 *p = '\0'; 1323 *p = '\0';
1024 1324
1025 atom = XInternAtom(R->Xdisplay, server, False); 1325 atom = XInternAtom (display->display, server, False);
1026 win = XGetSelectionOwner(R->Xdisplay, atom); 1326 win = XGetSelectionOwner (display->display, atom);
1327
1027 if (win != None) 1328 if (win != None)
1028 return True; 1329 return True;
1029 } 1330 }
1331
1030 return False; 1332 return False;
1031} 1333}
1032 1334
1033/* EXTPROTO */
1034void 1335void
1035rxvt_IMSendSpot(pR) 1336rxvt_term::IMSendSpot ()
1036{ 1337{
1037 XPoint spot; 1338 XPoint nspot;
1038 XVaNestedList preedit_attr; 1339 XVaNestedList preedit_attr;
1039 1340
1040 if (R->Input_Context == NULL 1341 if (!Input_Context
1342 || !TermWin.focus
1041 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1343 || !(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; 1344 return;
1049 1345
1050 rxvt_setPosition(aR_ & spot); 1346 im_set_position (nspot);
1051 1347
1348 if (nspot.x == spot.x && nspot.y == spot.y)
1349 return;
1350
1351 spot = nspot;
1352
1052 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1353 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1053 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1354 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1054 XFree(preedit_attr); 1355 XFree (preedit_attr);
1055} 1356}
1056 1357
1057/* EXTPROTO */
1058void 1358void
1059rxvt_setTermFontSet(pR_ int idx) 1359rxvt_term::im_destroy ()
1060{ 1360{
1061 char *string; 1361 if (input_method)
1062 long length; 1362 {
1063 int success = 0; 1363 if (Input_Context && input_method->xim)
1364 XDestroyIC (Input_Context);
1064 1365
1065 if (idx < 0 || idx >= MAX_NFONTS) 1366 display->put_xim (input_method);
1066 return; 1367 input_method = 0;
1067} 1368 }
1068 1369
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; 1370 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} 1371}
1111 1372
1112/* 1373/*
1113 * X manual pages and include files don't match on some systems: 1374 * 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 1375 * 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 */ 1376 */
1118/* ARGSUSED */ 1377bool
1119/* EXTPROTO */ 1378rxvt_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{ 1379{
1126 dR; 1380 int i, j, found;
1381 XIM xim;
1382 XPoint spot;
1383 XRectangle rect, status_rect, needed_rect;
1384 unsigned long fg, bg;
1385 const char *p;
1386 char **s;
1387 XIMStyles *xim_styles;
1388
1389 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1390 return false;
1391
1392 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1393 input_method = display->get_xim (locale, modifiers);
1394 if (input_method == NULL)
1395 return false;
1396
1397 xim = input_method->xim;
1398 spot.x = spot.y = -1;
1399
1400 xim_styles = NULL;
1401 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1402 || !xim_styles || !xim_styles->count_styles)
1403 {
1404 im_destroy ();
1405 return false;
1406 }
1407
1408 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1409
1410 for (int pi = 0; pi < 2; pi++)
1411 {
1412 p = pet[pi];
1413
1414 if (!p)
1415 continue;
1416
1417 s = rxvt_splitcommastring (p);
1418
1419 for (i = found = 0; !found && s[i]; i++)
1420 {
1421 if (!strcmp (s[i], "OverTheSpot"))
1422 input_style = (XIMPreeditPosition | XIMStatusNothing);
1423 else if (!strcmp (s[i], "OffTheSpot"))
1424 input_style = (XIMPreeditArea | XIMStatusArea);
1425 else if (!strcmp (s[i], "Root"))
1426 input_style = (XIMPreeditNothing | XIMStatusNothing);
1427 else if (!strcmp (s[i], "None"))
1428 input_style = (XIMPreeditNone | XIMStatusNone);
1429
1430 for (j = 0; j < xim_styles->count_styles; j++)
1431 if (input_style == xim_styles->supported_styles[j])
1432 {
1433 rxvt_freecommastring (s);
1434
1435 found = 1;
1436 goto foundpet;
1437 }
1438
1439 }
1440
1441 rxvt_freecommastring (s);
1442 }
1443
1444foundpet:
1445
1446 XFree (xim_styles);
1447
1448 if (!found)
1449 {
1450 im_destroy ();
1451 return false;
1452 }
1453
1454 XFontSet fs = 0;
1455 XVaNestedList preedit_attr = 0, status_attr = 0;
1456
1457 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1458 {
1459 // fake us a font-set, please
1460 char **missing_charset_list;
1461 int missing_charset_count;
1462 char *def_string;
1463 char pat[512];
1464
1465 sprintf (pat,
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "*",
1472 TermWin.fheight,
1473 TermWin.fheight + 1, TermWin.fheight - 1,
1474 TermWin.fheight - 2, TermWin.fheight + 2);
1475
1476 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1477 &missing_charset_list, &missing_charset_count, &def_string);
1478
1479 if (missing_charset_list)
1480 XFreeStringList (missing_charset_list);
1481
1482 if (!fs)
1483 {
1484 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1485 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1486 }
1487 }
1488
1489 if (input_style & XIMPreeditPosition)
1490 {
1491 im_set_size (rect);
1492 im_set_position (spot);
1493 im_set_color (fg, bg);
1494
1495 preedit_attr = XVaCreateNestedList (0,
1496 XNForeground, fg,
1497 XNBackground, bg,
1498 XNArea, &rect,
1499 XNSpotLocation, &spot,
1500 XNFontSet, fs,
1501 NULL);
1502 }
1503 else if (input_style & XIMPreeditArea)
1504 {
1505 im_set_color (fg, bg);
1506
1507 /*
1508 * The necessary width of preedit area is unknown
1509 * until create input context.
1510 */
1511 needed_rect.width = 0;
1512 im_set_preedit_area (rect, status_rect, needed_rect);
1513
1514 preedit_attr = XVaCreateNestedList (0,
1515 XNForeground, fg,
1516 XNBackground, bg,
1517 XNArea, &rect,
1518 XNFontSet, fs,
1519 NULL);
1520 status_attr = XVaCreateNestedList (0,
1521 XNForeground, fg,
1522 XNBackground, bg,
1523 XNArea, &status_rect,
1524 XNFontSet, fs,
1525 NULL);
1526 }
1527
1528 Input_Context = XCreateIC (xim,
1529 XNInputStyle, input_style,
1530 XNClientWindow, TermWin.vt,
1531 XNFocusWindow, TermWin.parent[0],
1532 preedit_attr ? XNPreeditAttributes : NULL,
1533 preedit_attr,
1534 status_attr ? XNStatusAttributes : NULL,
1535 status_attr, NULL);
1536
1537 if (preedit_attr) XFree (preedit_attr);
1538 if (status_attr) XFree (status_attr);
1539 if (fs) XFreeFontSet (display->display, fs);
1540
1541 if (Input_Context == NULL)
1542 {
1543 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1544 im_destroy ();
1545 return false;
1546 }
1547
1548 if (input_style & XIMPreeditArea)
1549 IMSetStatusPosition ();
1550
1551 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1552 return true;
1553}
1554
1555void
1556rxvt_term::im_cb ()
1557{
1127 int i, found, had_im; 1558 int i, found, had_im;
1128 const char *p; 1559 const char *p;
1129 char **s; 1560 char **s;
1130 char buf[IMBUFSIZ]; 1561 char buf[IMBUFSIZ];
1131 1562
1563 SET_R (this);
1564
1565 im_destroy ();
1566
1132 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1567 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1133 if (R->Input_Context) 1568 if (Input_Context)
1134 return; 1569 return;
1135 1570
1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1572 if (rs[Rs_imLocale])
1573 SET_LOCALE (rs[Rs_imLocale]);
1574#endif
1575
1136 p = R->rs[Rs_inputMethod]; 1576 p = rs[Rs_inputMethod];
1137 if (p && *p) 1577 if (p && *p)
1138 { 1578 {
1139 bool found = false; 1579 bool found = false;
1140 1580
1141 s = rxvt_splitcommastring (p); 1581 s = rxvt_splitcommastring (p);
1582
1142 for (i = 0; s[i]; i++) 1583 for (i = 0; s[i]; i++)
1143 { 1584 {
1144 if (*s[i]) 1585 if (*s[i])
1145 { 1586 {
1146 STRCPY (buf, "@im="); 1587 strcpy (buf, "@im=");
1147 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1588 strncat (buf, s[i], IMBUFSIZ - 5);
1148 if ((p = XSetLocaleModifiers (buf)) && *p 1589 if (IM_get_IC (buf))
1149 && rxvt_IM_get_IC (aR))
1150 { 1590 {
1151 found = true; 1591 found = true;
1152 break; 1592 break;
1153 } 1593 }
1154 } 1594 }
1155 } 1595 }
1156 for (i = 0; s[i]; i++) 1596
1157 free(s[i]); 1597 rxvt_freecommastring (s);
1158 free(s);
1159 1598
1160 if (found) 1599 if (found)
1161 return; 1600 goto done;
1162 } 1601 }
1163 1602
1164/* try with XMODIFIERS env. var. */ 1603 /* try with XMODIFIERS env. var. */
1165 if ((p = XSetLocaleModifiers ("")) && *p 1604 if (IM_get_IC (""))
1166 && rxvt_IM_get_IC (aR)) 1605 goto done;
1606
1607 /* try with no modifiers base IF the user didn't specify an IM */
1608 if (IM_get_IC ("@im=none"))
1609 goto done;
1610
1611done:
1612#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1613 if (rs[Rs_imLocale])
1614 SET_LOCALE (locale);
1615#endif
1616}
1617
1618void
1619rxvt_term::IMSetStatusPosition ()
1620{
1621 XRectangle preedit_rect, status_rect, *needed_rect;
1622 XVaNestedList preedit_attr, status_attr;
1623
1624 if (!Input_Context
1625 || !TermWin.focus
1626 || !(input_style & XIMPreeditArea)
1627 || !IMisRunning ())
1167 return; 1628 return;
1168 1629
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 */ 1630 /* Getting the necessary width of preedit area */
1306 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1631 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1307 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1632 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1308 XFree(status_attr); 1633 XFree (status_attr);
1309 1634
1310 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1635 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1636 XFree (needed_rect);
1311 1637
1312 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1638 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1313 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1639 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1314 1640
1315 XSetICValues(R->Input_Context, 1641 XSetICValues (Input_Context,
1316 XNPreeditAttributes, preedit_attr, 1642 XNPreeditAttributes, preedit_attr,
1317 XNStatusAttributes, status_attr, NULL); 1643 XNStatusAttributes, status_attr, NULL);
1318 1644
1319 XFree(preedit_attr); 1645 XFree (preedit_attr);
1320 XFree(status_attr); 1646 XFree (status_attr);
1321} 1647}
1322#endif /* USE_XIM */ 1648#endif /* USE_XIM */
1323 1649
1324/*----------------------------------------------------------------------*/ 1650/*----------------------------------------------------------------------*/
1325rxvt_t rxvt_current_term; 1651rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines