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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines