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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.16 by pcg, Thu Dec 18 07:31:19 2003 UTC vs.
Revision 1.186 by root, Tue Jan 17 15:41:33 2006 UTC

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

Diff Legend

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