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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines