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.203 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.350 by sf-exg, Fri Jan 28 00:21:10 2011 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-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <pcg@goof.com>
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 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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 "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 45#include <termios.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
49#endif 53# endif
54#endif
50 55
56struct termios rxvt_term::def_tio;
51vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
52 58
53// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
55 61
56static char curlocale[128], savelocale[128]; 62static char curlocale[128], savelocale[128];
57 63
58bool 64bool
59rxvt_set_locale (const char *locale) NOTHROW 65rxvt_set_locale (const char *locale) NOTHROW
60{ 66{
67 int size = strlen (locale) + 1;
68
69 if (size > sizeof (curlocale))
70 rxvt_fatal ("locale string too long, aborting.\n");
71
61 if (!locale || !strncmp (locale, curlocale, 128)) 72 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 73 return false;
63 74
64 strncpy (curlocale, locale, 128); 75 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 76 setlocale (LC_CTYPE, curlocale);
66 return true; 77 return true;
67} 78}
68 79
69void 80void
… …
83class rxvt_composite_vec rxvt_composite; 94class rxvt_composite_vec rxvt_composite;
84 95
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 97{
87 compose_char *cc; 98 compose_char *cc;
88 99
89 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
91 cc = (*this)[c1]; 102 cc = (*this)[c1];
92 while (cc) 103 while (cc)
93 { 104 {
94 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
95 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
96 } 107 }
97 108
98 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
99 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
100 {
101 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
102 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
103 }
104 113
105 // allocate a new combination 114 // allocate a new combination
106 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
107 { 116 {
108 static int seen; 117 static int seen;
109 118
110 if (!seen++) 119 if (!seen++)
111 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
112 121
113 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
114 } 123 }
115 124
116 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
142 151
143} 152}
144#endif 153#endif
145 154
146rxvt_term::rxvt_term () 155rxvt_term::rxvt_term ()
147 : 156{
148#if TRANSPARENT 157#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 159#endif
154#ifdef CURSOR_BLINK 160#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 162#endif
157#ifdef TEXT_BLINK 163#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 165#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 168#endif
163#ifdef SELECTION_SCROLLING 169#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 171#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 181#endif
169#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 184#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 185#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 187#endif
178 termwin_ev (this, &rxvt_term::x_cb), 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 195
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 197
189 termlist.push_back (this); 198 termlist.push_back (this);
190 199
191#ifdef KEYSYM_RESOURCE 200#ifdef KEYSYM_RESOURCE
… …
193#endif 202#endif
194} 203}
195 204
196// clean up the most important stuff, do *not* call x or free mem etc. 205// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 206// for use before an emergency exit
207void
198void rxvt_term::emergency_cleanup () 208rxvt_term::emergency_cleanup ()
199{ 209{
200 if (cmd_pid) 210 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 211 kill (-cmd_pid, SIGHUP);
202 212
213 pty_ev.stop ();
203 delete pty; pty = 0; 214 delete pty; pty = 0;
204} 215}
205 216
206rxvt_term::~rxvt_term () 217rxvt_term::~rxvt_term ()
207{ 218{
… …
214 if (fontset[i] != fontset[0]) 225 if (fontset[i] != fontset[0])
215 delete fontset[i]; 226 delete fontset[i];
216#endif 227#endif
217 delete fontset[0]; 228 delete fontset[0];
218 229
230#ifdef HAVE_BG_PIXMAP
231 bg_destroy ();
232#endif
233
219 if (display) 234 if (display)
220 { 235 {
221 dDisp;
222
223 selection_clear (); 236 selection_clear ();
237 selection_clear (true);
224 238
225#ifdef USE_XIM 239#ifdef USE_XIM
226 im_destroy (); 240 im_destroy ();
227#endif 241#endif
228#ifdef XTERM_SCROLLBAR 242 scrollBar.destroy ();
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC);
231#endif
232#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
234#endif
235#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
246#endif
247#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
251#endif
252 if (gc) XFreeGC (disp, gc); 243 if (gc) XFreeGC (dpy, gc);
253 244
254 delete drawable; 245 delete drawable;
255 // destroy all windows 246 // destroy all windows
256 if (parent[0]) 247 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 248 XDestroyWindow (dpy, parent[0]);
258 }
259 249
260 // TODO: free pixcolours, colours should become part of rxvt_display 250 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 251 if (ISSET_PIXCOLOR (i))
252 {
253 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 254#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 255 pix_colors_unfocused [i].free (this);
264#endif 256#endif
257 }
265 258
259 clear ();
260
261 display->flush (); /* ideally .put should do this */
266 displays.put (display); 262 displays.put (display);
263 }
267 264
268 scr_release (); 265 scr_release ();
269 266
270 /* clear all resources */ 267 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 268 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 269 free (allocated [i]);
273 270
274 free (selection.text); 271 free (selection.text);
272 free (selection.clip_text);
275 // TODO: manage env vars in child only(!) 273 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 274 free (env_display);
278 free (env_term); 275 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 276 free (locale);
281 free (v_buffer); 277 free (v_buffer);
282 free (incr_buf); 278 free (incr_buf);
283 279
284 delete envv; 280 delete envv;
285 delete argv; 281 delete argv;
286 282
287#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
288 delete keyboard; 284 delete keyboard;
289#endif 285#endif
286#ifndef NO_RESOURCES
287 XrmDestroyDatabase (option_db);
288#endif
290} 289}
291 290
292// child has exited, usually destroys 291// child has exited, usually destroys
293void 292void
294rxvt_term::child_cb (child_watcher &w, int status) 293rxvt_term::child_cb (ev::child &w, int status)
295{ 294{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 295 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 296
298 cmd_pid = 0; 297 cmd_pid = 0;
299 298
300 if (!OPTION (Opt_hold)) 299 if (!option (Opt_hold))
301 destroy (); 300 destroy ();
302} 301}
303 302
304void 303void
305rxvt_term::destroy () 304rxvt_term::destroy ()
306{ 305{
307 if (destroy_ev.active) 306 if (destroy_ev.is_active ())
308 return; 307 return;
309 308
310 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 309 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 310
312#if ENABLE_OVERLAY 311#if ENABLE_OVERLAY
… …
316 if (display) 315 if (display)
317 { 316 {
318#if USE_XIM 317#if USE_XIM
319 im_ev.stop (display); 318 im_ev.stop (display);
320#endif 319#endif
321#if HAVE_SCROLLBARS
322 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
323#endif 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
324#if TRANSPARENT
325 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
326#endif 323#endif
327 incr_ev.stop (); 324 incr_ev.stop ();
328 termwin_ev.stop (display); 325 termwin_ev.stop (display);
329 vt_ev.stop (display); 326 vt_ev.stop (display);
330 } 327 }
331 328
332 check_ev.stop (); 329 flush_ev.stop ();
333 pty_ev.stop (); 330 pty_ev.stop ();
334#ifdef CURSOR_BLINK 331#ifdef CURSOR_BLINK
335 cursor_blink_ev.stop (); 332 cursor_blink_ev.stop ();
336#endif 333#endif
337#ifdef TEXT_BLINK 334#ifdef TEXT_BLINK
… …
345#endif 342#endif
346#ifdef POINTER_BLANK 343#ifdef POINTER_BLANK
347 pointer_ev.stop (); 344 pointer_ev.stop ();
348#endif 345#endif
349 346
350 destroy_ev.start (0); 347 destroy_ev.start ();
351} 348}
352 349
353void 350void
354rxvt_term::destroy_cb (time_watcher &w) 351rxvt_term::destroy_cb (ev::idle &w, int revents)
355{ 352{
356 make_current (); 353 make_current ();
357 354
358 delete this; 355 delete this;
356}
357
358void
359rxvt_term::set_option (uint8_t opt, bool set)
360{
361 if (!opt)
362 return;
363
364 uint8_t mask = 1 << (opt & 7);
365 uint8_t &val = options [opt >> 3];
366
367 val = val & ~mask | (set ? mask : 0);
359} 368}
360 369
361/*----------------------------------------------------------------------*/ 370/*----------------------------------------------------------------------*/
362/* 371/*
363 * Exit gracefully, clearing the utmp entry and restoring tty attributes 372 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
370{ 379{
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 380 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 381 (*t)->emergency_cleanup ();
373} 382}
374 383
375#if ENABLE_FRILLS 384#if !ENABLE_MINIMAL
376static void 385static void
377print_x_error (Display *dpy, XErrorEvent *event) 386print_x_error (Display *dpy, XErrorEvent *event)
378{ 387{
379 char buffer[BUFSIZ]; 388 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 389 char mesg[BUFSIZ];
381 char number[32]; 390 char number[32];
382 char *mtype = "XlibMessage"; 391 const char mtype[] = "XlibMessage";
383 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 392 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
384 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 393 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 394 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386 rxvt_warn ("%s: %s\n", mesg, buffer); 395 rxvt_warn ("%s: %s\n", mesg, buffer);
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 396 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 397 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389 sprintf(number, "%d", event->request_code); 398 sprintf(number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 399 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer); 400 rxvt_warn ("(which is %s)\n", buffer);
392 if (event->request_code >= 128) { 401 if (event->request_code >= 128) {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 402 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394 mesg, BUFSIZ); 403 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 404 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 } 405 }
397 if ((event->error_code == BadWindow) || 406 if ((event->error_code == BadWindow) ||
398 (event->error_code == BadPixmap) || 407 (event->error_code == BadPixmap) ||
399 (event->error_code == BadCursor) || 408 (event->error_code == BadCursor) ||
400 (event->error_code == BadFont) || 409 (event->error_code == BadFont) ||
401 (event->error_code == BadDrawable) || 410 (event->error_code == BadDrawable) ||
402 (event->error_code == BadColor) || 411 (event->error_code == BadColor) ||
403 (event->error_code == BadGC) || 412 (event->error_code == BadGC) ||
404 (event->error_code == BadIDChoice) || 413 (event->error_code == BadIDChoice) ||
405 (event->error_code == BadValue) || 414 (event->error_code == BadValue) ||
406 (event->error_code == BadAtom)) { 415 (event->error_code == BadAtom)) {
407 if (event->error_code == BadValue) 416 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
409 mesg, BUFSIZ); 418 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom) 419 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 420 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
412 mesg, BUFSIZ); 421 mesg, BUFSIZ);
413 else 422 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 423 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 424 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 426 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 427 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 428 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 429 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 430}
422#endif 431#endif
423 432
424int 433int
… …
428 GET_R->allowedxerror = event->error_code; 437 GET_R->allowedxerror = event->error_code;
429 else 438 else
430 { 439 {
431 // GET_R is most likely not the terminal which caused the error, 440 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue 441 // so just output the error and continue
433#if ENABLE_FRILLS 442#if ENABLE_MINIMAL
443 old_xerror_handler (display, event);
444#else
434 print_x_error (display, event); 445 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 446#endif
438 } 447 }
439 448
440 return 0; 449 return 0;
441} 450}
… …
447 DisplayString (display)); 456 DisplayString (display));
448 rxvt_emergency_cleanup (); 457 rxvt_emergency_cleanup ();
449 _exit (EXIT_FAILURE); 458 _exit (EXIT_FAILURE);
450} 459}
451 460
452/*----------------------------------------------------------------------*/
453bool
454rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
455{
456 this->envv = envv;
457
458 SET_R (this);
459 set_locale ("");
460 set_environ (envv); // few things in X do not call setlocale :(
461
462 if (!init_vars ())
463 return false;
464
465 init_secondary ();
466
467 const char **cmd_argv = init_resources (argc, argv);
468
469#ifdef KEYSYM_RESOURCE
470 keyboard->register_done ();
471#endif
472
473#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */
476#endif
477
478 pty = ptytty::create ();
479
480 create_windows (argc, argv);
481
482 dDisp;
483
484 init_xlocale ();
485
486 scr_reset (); // initialize screen
487
488#if 0
489 XSynchronize (disp, True);
490#endif
491
492#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */
495#endif
496#ifdef TRANSPARENT
497 if (OPTION (Opt_transparent))
498 {
499 XSelectInput (disp, display->root, PropertyChangeMask);
500 check_our_parents ();
501 rootwin_ev.start (display, display->root);
502 }
503#endif
504
505 set_colorfgbg ();
506
507 init_command (cmd_argv);
508
509 free (cmd_argv);
510
511 if (pty->pty >= 0)
512 pty_ev.start (pty->pty, EVENT_READ);
513
514 check_ev.start ();
515
516 HOOK_INVOKE ((this, HOOK_START, DT_END));
517
518#if ENABLE_XEMBED
519 if (rs[Rs_embed])
520 {
521 long info[2] = { 0, XEMBED_MAPPED };
522
523 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
524 32, PropModeReplace, (unsigned char *)&info, 2);
525 }
526#endif
527
528 XMapWindow (disp, vt);
529 XMapWindow (disp, parent[0]);
530
531 return true;
532}
533
534static struct sig_handlers 461static struct sig_handlers
535{ 462{
536 sig_watcher sw_term, sw_int; 463 ev::sig sw_term, sw_int;
537 464
538 /* 465 /*
539 * Catch a fatal signal and tidy up before quitting 466 * Catch a fatal signal and tidy up before quitting
540 */ 467 */
541 void 468 void sig_term (ev::sig &w, int revents);
542 sig_term (sig_watcher &w) 469
470 sig_handlers ()
543 { 471 {
544 rxvt_emergency_cleanup (); 472 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
545 signal (w.signum, SIG_DFL);
546 kill (getpid (), w.signum);
547 }
548
549 sig_handlers ()
550 : sw_term (this, &sig_handlers::sig_term),
551 sw_int (this, &sig_handlers::sig_term) 473 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
552 {
553 } 474 }
554} sig_handlers; 475} sig_handlers;
555 476
477void
478sig_handlers::sig_term (ev::sig &w, int revents)
479{
480 rxvt_emergency_cleanup ();
481 w.stop ();
482 kill (getpid (), w.signum);
483}
484
485static void
486rxvt_get_ttymode (struct termios *tio)
487{
488 if (tcgetattr (STDIN_FILENO, tio) < 0)
489 memset (tio, 0, sizeof (struct termios));
490
491 for (int i = 0; i < NCCS; i++)
492 tio->c_cc[i] = VDISABLE;
493
494 tio->c_cc[VINTR] = CINTR;
495 tio->c_cc[VQUIT] = CQUIT;
496 tio->c_cc[VERASE] = CERASE;
497#ifdef VERASE2
498 tio->c_cc[VERASE2] = CERASE2;
499#endif
500 tio->c_cc[VKILL] = CKILL;
501 tio->c_cc[VEOF] = CEOF;
502 tio->c_cc[VSTART] = CSTART;
503 tio->c_cc[VSTOP] = CSTOP;
504 tio->c_cc[VSUSP] = CSUSP;
505# ifdef VDSUSP
506 tio->c_cc[VDSUSP] = CDSUSP;
507# endif
508# ifdef VREPRINT
509 tio->c_cc[VREPRINT] = CRPRNT;
510# endif
511# ifdef VDISCRD
512 tio->c_cc[VDISCRD] = CFLUSH;
513# endif
514# ifdef VWERSE
515 tio->c_cc[VWERSE] = CWERASE;
516# endif
517# ifdef VLNEXT
518 tio->c_cc[VLNEXT] = CLNEXT;
519# endif
520# ifdef VSTATUS
521 tio->c_cc[VSTATUS] = CSTATUS;
522# endif
523
524# if VMIN != VEOF
525 tio->c_cc[VMIN] = 1;
526# endif
527# if VTIME != VEOL
528 tio->c_cc[VTIME] = 0;
529# endif
530
531 /* input modes */
532 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
533# ifdef IMAXBEL
534 | IMAXBEL
535# endif
536 | IXON);
537
538 /* output modes */
539 tio->c_oflag = (OPOST | ONLCR);
540
541 /* control modes */
542 tio->c_cflag = (CS8 | CREAD);
543
544 /* local modes */
545 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
546# if defined (ECHOCTL) && defined (ECHOKE)
547 | ECHOCTL | ECHOKE
548# endif
549 | ECHOE | ECHOK);
550}
551
556char **rxvt_environ; // startup environment 552char **rxvt_environ; // startup environment
557 553
558void 554void
559rxvt_init () 555rxvt_init ()
560{ 556{
561 ptytty::init (); 557 assert (("fontMask must not overlap other RS masks",
558 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
559
560 rxvt_get_ttymode (&rxvt_term::def_tio);
561
562 // get rid of stdin/stdout as we don't need them, to free resources
563 dup2 (STDERR_FILENO, STDIN_FILENO);
564 dup2 (STDERR_FILENO, STDOUT_FILENO);
565
566 if (!ev_default_loop ())
567 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
562 568
563 rxvt_environ = environ; 569 rxvt_environ = environ;
564 570
565 signal (SIGHUP, SIG_IGN); 571 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN); 572 signal (SIGPIPE, SIG_IGN);
567 573
568 sig_handlers.sw_term.start (SIGTERM); 574 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
569 sig_handlers.sw_int.start (SIGINT); 575 sig_handlers.sw_int.start (SIGINT); ev_unref ();
570
571 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
572 /* signal (SIGURG, SIG_DFL); */
573 576
574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 577 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
575 // TODO: handle this with exceptions and tolerate the memory loss 578 // TODO: handle this with exceptions and tolerate the memory loss
576 XSetIOErrorHandler (rxvt_xioerror_handler); 579 XSetIOErrorHandler (rxvt_xioerror_handler);
577 580
578 XrmInitialize (); 581 XrmInitialize ();
579} 582}
580 583
581/* ------------------------------------------------------------------------- *
582 * MEMORY ALLOCATION WRAPPERS *
583 * ------------------------------------------------------------------------- */
584void *
585rxvt_malloc (size_t size)
586{
587 void *p = malloc (size);
588
589 if (!p)
590 rxvt_fatal ("memory allocation failure. aborting.\n");
591
592 return p;
593}
594
595void *
596rxvt_calloc (size_t number, size_t size)
597{
598 void *p = calloc (number, size);
599
600 if (!p)
601 rxvt_fatal ("memory allocation failure. aborting.\n");
602
603 return p;
604}
605
606void *
607rxvt_realloc (void *ptr, size_t size)
608{
609 void *p = realloc (ptr, size);
610
611 if (!p)
612 rxvt_fatal ("memory allocation failure. aborting.\n");
613
614 return p;
615}
616
617/*----------------------------------------------------------------------*/ 584/*----------------------------------------------------------------------*/
618/* 585/*
619 * window size/position calculcations for XSizeHint and other storage. 586 * window size/position calculations for XSizeHint and other storage.
620 * if width/height are non-zero then override calculated width/height 587 * if width/height are non-zero then override calculated width/height
621 */ 588 */
622void 589void
623rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 590rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
624{ 591{
625 short recalc_x, recalc_y; 592 short recalc_x, recalc_y;
626 int x, y, sb_w, flags; 593 int x, y, flags;
627 unsigned int w, h; 594 unsigned int w, h;
628 unsigned int max_width, max_height; 595 unsigned int max_width, max_height;
629 dDisp;
630 596
631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 597 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
632 szHint.win_gravity = NorthWestGravity; 598 szHint.win_gravity = NorthWestGravity;
633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 599 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
634 600
… …
642 if (rs[Rs_geometry]) 608 if (rs[Rs_geometry])
643 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 609 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
644 610
645 if (flags & WidthValue) 611 if (flags & WidthValue)
646 { 612 {
613 if (!w)
614 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
615
647 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 616 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
648 szHint.flags |= USSize; 617 szHint.flags |= USSize;
649 } 618 }
650 619
651 if (flags & HeightValue) 620 if (flags & HeightValue)
652 { 621 {
622 if (!h)
623 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
624
653 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 625 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
654 szHint.flags |= USSize; 626 szHint.flags |= USSize;
655 } 627 }
656 628
657 if (flags & XValue) 629 if (flags & XValue)
658 { 630 {
… …
689 max_width = MAX_COLS * fwidth; 661 max_width = MAX_COLS * fwidth;
690 max_height = MAX_ROWS * fheight; 662 max_height = MAX_ROWS * fheight;
691 663
692 szHint.base_width = szHint.base_height = 2 * int_bwidth; 664 szHint.base_width = szHint.base_height = 2 * int_bwidth;
693 665
694 sb_w = 0;
695 window_vt_x = window_vt_y = int_bwidth; 666 window_vt_x = window_vt_y = int_bwidth;
696 667
697 if (scrollBar.state) 668 if (scrollBar.state)
698 { 669 {
699 sb_w = scrollbar_TotalWidth (); 670 int sb_w = scrollBar.total_width ();
700 szHint.base_width += sb_w; 671 szHint.base_width += sb_w;
672
701 if (!OPTION (Opt_scrollBar_right)) 673 if (!option (Opt_scrollBar_right))
702 window_vt_x += sb_w; 674 window_vt_x += sb_w;
703 } 675 }
704 676
705 szHint.width_inc = fwidth; 677 szHint.width_inc = fwidth;
706 szHint.height_inc = fheight; 678 szHint.height_inc = fheight;
707 szHint.min_width = szHint.base_width + szHint.width_inc; 679 szHint.min_width = szHint.base_width + szHint.width_inc;
708 szHint.min_height = szHint.base_height + szHint.height_inc; 680 szHint.min_height = szHint.base_height + szHint.height_inc;
709 681
710 if (newwidth && newwidth - szHint.base_width < max_width) 682 if (newwidth && newwidth - szHint.base_width < max_width)
711 { 683 {
712 szHint.width = newwidth; 684 szHint.width = newwidth;
… …
727 { 699 {
728 min_it (height, max_height); 700 min_it (height, max_height);
729 szHint.height = szHint.base_height + height; 701 szHint.height = szHint.base_height + height;
730 } 702 }
731 703
732 if (scrollBar.state && OPTION (Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w;
734
735 if (recalc_x) 704 if (recalc_x)
736 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 705 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
706
737 if (recalc_y) 707 if (recalc_y)
738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
739 709
740 ncol = width / fwidth; 710 ncol = width / fwidth;
741 nrow = height / fheight; 711 nrow = height / fheight;
742} 712}
743 713
744/*----------------------------------------------------------------------*/ 714/*----------------------------------------------------------------------*/
745/* 715/*
… …
756 726
757 ws.ws_col = ncol; 727 ws.ws_col = ncol;
758 ws.ws_row = nrow; 728 ws.ws_row = nrow;
759 ws.ws_xpixel = width; 729 ws.ws_xpixel = width;
760 ws.ws_ypixel = height; 730 ws.ws_ypixel = height;
761 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 731 ioctl (pty->pty, TIOCSWINSZ, &ws);
762 732
763#if 0 733#if 0
764 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 734 // TIOCSWINSZ is supposed to do this automatically and correctly
765 if (cmd_pid) /* force through to the command */ 735 if (cmd_pid) /* force through to the command */
766 kill (-cmd_pid, SIGWINCH); 736 kill (-cmd_pid, SIGWINCH);
767#endif 737#endif
768} 738}
769 739
… …
796#endif 766#endif
797 767
798 delete fontset[0]; 768 delete fontset[0];
799 fontset[0] = fs; 769 fontset[0] = fs;
800 770
801 prop = (*fs)[1]->properties (); 771 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
802 prop.height += lineSpace; 772 prop.height += lineSpace;
773 prop.width += letterSpace;
774
803 fs->set_prop (prop); 775 fs->set_prop (prop, false);
804 776
805 fwidth = prop.width; 777 fwidth = prop.width;
806 fheight = prop.height; 778 fheight = prop.height;
807 fbase = prop.ascent; 779 fbase = prop.ascent;
808 780
… …
817 { 789 {
818 fontset[style] = fs = new rxvt_fontset (this); 790 fontset[style] = fs = new rxvt_fontset (this);
819 rxvt_fontprop prop2 = prop; 791 rxvt_fontprop prop2 = prop;
820 792
821 if (res) 793 if (res)
822 prop2.weight = prop2.slant = rxvt_fontprop::unset; 794 {
795 fs->populate (res);
796 fs->set_prop (prop2, false);
797 }
823 else 798 else
824 { 799 {
825 res = fontset[0]->fontdesc; 800 fs->populate (fontset[0]->fontdesc);
826 801
827 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 802 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
828 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 803 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
804
805 fs->set_prop (prop2, true);
829 } 806 }
830 807
831 fs->populate (res);
832 fs->set_prop (prop2);
833 } 808 }
834#else 809#else
835 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
836#endif 811#endif
837 } 812 }
… …
839 if (parent[0]) 814 if (parent[0])
840 { 815 {
841 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
842 scr_remap_chars (); 817 scr_remap_chars ();
843 scr_touch (true); 818 scr_touch (true);
844 } 819 }
845 820
846 return true; 821 return true;
847} 822}
848 823
824void
849void rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
850{ 826{
851 XChangeProperty (display->display, parent[0], 827 XChangeProperty (dpy, parent[0],
852 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
853 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
854} 830}
855 831
832void
833rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
834{
835 XTextProperty ct;
836
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 {
839 XSetTextProperty (dpy, parent[0], &ct, prop);
840 XFree (ct.value);
841 }
842}
843
844void
856void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
857{ 846{
858 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
859 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
860 849
861 XChangeProperty (display->display, parent[0], 850 XChangeProperty (dpy, parent[0],
862 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
863 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
864 853
865 free (s); 854 free (s);
866 free (ws); 855 free (ws);
… …
870/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
871/* xterm sequences - title, iconName, color (exptl) */ 860/* xterm sequences - title, iconName, color (exptl) */
872void 861void
873rxvt_term::set_title (const char *str) 862rxvt_term::set_title (const char *str)
874{ 863{
875 set_string_property (XA_WM_NAME, str); 864 set_mbstring_property (XA_WM_NAME, str);
876#if ENABLE_EWMH 865#if ENABLE_EWMH
877 set_utf8_property (xa[XA_NET_WM_NAME], str); 866 set_utf8_property (xa[XA_NET_WM_NAME], str);
878#endif 867#endif
879} 868}
880 869
881void 870void
882rxvt_term::set_icon_name (const char *str) 871rxvt_term::set_icon_name (const char *str)
883{ 872{
884 set_string_property (XA_WM_ICON_NAME, str); 873 set_mbstring_property (XA_WM_ICON_NAME, str);
885#if ENABLE_EWMH 874#if ENABLE_EWMH
886 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 875 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
887#endif 876#endif
888} 877}
889 878
879void
880rxvt_term::set_window_color (int idx, const char *color)
881{
890#ifdef XTERM_COLOR_CHANGE 882#ifdef XTERM_COLOR_CHANGE
891void
892rxvt_term::set_window_color (int idx, const char *color)
893{
894 rxvt_color xcol; 883 rxvt_color xcol;
895 int i;
896 884
897 if (color == NULL || *color == '\0') 885 if (color == NULL || *color == '\0')
898 return; 886 return;
899 887
888 color = strdup (color);
889 allocated.push_back ((void *)color);
890 rs[Rs_color + idx] = color;
891
900 /* handle color aliases */ 892 /* handle color aliases */
901 if (isdigit (*color)) 893 if (isdigit (*color))
902 { 894 {
903 i = atoi (color); 895 int i = atoi (color);
904 896
905 if (i >= 8 && i <= 15) 897 if (i >= 8 && i <= 15)
898 {
906 { /* bright colors */ 899 /* bright colors */
907 i -= 8;
908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 900 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
909 SET_PIXCOLOR (idx);
910 goto done; 901 goto done;
911 } 902 }
912 903
913 if (i >= 0 && i <= 7) 904 if (i >= 0 && i <= 7)
905 {
914 { /* normal colors */ 906 /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 907 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 SET_PIXCOLOR (idx);
917 goto done; 908 goto done;
918 } 909 }
919 } 910 }
920 911
921 if (!rXParseAllocColor (&xcol, color)) 912 set_color (xcol, color);
922 return;
923
924 /* XStoreColor (display->display, display->cmap, XColor*); */
925 913
926 /* 914 /*
927 * FIXME: should free colors here, but no idea how to do it so instead, 915 * FIXME: should free colors here, but no idea how to do it so instead,
928 * so just keep gobbling up the colormap 916 * so just keep gobbling up the colormap
929 */ 917 */
930# if 0
931 for (i = Color_Black; i <= Color_White; i++)
932 if (pix_colors[idx] == pix_colors[i])
933 break;
934 if (i > Color_White)
935 {
936 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
937 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
938 DisplayPlanes (display->display, display->screen));
939 }
940# endif
941 918
942 pix_colors_focused[idx] = xcol; 919 pix_colors_focused[idx] = xcol;
943 SET_PIXCOLOR (idx);
944 920
945 /* XSetWindowAttributes attr; */
946 /* Cursor cursor; */
947done: 921done:
948
949#if OFF_FOCUS_FADING
950 if (rs[Rs_fade])
951 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
952#endif
953
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 922 /*TODO: handle Color_BD, scrollbar background, etc. */
955 923
924 update_fade_color (idx);
956 recolour_cursor (); 925 recolour_cursor ();
957 scr_recolour (); 926 scr_recolour ();
927#endif /* XTERM_COLOR_CHANGE */
958} 928}
959
960#else
961# define set_window_color (idx,color) ((void)0)
962#endif /* XTERM_COLOR_CHANGE */
963 929
964void 930void
965rxvt_term::recolour_cursor () 931rxvt_term::recolour_cursor ()
966{ 932{
967 XColor xcol[2]; 933 XColor fg, bg;
968 934
969 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 935 (ISSET_PIXCOLOR (Color_pointer_fg)
970 ? pix_colors_focused[Color_pointer_fg] 936 ? pix_colors_focused[Color_pointer_fg]
971 : pix_colors_focused[Color_fg]; 937 : pix_colors_focused[Color_fg]).get (fg);
938
972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 939 (ISSET_PIXCOLOR (Color_pointer_bg)
973 ? pix_colors_focused[Color_pointer_bg] 940 ? pix_colors_focused[Color_pointer_bg]
974 : pix_colors_focused[Color_bg]; 941 : pix_colors_focused[Color_bg]).get (bg);
975 942
976 XQueryColors (display->display, display->cmap, xcol, 2); 943 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
977 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
978} 944}
979 945
980/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
981/* 947/*
982 * find if fg/bg matches any of the normal (low-intensity) colors 948 * find if fg/bg matches any of the normal (low-intensity) colors
983 */ 949 */
984void 950void
985rxvt_term::set_colorfgbg () 951rxvt_term::set_colorfgbg ()
986{ 952{
987 unsigned int i; 953 unsigned int i;
988 const char *xpmb = "\0"; 954 const char *xpmb = "";
989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
990 957
991 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default");
993 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 959 if (pix_colors[Color_fg] == pix_colors[i])
996 { 960 {
997 sprintf (fstr, "%d", (i - Color_Black)); 961 sprintf (fstr, "%d", i - Color_Black);
998 break; 962 break;
999 } 963 }
1000 964
1001 for (i = Color_Black; i <= Color_White; i++) 965 for (i = Color_Black; i <= Color_White; i++)
1002 if (pix_colors[Color_bg] == pix_colors[i]) 966 if (pix_colors[Color_bg] == pix_colors[i])
1003 { 967 {
1004 sprintf (bstr, "%d", (i - Color_Black)); 968 sprintf (bstr, "%d", i - Color_Black);
1005#ifdef XPM_BACKGROUND 969#ifdef BG_IMAGE_FROM_FILE
1006 xpmb = "default;"; 970 xpmb = "default;";
1007#endif 971#endif
1008 break; 972 break;
1009 } 973 }
1010 974
1011 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 975 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1012} 976}
1013 977
1014/*----------------------------------------------------------------------*/ 978/*----------------------------------------------------------------------*/
1015 979
1016int 980bool
1017rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 981rxvt_term::set_color (rxvt_color &color, const char *name)
1018{ 982{
1019 if (!screen_in_out->set (display, colour)) 983 if (color.set (this, name))
1020 {
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1022 return false;
1023 }
1024
1025 return true; 984 return true;
985
986 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
987 return false;
988}
989
990void
991rxvt_term::alias_color (int dst, int src)
992{
993 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1026} 994}
1027 995
1028/* -------------------------------------------------------------------- * 996/* -------------------------------------------------------------------- *
1029 * - WINDOW RESIZING - * 997 * - WINDOW RESIZING - *
1030 * -------------------------------------------------------------------- */ 998 * -------------------------------------------------------------------- */
… …
1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1000rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1033{ 1001{
1034 int fix_screen; 1002 int fix_screen;
1035 int old_width = szHint.width; 1003 int old_width = szHint.width;
1036 int old_height = szHint.height; 1004 int old_height = szHint.height;
1037 dDisp;
1038 1005
1039 window_calc (newwidth, newheight); 1006 window_calc (newwidth, newheight);
1007
1008 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1009
1010 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1011 if (set_hint)
1012 {
1013 szHint.flags &= ~(PBaseSize | PResizeInc);
1040 XSetWMNormalHints (disp, parent[0], &szHint); 1014 XSetWMNormalHints (dpy, parent[0], &szHint);
1015 szHint.flags |= PBaseSize | PResizeInc;
1016 }
1041 1017
1042 if (!ignoreparent) 1018 if (!ignoreparent)
1043 { 1019 {
1044#ifdef SMART_RESIZE 1020#ifdef SMART_RESIZE
1045 /* 1021 /*
… …
1049 int x, y, x1, y1; 1025 int x, y, x1, y1;
1050 int dx, dy; 1026 int dx, dy;
1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1027 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1052 Window unused_cr; 1028 Window unused_cr;
1053 1029
1054 XTranslateCoordinates (disp, parent[0], display->root, 1030 XTranslateCoordinates (dpy, parent[0], display->root,
1055 0, 0, &x, &y, &unused_cr); 1031 0, 0, &x, &y, &unused_cr);
1056 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1032 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1033 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1058 /* 1034 /*
1059 * if display->root isn't the parent window, a WM will probably have offset 1035 * if display->root isn't the parent window, a WM will probably have offset
1060 * our position for handles and decorations. Counter it 1036 * our position for handles and decorations. Counter it
1061 */ 1037 */
… …
1063 { 1039 {
1064 x -= x1; 1040 x -= x1;
1065 y -= y1; 1041 y -= y1;
1066 } 1042 }
1067 1043
1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1044 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1045 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1070 dx = old_width - szHint.width; 1046 dx = old_width - szHint.width;
1071 dy = old_height - szHint.height; 1047 dy = old_height - szHint.height;
1072 1048
1073 /* Check position of the center of the window */ 1049 /* Check position of the center of the window */
1074 if (x < x1) /* left half */ 1050 if (x < x1) /* left half */
… …
1078 if (y < y1) /* top half */ 1054 if (y < y1) /* top half */
1079 dy = 0; 1055 dy = 0;
1080 else if (y == y1) /* exact center */ 1056 else if (y == y1) /* exact center */
1081 dy /= 2; 1057 dy /= 2;
1082 1058
1083 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1059 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1084 szHint.width, szHint.height); 1060 szHint.width, szHint.height);
1085#else 1061#else
1086 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1062 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1087#endif 1063#endif
1088 } 1064 }
1065
1066 if (set_hint)
1067 XSetWMNormalHints (dpy, parent[0], &szHint);
1089 1068
1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1091 1070
1092 if (fix_screen || newwidth != old_width || newheight != old_height) 1071 if (fix_screen || newwidth != old_width || newheight != old_height)
1093 { 1072 {
1094 if (scrollBar.state) 1073 if (scrollBar.state)
1095 { 1074 scrollBar.resize ();
1096 XMoveResizeWindow (disp, scrollBar.win,
1097 window_sb_x, 0,
1098 scrollbar_TotalWidth (), szHint.height);
1099 resize_scrollbar ();
1100 }
1101 1075
1102 XMoveResizeWindow (disp, vt, 1076 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1077 window_vt_x, window_vt_y,
1104 width, height); 1078 width, height);
1105 1079
1106 scr_clear (); 1080#ifdef HAVE_BG_PIXMAP
1107#ifdef XPM_BACKGROUND 1081 if (bg_window_size_sensitive ())
1108 resize_pixmap (); 1082 update_background ();
1109#endif 1083#endif
1110 } 1084 }
1111 1085
1112 if (fix_screen || old_height == 0) 1086 if (fix_screen || old_height == 0)
1113 scr_reset (); 1087 scr_reset ();
1114 1088
1115#ifdef XPM_BACKGROUND
1116 if (pixmap)
1117 scr_touch (false);
1118#endif
1119
1120#ifdef USE_XIM 1089#ifdef USE_XIM
1121 IMSetStatusPosition (); 1090 IMSetPosition ();
1122#endif 1091#endif
1123} 1092}
1124 1093
1125/* 1094/*
1126 * Set the width/height of the vt window in characters. Units are pixels. 1095 * Set the width/height of the vt window in characters. Units are pixels.
… …
1131{ 1100{
1132 XWindowAttributes wattr; 1101 XWindowAttributes wattr;
1133 1102
1134 if (newwidth == 0 || newheight == 0) 1103 if (newwidth == 0 || newheight == 0)
1135 { 1104 {
1136 XGetWindowAttributes (display->display, display->root, &wattr); 1105 XGetWindowAttributes (dpy, display->root, &wattr);
1137 1106
1138 if (newwidth == 0) 1107 if (newwidth == 0)
1139 newwidth = wattr.width - szHint.base_width; 1108 newwidth = wattr.width - szHint.base_width;
1140 if (newheight == 0) 1109 if (newheight == 0)
1141 newheight = wattr.height - szHint.base_height; 1110 newheight = wattr.height - szHint.base_height;
… …
1155#ifdef USE_XIM 1124#ifdef USE_XIM
1156 1125
1157void 1126void
1158rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1127rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1159{ 1128{
1160 fg = pix_colors[Color_fg]; 1129 fg = pix_colors [Color_fg];
1161 bg = pix_colors[Color_bg]; 1130 bg = pix_colors [Color_bg];
1162} 1131}
1163 1132
1164void 1133void
1165rxvt_term::im_set_size (XRectangle &size) 1134rxvt_term::im_set_size (XRectangle &size)
1166{ 1135{
… …
1189 1158
1190/* Checking whether input method is running. */ 1159/* Checking whether input method is running. */
1191bool 1160bool
1192rxvt_term::IMisRunning () 1161rxvt_term::IMisRunning ()
1193{ 1162{
1194 char *p;
1195 Atom atom; 1163 Atom atom;
1196 Window win; 1164 Window win;
1197 char server[IMBUFSIZ]; 1165 char server[IMBUFSIZ];
1198 1166
1199 /* get current locale modifier */ 1167 /* get current locale modifier */
1200 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1168 if (char *p = XSetLocaleModifiers (0))
1201 { 1169 {
1202 strcpy (server, "@server="); 1170 strcpy (server, "@server=");
1203 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1171 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1204 1172
1205 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1173 if (p = strchr (server + 1, '@')) /* first one only */
1206 *p = '\0'; 1174 *p = '\0';
1207 1175
1208 atom = XInternAtom (display->display, server, False); 1176 atom = XInternAtom (dpy, server, False);
1209 win = XGetSelectionOwner (display->display, atom); 1177 win = XGetSelectionOwner (dpy, atom);
1210 1178
1211 if (win != None) 1179 if (win != None)
1212 return True; 1180 return True;
1213 } 1181 }
1214 1182
… …
1277 1245
1278 term->make_current (); 1246 term->make_current ();
1279 1247
1280 if (text) 1248 if (text)
1281 { 1249 {
1282 void *str; 1250 wchar_t *str;
1283 1251
1284 if (!text->encoding_is_wchar && text->string.multi_byte) 1252 if (!text->encoding_is_wchar && text->string.multi_byte)
1285 { 1253 {
1286 // of course, X makes it ugly again 1254 // of course, X makes it ugly again
1287 if (term->rs[Rs_imLocale]) 1255 if (term->rs[Rs_imLocale])
1288 SET_LOCALE (term->rs[Rs_imLocale]); 1256 SET_LOCALE (term->rs[Rs_imLocale]);
1289 1257
1290 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1258 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1291 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1259 mbstowcs (str, text->string.multi_byte, text->length + 1);
1292 1260
1293 if (term->rs[Rs_imLocale]) 1261 if (term->rs[Rs_imLocale])
1294 SET_LOCALE (term->locale); 1262 SET_LOCALE (term->locale);
1295 } 1263 }
1296 else 1264 else
1297 str = (void *)text->string.wide_char; 1265 str = text->string.wide_char;
1298 1266
1299 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1267 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1300 DT_INT, call_data->caret, 1268 DT_INT, call_data->caret,
1301 DT_INT, call_data->chg_first, 1269 DT_INT, call_data->chg_first,
1302 DT_INT, call_data->chg_length, 1270 DT_INT, call_data->chg_length,
1303 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1271 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1373 p = pet[pi]; 1341 p = pet[pi];
1374 1342
1375 if (!p) 1343 if (!p)
1376 continue; 1344 continue;
1377 1345
1378 s = rxvt_splitcommastring (p); 1346 s = rxvt_strsplit (',', p);
1379 1347
1380 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1381 { 1349 {
1382 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1383 input_style = XIMPreeditPosition | XIMStatusNothing; 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1395 input_style = XIMPreeditNothing | XIMStatusNothing; 1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1396 1364
1397 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1398 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1399 { 1367 {
1400 rxvt_freecommastring (s); 1368 rxvt_free_strsplit (s);
1401 1369
1402 found = 1; 1370 found = 1;
1403 goto foundpet; 1371 goto foundpet;
1404 } 1372 }
1405 1373
1406 } 1374 }
1407 1375
1408 rxvt_freecommastring (s); 1376 rxvt_free_strsplit (s);
1409 } 1377 }
1410 1378
1411foundpet: 1379foundpet:
1412 1380
1413 XFree (xim_styles); 1381 XFree (xim_styles);
… …
1438 "*", 1406 "*",
1439 fheight, 1407 fheight,
1440 fheight + 1, fheight - 1, 1408 fheight + 1, fheight - 1,
1441 fheight - 2, fheight + 2); 1409 fheight - 2, fheight + 2);
1442 1410
1443 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1411 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1444 &missing_charset_list, &missing_charset_count, &def_string); 1412 &missing_charset_list, &missing_charset_count, &def_string);
1445 1413
1446 if (missing_charset_list) 1414 if (missing_charset_list)
1447 XFreeStringList (missing_charset_list); 1415 XFreeStringList (missing_charset_list);
1448 1416
… …
1489 XNBackground, bg, 1457 XNBackground, bg,
1490 XNArea, &status_rect, 1458 XNArea, &status_rect,
1491 XNFontSet, fs, 1459 XNFontSet, fs,
1492 NULL); 1460 NULL);
1493 } 1461 }
1462#if ENABLE_XIM_ONTHESPOT
1494 else if (input_style & XIMPreeditCallbacks) 1463 else if (input_style & XIMPreeditCallbacks)
1495 { 1464 {
1496 im_set_position (spot); 1465 im_set_position (spot);
1497 1466
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1467 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1468 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1469 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0 1470# if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1471 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif 1472# endif
1504 1473
1505 preedit_attr = XVaCreateNestedList (0, 1474 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot, 1475 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0], 1476 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1], 1477 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2], 1478 XNPreeditDrawCallback , &xcb[2],
1510#if 0 1479# if 0
1511 XNPreeditCaretCallback, &xcb[3], 1480 XNPreeditCaretCallback, &xcb[3],
1512#endif 1481# endif
1513 NULL); 1482 NULL);
1514 } 1483 }
1484#endif
1515 1485
1516 Input_Context = XCreateIC (xim, 1486 Input_Context = XCreateIC (xim,
1517 XNInputStyle, input_style, 1487 XNInputStyle, input_style,
1518 XNClientWindow, vt, 1488 XNClientWindow, vt,
1519 XNFocusWindow, parent[0], 1489 XNFocusWindow, parent[0],
… …
1521 preedit_attr, 1491 preedit_attr,
1522 status_attr ? XNStatusAttributes : NULL, 1492 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1493 status_attr, NULL);
1524 1494
1525 if (preedit_attr) XFree (preedit_attr); 1495 if (preedit_attr) XFree (preedit_attr);
1526 if (status_attr) XFree (status_attr); 1496 if (status_attr) XFree (status_attr);
1527 if (fs) XFreeFontSet (display->display, fs); 1497 if (fs) XFreeFontSet (dpy, fs);
1528 1498
1529 if (Input_Context == NULL) 1499 if (Input_Context == NULL)
1530 { 1500 {
1531 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1501 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1532 im_destroy (); 1502 im_destroy ();
… …
1537 // unfortunately, only the focus window is used by XIM, hard to fix 1507 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1508 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input (); 1509 vt_select_input ();
1540#endif 1510#endif
1541 1511
1542 if (input_style & XIMPreeditArea)
1543 IMSetStatusPosition (); 1512 IMSetPosition ();
1544 1513
1545 return true; 1514 return true;
1546} 1515}
1547 1516
1548void 1517void
… …
1568 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1569 if (p && *p) 1538 if (p && *p)
1570 { 1539 {
1571 bool found = false; 1540 bool found = false;
1572 1541
1573 s = rxvt_splitcommastring (p); 1542 s = rxvt_strsplit (',', p);
1574 1543
1575 for (i = 0; s[i]; i++) 1544 for (i = 0; s[i]; i++)
1576 { 1545 {
1577 if (*s[i]) 1546 if (*s[i])
1578 { 1547 {
… …
1584 break; 1553 break;
1585 } 1554 }
1586 } 1555 }
1587 } 1556 }
1588 1557
1589 rxvt_freecommastring (s); 1558 rxvt_free_strsplit (s);
1590 1559
1591 if (found) 1560 if (found)
1592 goto done; 1561 goto done;
1593 } 1562 }
1594 1563
… …
1606 SET_LOCALE (locale); 1575 SET_LOCALE (locale);
1607#endif 1576#endif
1608} 1577}
1609 1578
1610void 1579void
1611rxvt_term::IMSetStatusPosition () 1580rxvt_term::IMSetPosition ()
1612{ 1581{
1613 XRectangle preedit_rect, status_rect, *needed_rect; 1582 XRectangle preedit_rect, status_rect, *needed_rect;
1614 XVaNestedList preedit_attr, status_attr; 1583 XVaNestedList preedit_attr, status_attr;
1615 1584
1616 if (!Input_Context 1585 if (!Input_Context
1617 || !focus 1586 || !focus
1618 || !(input_style & XIMPreeditArea) 1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1619 || !IMisRunning ()) 1588 || !IMisRunning ())
1620 return; 1589 return;
1621 1590
1591 if (input_style & XIMPreeditPosition)
1592 {
1593 im_set_size (preedit_rect);
1594 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1595
1596 XSetICValues (Input_Context,
1597 XNPreeditAttributes, preedit_attr, NULL);
1598 }
1599 else
1600 {
1622 /* Getting the necessary width of preedit area */ 1601 /* Getting the necessary width of preedit area */
1623 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1602 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1624 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1603 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1625 XFree (status_attr); 1604 XFree (status_attr);
1626 1605
1627 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1606 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1628 XFree (needed_rect); 1607 XFree (needed_rect);
1629 1608
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1609 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1610 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1632 1611
1633 XSetICValues (Input_Context, 1612 XSetICValues (Input_Context,
1634 XNPreeditAttributes, preedit_attr, 1613 XNPreeditAttributes, preedit_attr,
1635 XNStatusAttributes, status_attr, NULL); 1614 XNStatusAttributes, status_attr,
1615 NULL);
1636 1616
1617 XFree (status_attr);
1618 }
1619
1637 XFree (preedit_attr); 1620 XFree (preedit_attr);
1638 XFree (status_attr);
1639} 1621}
1640#endif /* USE_XIM */ 1622#endif /* USE_XIM */
1623
1624void
1625rxvt_term::get_window_origin (int &x, int &y)
1626{
1627 Window cr;
1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1629}
1630
1631Pixmap
1632rxvt_term::get_pixmap_property (Atom property)
1633{
1634 Pixmap pixmap = None;
1635
1636 int aformat;
1637 unsigned long nitems, bytes_after;
1638 Atom atype;
1639 unsigned char *prop;
1640 int result = XGetWindowProperty (dpy, display->root, property,
1641 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1642 &nitems, &bytes_after, &prop);
1643 if (result == Success)
1644 {
1645 if (atype == XA_PIXMAP)
1646 pixmap = *(Pixmap *)prop;
1647 XFree (prop);
1648 }
1649
1650 return pixmap;
1651}
1652
1653#ifdef HAVE_BG_PIXMAP
1654
1655void
1656rxvt_term::update_background ()
1657{
1658 if (update_background_ev.is_active ())
1659 return;
1660
1661 bg_invalidate ();
1662
1663 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1664
1665 if (to_wait <= 0.)
1666 bg_render ();
1667 else
1668 update_background_ev.start (to_wait);
1669}
1670
1671void
1672rxvt_term::update_background_cb (ev::timer &w, int revents)
1673{
1674 make_current ();
1675
1676 update_background_ev.stop ();
1677 bg_render ();
1678 refresh_check ();
1679}
1680
1681#endif /* HAVE_BG_PIXMAP */
1641 1682
1642/*----------------------- end-of-file (C source) -----------------------*/ 1683/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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