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.15 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.164 by root, Fri Jan 6 05:37:59 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines