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.136 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.394 by root, Sat Dec 13 10:07:30 2014 UTC

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

Diff Legend

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