ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.138 by root, Wed Feb 16 20:32:05 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines