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.15 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines