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.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.174 by root, Thu Jan 12 00:11:13 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines