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.73 by root, Fri Jul 30 14:59:12 2004 UTC vs.
Revision 1.242 by sasha, Wed Aug 15 22:41:52 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines