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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.14 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.141 by root, Sat Feb 19 01:07:58 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines