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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines