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.17 by pcg, Thu Dec 18 13:33:02 2003 UTC vs.
Revision 1.168 by root, Sun Jan 8 08:49:20 2006 UTC

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

Diff Legend

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