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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines