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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines