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

Diff Legend

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