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.14 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines