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.10 by pcg, Wed Dec 3 23:19:44 2003 UTC vs.
Revision 1.140 by root, Thu Feb 17 15:07:48 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines