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.14 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.143 by root, Sun Feb 20 00:09:25 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines