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

Diff Legend

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