ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.16 by pcg, Thu Dec 18 07:31:19 2003 UTC vs.
Revision 1.166 by root, Sun Jan 8 07:55:36 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines