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.178 by root, Mon Jan 16 08:29:57 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
116} 377}
117 378
118void 379void
119rxvt_term::destroy_cb (time_watcher &w) 380rxvt_term::destroy_cb (time_watcher &w)
120{ 381{
121 SET_R (this); 382 make_current ();
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);
483 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
485
486 if (!init_vars ())
487 return false;
488
489 init_secondary ();
490
491 const char **cmd_argv = init_resources (argc, argv);
492
493#ifdef KEYSYM_RESOURCE
494 keyboard->register_done ();
495#endif
496
497#if MENUBAR_MAX
498 menubar_read (rs[Rs_menu]);
499#endif
500#ifdef HAVE_SCROLLBARS
501 if (OPTION (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */
503#endif
504
505#if ENABLE_PERL
506 if (!rs[Rs_perl_ext_1])
507 rs[Rs_perl_ext_1] = "default";
508
509 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
510 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
511 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
512 {
513#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
514 // ignore some perl-related arguments if some bozo installed us set[ug]id
515 if (rxvt_tainted ())
516 {
517 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
518 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
519 {
520 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
521 rs[Rs_perl_lib] = 0;
522 rs[Rs_perl_eval] = 0;
523 }
524 }
525#endif
526 rxvt_perl.init ();
527 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
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
620char **rxvt_environ; // startup environment
621
622void
623rxvt_init ()
624{
625 rxvt_environ = environ;
180 626
181 /* 627 /*
182 * Save and then give up any super-user privileges 628 * Save and then give up any super-user privileges
183 * If we need privileges in any area then we must specifically request it. 629 * If we need privileges in any area then we must specifically request it.
184 * We should only need to be root in these cases: 630 * We should only need to be root in these cases:
185 * 1. write utmp entries on some systems 631 * 1. write utmp entries on some systems
186 * 2. chown tty on some systems 632 * 2. chown tty on some systems
187 */ 633 */
188 rxvt_privileges (this, SAVE); 634 rxvt_privileges (SAVE);
189 rxvt_privileges (this, IGNORE); 635 rxvt_privileges (IGNORE);
190 636
191 rxvt_init_secondary (this); 637 signal (SIGHUP, SIG_IGN);
638 signal (SIGPIPE, SIG_IGN);
192 639
193 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 640 sig_handlers.sw_chld.start (SIGCHLD);
641 sig_handlers.sw_term.start (SIGTERM);
642 sig_handlers.sw_int.start (SIGINT);
194 643
195#if (MENUBAR_MAX) 644 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
196 rxvt_menubar_read (this, rs[Rs_menu]); 645 /* 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 646
203 rxvt_Create_Windows (this, argc, argv); 647 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
648 // TODO: handle this with exceptions and tolerate the memory loss
649 XSetIOErrorHandler (rxvt_xioerror_handler);
204 650
205 rxvt_init_xlocale (this); 651 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} 652}
319 653
320/* ------------------------------------------------------------------------- * 654/* ------------------------------------------------------------------------- *
321 * MEMORY ALLOCATION WRAPPERS * 655 * MEMORY ALLOCATION WRAPPERS *
322 * ------------------------------------------------------------------------- */ 656 * ------------------------------------------------------------------------- */
323/* EXTPROTO */ 657void *
658rxvt_malloc (size_t size)
659{
660 void *p = malloc (size);
661
662 if (!p)
663 rxvt_fatal ("memory allocation failure. aborting.\n");
664
665 return p;
666}
667
668void *
669rxvt_calloc (size_t number, size_t size)
670{
671 void *p = calloc (number, size);
672
673 if (!p)
674 rxvt_fatal ("memory allocation failure. aborting.\n");
675
676 return p;
677}
678
324void * 679void *
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) 680rxvt_realloc (void *ptr, size_t size)
358{ 681{
359 void *p;
360
361 if (ptr)
362 p = realloc(ptr, size); 682 void *p = realloc (ptr, size);
363 else 683
364 p = malloc(size);
365 if (p) 684 if (!p)
685 rxvt_fatal ("memory allocation failure. aborting.\n");
686
366 return p; 687 return p;
367
368 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
369 rxvt_clean_exit();
370 exit(EXIT_FAILURE);
371/* NOTREACHED */
372} 688}
373 689
374/* ------------------------------------------------------------------------- * 690/* ------------------------------------------------------------------------- *
375 * PRIVILEGED OPERATIONS * 691 * PRIVILEGED OPERATIONS *
376 * ------------------------------------------------------------------------- */ 692 * ------------------------------------------------------------------------- */
377/* take care of suid/sgid super-user (root) privileges */ 693/* take care of suid/sgid super-user (root) privileges */
378/* INTPROTO */
379void 694void
380rxvt_privileges(pR_ int mode) 695rxvt_privileges (rxvt_privaction action)
381{ 696{
382#if ! defined(__CYGWIN32__) 697#if ! defined(__CYGWIN32__)
383# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 698# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
384/* setreuid() is the poor man's setuid(), seteuid() */ 699 /* setreuid () is the poor man's setuid (), seteuid () */
385# define seteuid(a) setreuid(-1, (a)) 700# define seteuid(a) setreuid(-1, (a))
386# define setegid(a) setregid(-1, (a)) 701# define setegid(a) setregid(-1, (a))
387# define HAVE_SETEUID 702# define HAVE_SETEUID
388# endif 703# endif
389# ifdef HAVE_SETEUID 704# ifdef HAVE_SETEUID
390 switch (mode) { 705 switch (action)
706 {
391 case IGNORE: 707 case IGNORE:
392 /* 708 /*
393 * change effective uid/gid - not real uid/gid - so we can switch 709 * change effective uid/gid - not real uid/gid - so we can switch
394 * back to root later, as required 710 * back to root later, as required
395 */ 711 */
396 seteuid(getuid());
397 setegid(getgid()); 712 setegid (getgid ());
713 seteuid (getuid ());
398 break; 714 break;
399 case SAVE: 715 case SAVE:
400 R->euid = geteuid();
401 R->egid = getegid(); 716 saved_egid = getegid ();
717 saved_euid = geteuid ();
402 break; 718 break;
403 case RESTORE: 719 case RESTORE:
404 seteuid(R->euid);
405 setegid(R->egid); 720 setegid (saved_egid);
721 seteuid (saved_euid);
406 break; 722 break;
407 } 723 }
408# else 724# else
409 switch (mode) { 725 switch (action)
726 {
410 case IGNORE: 727 case IGNORE:
411 setuid(getuid());
412 setgid(getgid()); 728 setgid (getgid ());
729 setuid (getuid ());
413 /* FALLTHROUGH */ 730 /* FALLTHROUGH */
414 case SAVE: 731 case SAVE:
415 /* FALLTHROUGH */ 732 /* FALLTHROUGH */
416 case RESTORE: 733 case RESTORE:
417 break; 734 break;
418 } 735 }
419# endif 736# endif
420#endif 737#endif
421} 738}
422 739
423#ifdef UTMP_SUPPORT 740#ifdef UTMP_SUPPORT
424/* EXTPROTO */
425void 741void
426rxvt_privileged_utmp(pR_ char action) 742rxvt_term::privileged_utmp (rxvt_privaction action)
427{ 743{
428 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 744 if (OPTION (Opt_utmpInhibit)
429 action, R->next_utmp_action, getpid())); 745 || !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; 746 return;
434 747
435 rxvt_privileges(aR_ RESTORE); 748 rxvt_privileges (RESTORE);
749
436 if (action == SAVE) { 750 if (action == SAVE)
437 R->next_utmp_action = RESTORE; 751 makeutent (pty.name, rs[Rs_display_name]);
438 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 752 else
439 } else { /* action == RESTORE */ 753 cleanutent ();
440 R->next_utmp_action = IGNORE; 754
441 rxvt_cleanutent(aR);
442 }
443 rxvt_privileges(aR_ IGNORE); 755 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} 756}
499#endif 757#endif
500 758
501/*----------------------------------------------------------------------*/ 759/*----------------------------------------------------------------------*/
502/* 760/*
503 * window size/position calculcations for XSizeHint and other storage. 761 * window size/position calculcations for XSizeHint and other storage.
504 * if width/height are non-zero then override calculated width/height 762 * if width/height are non-zero then override calculated width/height
505 */ 763 */
506/* EXTPROTO */
507void 764void
508rxvt_window_calc(pR_ unsigned int width, unsigned int height) 765rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
509{ 766{
510 short recalc_x, recalc_y; 767 short recalc_x, recalc_y;
511 int x, y, sb_w, mb_h, flags; 768 int x, y, sb_w, mb_h, flags;
512 unsigned int w, h; 769 unsigned int w, h;
513 unsigned int max_width, max_height; 770 unsigned int max_width, max_height;
771 dDisp;
514 772
515 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 773 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
516 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 774 ncol, nrow, szHint.width, szHint.height));
517 R->szHint.height)); 775
518 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 776 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
519 R->szHint.win_gravity = NorthWestGravity; 777 szHint.win_gravity = NorthWestGravity;
520/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 778 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
521 779
522 recalc_x = recalc_y = 0; 780 recalc_x = recalc_y = 0;
523 flags = 0; 781 flags = 0;
782
524 if (!R->parsed_geometry) { 783 if (!parsed_geometry)
784 {
525 R->parsed_geometry = 1; 785 parsed_geometry = 1;
786
526 if (R->rs[Rs_geometry]) 787 if (rs[Rs_geometry])
527 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 788 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
789
528 if (flags & WidthValue) { 790 if (flags & WidthValue)
529 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 791 {
792 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
530 R->szHint.flags |= USSize; 793 szHint.flags |= USSize;
531 } 794 }
795
532 if (flags & HeightValue) { 796 if (flags & HeightValue)
533 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 797 {
798 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
534 R->szHint.flags |= USSize; 799 szHint.flags |= USSize;
535 } 800 }
801
536 if (flags & XValue) { 802 if (flags & XValue)
803 {
537 R->szHint.x = x; 804 szHint.x = x;
538 R->szHint.flags |= USPosition; 805 szHint.flags |= USPosition;
806
539 if (flags & XNegative) { 807 if (flags & XNegative)
808 {
540 recalc_x = 1; 809 recalc_x = 1;
541 R->szHint.win_gravity = NorthEastGravity; 810 szHint.win_gravity = NorthEastGravity;
542 } 811 }
543 } 812 }
813
544 if (flags & YValue) { 814 if (flags & YValue)
815 {
545 R->szHint.y = y; 816 szHint.y = y;
546 R->szHint.flags |= USPosition; 817 szHint.flags |= USPosition;
818
547 if (flags & YNegative) { 819 if (flags & YNegative)
820 {
548 recalc_y = 1; 821 recalc_y = 1;
822
549 if (R->szHint.win_gravity == NorthEastGravity) 823 if (szHint.win_gravity == NorthEastGravity)
550 R->szHint.win_gravity = SouthEastGravity; 824 szHint.win_gravity = SouthEastGravity;
551 else 825 else
552 R->szHint.win_gravity = SouthWestGravity; 826 szHint.win_gravity = SouthWestGravity;
553 } 827 }
554 } 828 }
555 } 829 }
830
556/* TODO: BOUNDS */ 831 /* TODO: BOUNDS */
557 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 832 width = ncol * fwidth;
558 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 833 height = nrow * fheight;
559 max_width = MAX_COLS * R->TermWin.fwidth; 834 max_width = MAX_COLS * fwidth;
560 max_height = MAX_ROWS * R->TermWin.fheight; 835 max_height = MAX_ROWS * fheight;
561 836
562 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 837 szHint.base_width = szHint.base_height = 2 * int_bwidth;
563 838
564 sb_w = mb_h = 0; 839 sb_w = mb_h = 0;
565 R->window_vt_x = R->window_vt_y = 0; 840 window_vt_x = window_vt_y = int_bwidth;
841
566 if (scrollbar_visible(R)) { 842 if (scrollbar_visible ())
843 {
567 sb_w = scrollbar_TotalWidth(); 844 sb_w = scrollbar_TotalWidth ();
568 R->szHint.base_width += sb_w; 845 szHint.base_width += sb_w;
569 if (!(R->Options & Opt_scrollBar_right)) 846 if (!OPTION (Opt_scrollBar_right))
570 R->window_vt_x = sb_w; 847 window_vt_x += sb_w;
571 } 848 }
849
572 if (menubar_visible(R)) { 850 if (menubar_visible ())
851 {
573 mb_h = menuBar_TotalHeight(); 852 mb_h = menuBar_TotalHeight ();
574 R->szHint.base_height += mb_h; 853 szHint.base_height += mb_h;
575 R->window_vt_y = mb_h; 854 window_vt_y += mb_h;
576 } 855 }
856
577 R->szHint.width_inc = R->TermWin.fwidth; 857 szHint.width_inc = fwidth;
578 R->szHint.height_inc = R->TermWin.fheight; 858 szHint.height_inc = fheight;
579 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 859 szHint.min_width = szHint.base_width + szHint.width_inc;
580 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 860 szHint.min_height = szHint.base_height + szHint.height_inc;
581 861
582 if (width && width - R->szHint.base_width < max_width) { 862 if (newwidth && newwidth - szHint.base_width < max_width)
863 {
583 R->szHint.width = width; 864 szHint.width = newwidth;
584 R->TermWin.width = width - R->szHint.base_width; 865 width = newwidth - szHint.base_width;
585 } else { 866 }
586 MIN_IT(R->TermWin.width, max_width); 867 else
868 {
869 min_it (width, max_width);
587 R->szHint.width = R->szHint.base_width + R->TermWin.width; 870 szHint.width = szHint.base_width + width;
588 } 871 }
872
589 if (height && height - R->szHint.base_height < max_height) { 873 if (newheight && newheight - szHint.base_height < max_height)
874 {
590 R->szHint.height = height; 875 szHint.height = newheight;
591 R->TermWin.height = height - R->szHint.base_height; 876 height = newheight - szHint.base_height;
592 } else { 877 }
593 MIN_IT(R->TermWin.height, max_height); 878 else
879 {
880 min_it (height, max_height);
594 R->szHint.height = R->szHint.base_height + R->TermWin.height; 881 szHint.height = szHint.base_height + height;
595 } 882 }
883
596 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 884 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
597 R->window_sb_x = R->szHint.width - sb_w; 885 window_sb_x = szHint.width - sb_w;
598 886
599 if (recalc_x) 887 if (recalc_x)
600 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 888 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
601 - R->szHint.width - 2 * R->TermWin.ext_bwidth);
602 if (recalc_y) 889 if (recalc_y)
603 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 890 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
604 - R->szHint.height - 2 * R->TermWin.ext_bwidth);
605 891
606 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 892 ncol = width / fwidth;
607 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 893 nrow = height / fheight;
608 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 894 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
609 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 895 ncol, nrow, szHint.width,
610 R->szHint.height)); 896 szHint.height));
611 return; 897 return;
612} 898}
613 899
614/*----------------------------------------------------------------------*/ 900/*----------------------------------------------------------------------*/
615/* 901/*
616 * Tell the teletype handler what size the window is. 902 * Tell the teletype handler what size the window is.
617 * Called after a window size change. 903 * Called after a window size change.
618 */ 904 */
619/* EXTPROTO */
620void 905void
621rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 906rxvt_term::tt_winch ()
622{ 907{
908 if (pty.pty < 0)
909 return;
910
623 struct winsize ws; 911 struct winsize ws;
624 912
625 if (fd < 0)
626 return;
627 ws.ws_col = col; 913 ws.ws_col = ncol;
628 ws.ws_row = row; 914 ws.ws_row = nrow;
629 ws.ws_xpixel = ws.ws_ypixel = 0; 915 ws.ws_xpixel = width;
630#ifndef DEBUG_SIZE 916 ws.ws_ypixel = height;
631 (void)ioctl(fd, TIOCSWINSZ, &ws); 917 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
632#else 918
633 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 919#if 0
634 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 920 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
635 }
636# ifdef SIGWINCH
637 else if (pid) /* force through to the command */ 921 if (cmd_pid) /* force through to the command */
638 kill(pid, SIGWINCH); 922 kill (-cmd_pid, SIGWINCH);
639# endif
640#endif 923#endif
641} 924}
642 925
643/*----------------------------------------------------------------------*/ 926/*----------------------------------------------------------------------*/
644/* rxvt_change_font() - Switch to a new font */ 927/* set_fonts () - load and set the various fonts
645/* 928 *
646 * init = 1 - initialize 929 * init = 1 - initialize
647 * 930 *
648 * fontname == FONT_UP - switch to bigger font 931 * fontname == FONT_UP - switch to bigger font
649 * fontname == FONT_DN - switch to smaller font 932 * fontname == FONT_DN - switch to smaller font
650 */ 933 */
651/* EXTPROTO */ 934bool
652void 935rxvt_term::set_fonts ()
653rxvt_change_font(pR_ int init, const char *fontname)
654{ 936{
655} 937 rxvt_fontset *fs = new rxvt_fontset (this);
938 rxvt_fontprop prop;
656 939
657/* INTPROTO */ 940 if (!fs
658void 941 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
659rxvt_font_up_down(pR_ int n, int direction) 942 || !fs->realize_font (1))
943 {
944 delete fs;
945 return false;
946 }
947
948#if ENABLE_STYLES
949 for (int i = RS_styleCount; --i; )
950 if (fontset[i] != fontset[0])
951 delete fontset[i];
952#endif
953
954 delete fontset[0];
955 fontset[0] = fs;
956
957 prop = (*fs)[1]->properties ();
958 prop.height += lineSpace;
959 fs->set_prop (prop);
960
961 fwidth = prop.width;
962 fheight = prop.height;
963 fbase = prop.ascent;
964
965 for (int style = 1; style < 4; style++)
966 {
967#if ENABLE_STYLES
968 const char *res = rs[Rs_font + style];
969
970 if (res && !*res)
971 fontset[style] = fontset[0];
972 else
973 {
974 fontset[style] = fs = new rxvt_fontset (this);
975 rxvt_fontprop prop2 = prop;
976
977 if (res)
978 prop2.weight = prop2.slant = rxvt_fontprop::unset;
979 else
980 {
981 res = fontset[0]->fontdesc;
982
983 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
984 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
985 }
986
987 fs->populate (res);
988 fs->set_prop (prop2);
989 }
990#else
991 fontset[style] = fontset[0];
992#endif
993 }
994
995 if (parent[0])
996 {
997 resize_all_windows (0, 0, 0);
998 scr_remap_chars ();
999 scr_touch (true);
1000 }
1001
1002 return true;
1003}
1004
1005void rxvt_term::set_string_property (Atom prop, const char *str, int len)
660{ 1006{
1007 XChangeProperty (display->display, parent[0],
1008 prop, XA_STRING, 8, PropModeReplace,
1009 (const unsigned char *)str, len >= 0 ? len : strlen (str));
1010}
1011
1012void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
1013{
1014 wchar_t *ws = rxvt_mbstowcs (str, len);
1015 char *s = rxvt_wcstoutf8 (ws);
1016
1017 XChangeProperty (display->display, parent[0],
1018 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1019 (const unsigned char *)s, strlen (s));
1020
1021 free (s);
1022 free (ws);
661} 1023}
662 1024
663/*----------------------------------------------------------------------*/ 1025/*----------------------------------------------------------------------*/
664/*----------------------------------------------------------------------*/ 1026/*----------------------------------------------------------------------*/
665/* xterm sequences - title, iconName, color (exptl) */ 1027/* xterm sequences - title, iconName, color (exptl) */
666/* EXTPROTO */
667void 1028void
668rxvt_set_title(pR_ const char *str) 1029rxvt_term::set_title (const char *str)
669{ 1030{
670#ifndef SMART_WINDOW_TITLE 1031 set_string_property (XA_WM_NAME, str);
671 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 1032#if ENABLE_EWMH
1033 set_utf8_property (xa[XA_NET_WM_NAME], str);
1034#endif
1035}
1036
1037void
1038rxvt_term::set_icon_name (const char *str)
1039{
1040 set_string_property (XA_WM_ICON_NAME, str);
1041#if ENABLE_EWMH
1042 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
1043#endif
1044}
1045
1046#ifdef XTERM_COLOR_CHANGE
1047void
1048rxvt_term::set_window_color (int idx, const char *color)
1049{
1050 rxvt_color xcol;
1051 int i;
1052
1053 if (color == NULL || *color == '\0')
1054 return;
1055
1056 /* handle color aliases */
1057 if (isdigit (*color))
1058 {
1059 i = atoi (color);
1060
1061 if (i >= 8 && i <= 15)
1062 { /* bright colors */
1063 i -= 8;
1064 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1065 SET_PIXCOLOR (idx);
1066 goto done;
1067 }
1068
1069 if (i >= 0 && i <= 7)
1070 { /* normal colors */
1071 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1072 SET_PIXCOLOR (idx);
1073 goto done;
1074 }
1075 }
1076
1077 if (!rXParseAllocColor (&xcol, color))
1078 return;
1079
1080 /* XStoreColor (display->display, display->cmap, XColor*); */
1081
1082 /*
1083 * FIXME: should free colors here, but no idea how to do it so instead,
1084 * so just keep gobbling up the colormap
1085 */
1086# if 0
1087 for (i = Color_Black; i <= Color_White; i++)
1088 if (pix_colors[idx] == pix_colors[i])
1089 break;
1090 if (i > Color_White)
1091 {
1092 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1093 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1094 DisplayPlanes (display->display, display->screen));
1095 }
1096# endif
1097
1098 pix_colors_focused[idx] = xcol;
1099 SET_PIXCOLOR (idx);
1100
1101 /* XSetWindowAttributes attr; */
1102 /* Cursor cursor; */
1103done:
1104
1105#if OFF_FOCUS_FADING
1106 if (rs[Rs_fade])
1107 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1108#endif
1109
1110 /*TODO: handle Color_BD, scrollbar background, etc. */
1111
1112 recolour_cursor ();
1113 scr_recolour ();
1114}
1115
672#else 1116#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) 1117# define set_window_color (idx,color) ((void)0)
769#endif /* XTERM_COLOR_CHANGE */ 1118#endif /* XTERM_COLOR_CHANGE */
770 1119
771/* EXTPROTO */
772void 1120void
773rxvt_recolour_cursor(pR) 1121rxvt_term::recolour_cursor ()
774{ 1122{
775 rxvt_color xcol[2]; 1123 XColor xcol[2];
776 1124
777#if TODO 1125 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
778 xcol[0] = R->PixColors[Color_pointer]; 1126 ? pix_colors_focused[Color_pointer_fg]
779 xcol[1] = R->PixColors[Color_bg]; 1127 : pix_colors_focused[Color_fg];
780 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 1128 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1129 ? pix_colors_focused[Color_pointer_bg]
1130 : pix_colors_focused[Color_bg];
1131
1132 XQueryColors (display->display, display->cmap, xcol, 2);
781 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 1133 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
782#endif
783} 1134}
784 1135
785/*----------------------------------------------------------------------*/ 1136/*----------------------------------------------------------------------*/
786/* 1137/*
787 * find if fg/bg matches any of the normal (low-intensity) colors 1138 * find if fg/bg matches any of the normal (low-intensity) colors
788 */ 1139 */
789/* INTPROTO */
790void 1140void
791rxvt_set_colorfgbg(pR) 1141rxvt_term::set_colorfgbg ()
792{ 1142{
793 unsigned int i; 1143 unsigned int i;
794 const char *xpmb = "\0"; 1144 const char *xpmb = "\0";
795 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 1145 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
796 1146
797 R->env_colorfgbg =
798 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 1147 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
799 STRCPY(fstr, "default"); 1148 strcpy (fstr, "default");
800 STRCPY(bstr, "default"); 1149 strcpy (bstr, "default");
801 for (i = Color_Black; i <= Color_White; i++) 1150 for (i = Color_Black; i <= Color_White; i++)
802 if (R->PixColors[Color_fg] == R->PixColors[i]) { 1151 if (pix_colors[Color_fg] == pix_colors[i])
1152 {
803 sprintf(fstr, "%d", (i - Color_Black)); 1153 sprintf (fstr, "%d", (i - Color_Black));
804 break; 1154 break;
805 } 1155 }
1156
806 for (i = Color_Black; i <= Color_White; i++) 1157 for (i = Color_Black; i <= Color_White; i++)
807 if (R->PixColors[Color_bg] == R->PixColors[i]) { 1158 if (pix_colors[Color_bg] == pix_colors[i])
1159 {
808 sprintf(bstr, "%d", (i - Color_Black)); 1160 sprintf (bstr, "%d", (i - Color_Black));
809#ifdef XPM_BACKGROUND 1161#ifdef XPM_BACKGROUND
810 xpmb = "default;"; 1162 xpmb = "default;";
811#endif 1163#endif
812 break; 1164 break;
813 } 1165 }
1166
814 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1167 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} 1168}
827 1169
828/*----------------------------------------------------------------------*/ 1170/*----------------------------------------------------------------------*/
829/*
830 * Colour determination for low colour displays, routine from
831 * Hans de Goede <hans@highrise.nl>
832 */
833 1171
834/* EXTPROTO */
835int 1172int
836rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 1173rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
837{ 1174{
838 screen_in_out->set(aR_ colour);
839
840 if (!screen_in_out->set(aR_ colour)) { 1175 if (!screen_in_out->set (display, colour))
841 rxvt_print_error("can't allocate colour: %s", colour); 1176 {
1177 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
842 return false; 1178 return false;
843 } 1179 }
844 1180
845 return true; 1181 return true;
846} 1182}
847 1183
848/* -------------------------------------------------------------------- * 1184/* -------------------------------------------------------------------- *
849 * - WINDOW RESIZING - * 1185 * - WINDOW RESIZING - *
850 * -------------------------------------------------------------------- */ 1186 * -------------------------------------------------------------------- */
851/* EXTPROTO */
852void 1187void
853rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 1188rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
854 int ignoreparent)
855{ 1189{
856 int fix_screen; 1190 int fix_screen;
1191 int old_width = szHint.width, old_height = szHint.height;
1192 dDisp;
857 1193
1194 window_calc (newwidth, newheight);
1195 XSetWMNormalHints (disp, parent[0], &szHint);
1196
1197 if (!ignoreparent)
1198 {
858#ifdef SMART_RESIZE 1199#ifdef SMART_RESIZE
859 int old_width = R->szHint.width, old_height = R->szHint.height; 1200 /*
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> 1201 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
868 * reposition window on resize depending on placement on screen 1202 * reposition window on resize depending on placement on screen
869 */ 1203 */
870 int x, y, x1, y1; 1204 int x, y, x1, y1;
871 int dx, dy; 1205 int dx, dy;
872 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1206 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
873 Window unused_cr; 1207 Window unused_cr;
874 1208
875 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1209 XTranslateCoordinates (disp, parent[0], display->root,
876 0, 0, &x, &y, &unused_cr); 1210 0, 0, &x, &y, &unused_cr);
877 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 1211 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
878 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1212 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
879 /* 1213 /*
880 * if Xroot isn't the parent window, a WM will probably have offset 1214 * if display->root isn't the parent window, a WM will probably have offset
881 * our position for handles and decorations. Counter it 1215 * our position for handles and decorations. Counter it
882 */ 1216 */
883 if (x1 != x || y1 != y) { 1217 if (x1 != x || y1 != y)
1218 {
884 x -= x1; 1219 x -= x1;
885 y -= y1; 1220 y -= y1;
886 } 1221 }
887 1222
888 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 1223 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
889 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 1224 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
890 dx = old_width - R->szHint.width; 1225 dx = old_width - szHint.width;
891 dy = old_height - R->szHint.height; 1226 dy = old_height - szHint.height;
892 1227
893 /* Check position of the center of the window */ 1228 /* Check position of the center of the window */
894 if (x < x1) /* left half */ 1229 if (x < x1) /* left half */
895 dx = 0; 1230 dx = 0;
896 else if (x == x1) /* exact center */ 1231 else if (x == x1) /* exact center */
897 dx /= 2; 1232 dx /= 2;
898 if (y < y1) /* top half */ 1233 if (y < y1) /* top half */
899 dy = 0; 1234 dy = 0;
900 else if (y == y1) /* exact center */ 1235 else if (y == y1) /* exact center */
901 dy /= 2; 1236 dy /= 2;
902 1237
903 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1238 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
904 R->szHint.width, R->szHint.height); 1239 szHint.width, szHint.height);
905#else 1240#else
906 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1241 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
907 R->szHint.height);
908#endif 1242#endif
909 } 1243 }
910 1244
911 fix_screen = (R->TermWin.ncol != R->prev_ncol 1245 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
912 || R->TermWin.nrow != R->prev_nrow); 1246
913 if (fix_screen || width != R->old_width || height != R->old_height) { 1247 if (fix_screen || newwidth != old_width || newheight != old_height)
1248 {
914 if (scrollbar_visible(R)) { 1249 if (scrollbar_visible ())
1250 {
915 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1251 XMoveResizeWindow (disp, scrollBar.win,
1252 window_sb_x, 0,
916 0, scrollbar_TotalWidth(), R->szHint.height); 1253 scrollbar_TotalWidth (), szHint.height);
917 rxvt_Resize_scrollBar(aR); 1254 resize_scrollbar ();
918 } 1255 }
1256
919 if (menubar_visible(R)) 1257 if (menubar_visible ())
920 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1258 XMoveResizeWindow (disp, menuBar.win,
1259 window_vt_x, 0,
921 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1260 width, menuBar_TotalHeight ());
922 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1261
923 R->window_vt_y, TermWin_TotalWidth(), 1262 XMoveResizeWindow (disp, vt,
1263 window_vt_x, window_vt_y,
924 TermWin_TotalHeight()); 1264 width, height);
925#ifdef RXVT_GRAPHICS 1265
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); 1266 scr_clear ();
931#ifdef XPM_BACKGROUND 1267#ifdef XPM_BACKGROUND
932 rxvt_resize_pixmap(aR); 1268 resize_pixmap ();
933#endif 1269#endif
934 } 1270 }
935 1271
936 if (fix_screen || R->old_height == 0) { 1272 if (fix_screen || old_height == 0)
1273 {
937 int curr_screen = -1; 1274 int curr_screen = -1;
938 uint16_t old_ncol = R->prev_ncol; 1275 int old_ncol = prev_ncol;
939 1276
940 /* scr_reset only works on the primary screen */ 1277 /* scr_reset only works on the primary screen */
941 if (R->old_height) /* this is not the first time through */ 1278 if (old_height) /* this is not the first time through */
1279 {
1280 unsigned int ocol = ncol;
1281 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
942 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1282 curr_screen = scr_change_screen (PRIMARY);
943 rxvt_scr_reset(aR); 1283 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 } 1284 }
948 }
949 1285
1286 scr_reset ();
1287
1288 if (curr_screen >= 0) /* this is not the first time through */
1289 {
1290 scr_change_screen (curr_screen);
1291 selection_check (old_ncol != ncol ? 4 : 0);
1292 }
1293 }
1294
950 R->old_width = R->szHint.width; 1295 old_width = szHint.width;
951 R->old_height = R->szHint.height; 1296 old_height = szHint.height;
1297
1298#ifdef XPM_BACKGROUND
1299 if (pixmap)
1300 scr_touch (false);
1301#endif
952 1302
953#ifdef USE_XIM 1303#ifdef USE_XIM
954 rxvt_IMSetStatusPosition(aR); 1304 IMSetStatusPosition ();
955#endif 1305#endif
956} 1306}
957 1307
958/* 1308/*
959 * Set the width/height of the vt window in characters. Units are pixels. 1309 * Set the width/height of the vt window in characters. Units are pixels.
960 * good for toggling 80/132 columns 1310 * good for toggling 80/132 columns
961 */ 1311 */
962/* EXTPROTO */
963void 1312void
964rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1313rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
965{ 1314{
966 XWindowAttributes wattr; 1315 XWindowAttributes wattr;
967 1316
968 if (width == 0 || height == 0) { 1317 if (newwidth == 0 || newheight == 0)
1318 {
969 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1319 XGetWindowAttributes (display->display, display->root, &wattr);
1320
970 if (width == 0) 1321 if (newwidth == 0)
971 width = wattr.width - R->szHint.base_width; 1322 newwidth = wattr.width - szHint.base_width;
972 if (height == 0) 1323 if (newheight == 0)
973 height = wattr.height - R->szHint.base_height; 1324 newheight = wattr.height - szHint.base_height;
1325 }
1326
1327 if (newwidth != width || newheight != height)
974 } 1328 {
975 if (width != R->TermWin.width || height != R->TermWin.height) {
976 width += R->szHint.base_width; 1329 newwidth += szHint.base_width;
977 height += R->szHint.base_height; 1330 newheight += szHint.base_height;
978 rxvt_resize_all_windows(aR_ width, height, 0); 1331 resize_all_windows (newwidth, newheight, 0);
979 } 1332 }
980} 1333}
981 1334
982/* -------------------------------------------------------------------- * 1335/* -------------------------------------------------------------------- *
983 * - X INPUT METHOD ROUTINES - * 1336 * - X INPUT METHOD ROUTINES - *
984 * -------------------------------------------------------------------- */ 1337 * -------------------------------------------------------------------- */
985#ifdef USE_XIM 1338#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 1339
996/* INTPROTO */
997void 1340void
998rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1341rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
999{ 1342{
1000 *fg = R->PixColors[Color_fg]; 1343 fg = pix_colors[Color_fg];
1001 *bg = R->PixColors[Color_bg]; 1344 bg = pix_colors[Color_bg];
1345}
1346
1347void
1348rxvt_term::im_set_size (XRectangle &size)
1349{
1350 // the int_bwidth terms make no sense to me
1351 size.x = int_bwidth;
1352 size.y = int_bwidth;
1353 size.width = Width2Pixel (ncol) + int_bwidth;
1354 size.height = Height2Pixel (nrow) + int_bwidth;
1355}
1356
1357void
1358rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1359 XRectangle &status_rect,
1360 const XRectangle &needed_rect)
1361{
1362 preedit_rect.x = needed_rect.width;
1363 preedit_rect.y = 0;
1364 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1365 preedit_rect.height = fheight;
1366
1367 status_rect.x = 0;
1368 status_rect.y = 0;
1369 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1370 status_rect.height = fheight;
1002} 1371}
1003 1372
1004/* Checking whether input method is running. */ 1373/* Checking whether input method is running. */
1005/* INTPROTO */
1006Bool 1374bool
1007rxvt_IMisRunning(pR) 1375rxvt_term::IMisRunning ()
1008{ 1376{
1009 char *p; 1377 char *p;
1010 Atom atom; 1378 Atom atom;
1011 Window win; 1379 Window win;
1012 char server[IMBUFSIZ]; 1380 char server[IMBUFSIZ];
1013 1381
1014/* get current locale modifier */ 1382 /* get current locale modifier */
1015 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1383 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1384 {
1016 STRCPY(server, "@server="); 1385 strcpy (server, "@server=");
1017 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1386 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1387
1018 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1388 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1019 *p = '\0'; 1389 *p = '\0';
1020 1390
1021 atom = XInternAtom(R->Xdisplay, server, False); 1391 atom = XInternAtom (display->display, server, False);
1022 win = XGetSelectionOwner(R->Xdisplay, atom); 1392 win = XGetSelectionOwner (display->display, atom);
1393
1023 if (win != None) 1394 if (win != None)
1024 return True; 1395 return True;
1025 } 1396 }
1397
1026 return False; 1398 return False;
1027} 1399}
1028 1400
1029/* EXTPROTO */
1030void 1401void
1031rxvt_IMSendSpot(pR) 1402rxvt_term::IMSendSpot ()
1032{ 1403{
1033 XPoint spot; 1404 XPoint nspot;
1034 XVaNestedList preedit_attr; 1405 XVaNestedList preedit_attr;
1035 1406
1036 if (R->Input_Context == NULL 1407 if (!Input_Context
1408 || !focus
1037 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1409 || !(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; 1410 return;
1045 1411
1046 rxvt_setPosition(aR_ & spot); 1412 im_set_position (nspot);
1047 1413
1414 if (nspot.x == spot.x && nspot.y == spot.y)
1415 return;
1416
1417 spot = nspot;
1418
1048 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1419 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1049 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1420 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1050 XFree(preedit_attr); 1421 XFree (preedit_attr);
1051} 1422}
1052 1423
1053/* EXTPROTO */
1054void 1424void
1055rxvt_setTermFontSet(pR_ int idx) 1425rxvt_term::im_destroy ()
1056{ 1426{
1057 char *string; 1427 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 } 1428 {
1152 if (found) 1429 if (Input_Context && input_method->xim)
1153 return; 1430 XDestroyIC (Input_Context);
1154 1431
1155/* try with XMODIFIERS env. var. */ 1432 display->put_xim (input_method);
1156 if ((p = XSetLocaleModifiers("")) != NULL && *p) { 1433 input_method = 0;
1157 rxvt_IM_get_IC(aR);
1158 return;
1159 } 1434 }
1160 1435
1161/* try with no modifiers base IF the user didn't specify an IM */ 1436 Input_Context = 0;
1162 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1163 && rxvt_IM_get_IC(aR) == True)
1164 return;
1165} 1437}
1166 1438
1167/* 1439/*
1168 * Try to open a XIM with the current modifiers, then see if we can 1440 * Try to open a XIM with the current modifiers, then see if we can
1169 * open a suitable preedit type 1441 * open a suitable preedit type
1170 */ 1442 */
1171/* INTPROTO */
1172Bool 1443bool
1173rxvt_IM_get_IC(pR) 1444rxvt_term::IM_get_IC (const char *modifiers)
1174{ 1445{
1175 int i, j, found; 1446 int i, j, found;
1176 XIM xim; 1447 XIM xim;
1177 XPoint spot; 1448 XPoint spot;
1178 XRectangle rect, status_rect, needed_rect; 1449 XRectangle rect, status_rect, needed_rect;
1179 unsigned long fg, bg; 1450 unsigned long fg, bg;
1180 const char *p; 1451 const char *p;
1181 char **s; 1452 char **s;
1182 XIMStyles *xim_styles; 1453 XIMStyles *xim_styles;
1183 XVaNestedList preedit_attr, status_attr;
1184 XIMCallback ximcallback;
1185 1454
1455 set_environ (envv);
1456
1457 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1458 return false;
1459
1186 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1460 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1187 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1461 input_method = display->get_xim (locale, modifiers);
1188 if (xim == NULL) 1462 if (input_method == NULL)
1189 return False; 1463 return false;
1190 1464
1465 xim = input_method->xim;
1466 spot.x = spot.y = -1;
1467
1191 xim_styles = NULL; 1468 xim_styles = NULL;
1192 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1469 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1193 || !xim_styles || !xim_styles->count_styles) { 1470 || !xim_styles || !xim_styles->count_styles)
1194 XCloseIM(xim); 1471 {
1472 im_destroy ();
1195 return False; 1473 return false;
1474 }
1475
1476 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1477
1478 for (int pi = 0; pi < 2; pi++)
1196 } 1479 {
1480 p = pet[pi];
1197 1481
1198 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1482 if (!p)
1199 : "OverTheSpot,OffTheSpot,Root"; 1483 continue;
1484
1200 s = rxvt_splitcommastring(p); 1485 s = rxvt_splitcommastring (p);
1486
1201 for (i = found = 0; !found && s[i]; i++) { 1487 for (i = found = 0; !found && s[i]; i++)
1488 {
1202 if (!STRCMP(s[i], "OverTheSpot")) 1489 if (!strcmp (s[i], "OverTheSpot"))
1203 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1490 input_style = (XIMPreeditPosition | XIMStatusNothing);
1204 else if (!STRCMP(s[i], "OffTheSpot")) 1491 else if (!strcmp (s[i], "OffTheSpot"))
1205 R->input_style = (XIMPreeditArea | XIMStatusArea); 1492 input_style = (XIMPreeditArea | XIMStatusArea);
1206 else if (!STRCMP(s[i], "Root")) 1493 else if (!strcmp (s[i], "Root"))
1207 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1494 input_style = (XIMPreeditNothing | XIMStatusNothing);
1495 else if (!strcmp (s[i], "None"))
1496 input_style = (XIMPreeditNone | XIMStatusNone);
1208 1497
1209 for (j = 0; j < xim_styles->count_styles; j++) 1498 for (j = 0; j < xim_styles->count_styles; j++)
1210 if (R->input_style == xim_styles->supported_styles[j]) { 1499 if (input_style == xim_styles->supported_styles[j])
1500 {
1501 rxvt_freecommastring (s);
1502
1211 found = 1; 1503 found = 1;
1504 goto foundpet;
1505 }
1506
1507 }
1508
1509 rxvt_freecommastring (s);
1510 }
1511
1512foundpet:
1513
1514 XFree (xim_styles);
1515
1516 if (!found)
1517 {
1518 im_destroy ();
1519 return false;
1520 }
1521
1522 XFontSet fs = 0;
1523 XVaNestedList preedit_attr = 0, status_attr = 0;
1524
1525 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1526 {
1527 // fake us a font-set, please
1528 char **missing_charset_list;
1529 int missing_charset_count;
1530 char *def_string;
1531 char pat[512];
1532
1533 sprintf (pat,
1534 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1535 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1536 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1537 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1538 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1539 "*",
1540 fheight,
1541 fheight + 1, fheight - 1,
1542 fheight - 2, fheight + 2);
1543
1544 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1545 &missing_charset_list, &missing_charset_count, &def_string);
1546
1547 if (missing_charset_list)
1548 XFreeStringList (missing_charset_list);
1549
1550 if (!fs)
1551 {
1552 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1553 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1554 }
1555 }
1556
1557 if (input_style & XIMPreeditPosition)
1558 {
1559 im_set_size (rect);
1560 im_set_position (spot);
1561 im_set_color (fg, bg);
1562
1563 preedit_attr = XVaCreateNestedList (0,
1564 XNForeground, fg,
1565 XNBackground, bg,
1566 XNArea, &rect,
1567 XNSpotLocation, &spot,
1568 XNFontSet, fs,
1569 NULL);
1570 }
1571 else if (input_style & XIMPreeditArea)
1572 {
1573 im_set_color (fg, bg);
1574
1575 /*
1576 * The necessary width of preedit area is unknown
1577 * until create input context.
1578 */
1579 needed_rect.width = 0;
1580 im_set_preedit_area (rect, status_rect, needed_rect);
1581
1582 preedit_attr = XVaCreateNestedList (0,
1583 XNForeground, fg,
1584 XNBackground, bg,
1585 XNArea, &rect,
1586 XNFontSet, fs,
1587 NULL);
1588 status_attr = XVaCreateNestedList (0,
1589 XNForeground, fg,
1590 XNBackground, bg,
1591 XNArea, &status_rect,
1592 XNFontSet, fs,
1593 NULL);
1594 }
1595
1596 Input_Context = XCreateIC (xim,
1597 XNInputStyle, input_style,
1598 XNClientWindow, vt,
1599 XNFocusWindow, parent[0],
1600 preedit_attr ? XNPreeditAttributes : NULL,
1601 preedit_attr,
1602 status_attr ? XNStatusAttributes : NULL,
1603 status_attr, NULL);
1604
1605 if (preedit_attr) XFree (preedit_attr);
1606 if (status_attr) XFree (status_attr);
1607 if (fs) XFreeFontSet (display->display, fs);
1608
1609 if (Input_Context == NULL)
1610 {
1611 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1612 im_destroy ();
1613 return false;
1614 }
1615
1616 if (input_style & XIMPreeditArea)
1617 IMSetStatusPosition ();
1618
1619 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1620 return true;
1621}
1622
1623void
1624rxvt_term::im_cb ()
1625{
1626 int i;
1627 const char *p;
1628 char **s;
1629 char buf[IMBUFSIZ];
1630
1631 make_current ();
1632
1633 im_destroy ();
1634
1635 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1636 if (Input_Context)
1637 return;
1638
1639#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1640 if (rs[Rs_imLocale])
1641 SET_LOCALE (rs[Rs_imLocale]);
1642#endif
1643
1644 p = rs[Rs_inputMethod];
1645 if (p && *p)
1646 {
1647 bool found = false;
1648
1649 s = rxvt_splitcommastring (p);
1650
1651 for (i = 0; s[i]; i++)
1652 {
1653 if (*s[i])
1654 {
1655 strcpy (buf, "@im=");
1656 strncat (buf, s[i], IMBUFSIZ - 5);
1657 if (IM_get_IC (buf))
1658 {
1659 found = true;
1212 break; 1660 break;
1661 }
1213 } 1662 }
1214 } 1663 }
1215 for (i = 0; s[i]; i++)
1216 free(s[i]);
1217 free(s);
1218 XFree(xim_styles);
1219 1664
1665 rxvt_freecommastring (s);
1666
1220 if (!found) { 1667 if (found)
1221 XCloseIM(xim); 1668 goto done;
1222 return False;
1223 } 1669 }
1224 1670
1225 ximcallback.callback = rxvt_IMDestroyCallback; 1671 /* try with XMODIFIERS env. var. */
1672 if (IM_get_IC (""))
1673 goto done;
1226 1674
1227/* XXX: not sure why we need this (as well as IC one below) */ 1675 /* try with no modifiers base IF the user didn't specify an IM */
1228 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1676 if (IM_get_IC ("@im=none"))
1677 goto done;
1229 1678
1230 preedit_attr = status_attr = NULL; 1679done:
1231 1680#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1232 if (R->input_style & XIMPreeditPosition) { 1681 if (rs[Rs_imLocale])
1233 rxvt_setSize(aR_ & rect); 1682 SET_LOCALE (locale);
1234 rxvt_setPosition(aR_ & spot); 1683#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} 1684}
1284 1685
1285/* EXTPROTO */
1286void 1686void
1287rxvt_IMSetStatusPosition(pR) 1687rxvt_term::IMSetStatusPosition ()
1288{ 1688{
1289 XRectangle preedit_rect, status_rect, *needed_rect; 1689 XRectangle preedit_rect, status_rect, *needed_rect;
1290 XVaNestedList preedit_attr, status_attr; 1690 XVaNestedList preedit_attr, status_attr;
1291 1691
1292 if (R->Input_Context == NULL 1692 if (!Input_Context
1693 || !focus
1293 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1694 || !(input_style & XIMPreeditArea)
1294 || !rxvt_IMisRunning(aR)) 1695 || !IMisRunning ())
1295 return; 1696 return;
1296 1697
1297/* Getting the necessary width of preedit area */ 1698 /* Getting the necessary width of preedit area */
1298 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1699 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1299 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1700 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1300 XFree(status_attr); 1701 XFree (status_attr);
1301 1702
1302 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1703 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1704 XFree (needed_rect);
1303 1705
1304 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1706 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1305 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1707 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1306 1708
1307 XSetICValues(R->Input_Context, 1709 XSetICValues (Input_Context,
1308 XNPreeditAttributes, preedit_attr, 1710 XNPreeditAttributes, preedit_attr,
1309 XNStatusAttributes, status_attr, NULL); 1711 XNStatusAttributes, status_attr, NULL);
1310 1712
1311 XFree(preedit_attr); 1713 XFree (preedit_attr);
1312 XFree(status_attr); 1714 XFree (status_attr);
1313} 1715}
1314#endif /* USE_XIM */ 1716#endif /* USE_XIM */
1315 1717
1316/*----------------------------------------------------------------------*/ 1718/*----------------------------------------------------------------------*/
1317rxvt_t rxvt_current_term; 1719rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines