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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines