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

Diff Legend

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