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

Diff Legend

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