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.21 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.173 by root, Wed Jan 11 19:55:34 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines