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

Diff Legend

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