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.21 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines