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

Diff Legend

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