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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines