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.19 by pcg, Wed Dec 24 09:22:29 2003 UTC vs.
Revision 1.171 by root, Wed Jan 11 03:13:26 2006 UTC

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

Diff Legend

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