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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines