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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines