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.193 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.337 by root, Tue Dec 7 19:10:00 2010 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-2008 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 { 111 {
101 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
102 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
103 } 114 }
… …
142 153
143} 154}
144#endif 155#endif
145 156
146rxvt_term::rxvt_term () 157rxvt_term::rxvt_term ()
147 : 158{
148#if TRANSPARENT 159#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 160 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 161#endif
154#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 163 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 164#endif
157#ifdef TEXT_BLINK 165#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 166 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 167#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 169 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 170#endif
163#ifdef SELECTION_SCROLLING 171#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 172 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 173#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 175 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
176#endif
177#if ENABLE_TRANSPARENCY || ENABLE_PERL
178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
179#endif
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#ifdef USE_XIM
182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 183#endif
169#ifdef POINTER_BLANK 184#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 186#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 187#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 188 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 189#endif
178 termwin_ev (this, &rxvt_term::x_cb), 190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 197
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 199
189 termlist.push_back (this); 200 termlist.push_back (this);
190 201
191#ifdef KEYSYM_RESOURCE 202#ifdef KEYSYM_RESOURCE
… …
193#endif 204#endif
194} 205}
195 206
196// clean up the most important stuff, do *not* call x or free mem etc. 207// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 208// for use before an emergency exit
209void
198void rxvt_term::emergency_cleanup () 210rxvt_term::emergency_cleanup ()
199{ 211{
200 if (cmd_pid) 212 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 213 kill (-cmd_pid, SIGHUP);
202 214
215 pty_ev.stop ();
203 delete pty; pty = 0; 216 delete pty; pty = 0;
204} 217}
205 218
206rxvt_term::~rxvt_term () 219rxvt_term::~rxvt_term ()
207{ 220{
… …
214 if (fontset[i] != fontset[0]) 227 if (fontset[i] != fontset[0])
215 delete fontset[i]; 228 delete fontset[i];
216#endif 229#endif
217 delete fontset[0]; 230 delete fontset[0];
218 231
232#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif
241
219 if (display) 242 if (display)
220 { 243 {
221 dDisp;
222
223 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
224 246
225#ifdef USE_XIM 247#ifdef USE_XIM
226 im_destroy (); 248 im_destroy ();
227#endif 249#endif
228#ifdef XTERM_SCROLLBAR 250 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); 251 if (gc) XFreeGC (dpy, gc);
253 252
254 delete drawable; 253 delete drawable;
255 // destroy all windows 254 // destroy all windows
256 if (parent[0]) 255 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (dpy, parent[0]);
258 }
259 257
260 // TODO: free pixcolours, colours should become part of rxvt_display 258 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 259 if (ISSET_PIXCOLOR (i))
260 {
261 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 263 pix_colors_unfocused [i].free (this);
264#endif 264#endif
265 }
265 266
267 clear ();
268
269 display->flush (); /* ideally .put should do this */
266 displays.put (display); 270 displays.put (display);
271 }
267 272
268 scr_release (); 273 scr_release ();
269 274
270 /* clear all resources */ 275 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 277 free (allocated [i]);
273 278
274 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
275 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 282 free (env_display);
278 free (env_term); 283 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 284 free (locale);
281 free (v_buffer); 285 free (v_buffer);
282 free (incr_buf); 286 free (incr_buf);
283 287
284 delete envv; 288 delete envv;
285 delete argv; 289 delete argv;
286 290
287#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
288 delete keyboard; 292 delete keyboard;
289#endif 293#endif
294#ifndef NO_RESOURCES
295 XrmDestroyDatabase (option_db);
296#endif
290} 297}
291 298
292// child has exited, usually destroys 299// child has exited, usually destroys
293void 300void
294rxvt_term::child_cb (child_watcher &w, int status) 301rxvt_term::child_cb (ev::child &w, int status)
295{ 302{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 304
298 cmd_pid = 0; 305 cmd_pid = 0;
299 306
300 if (!OPTION (Opt_hold)) 307 if (!option (Opt_hold))
301 destroy (); 308 destroy ();
302} 309}
303 310
304void 311void
305rxvt_term::destroy () 312rxvt_term::destroy ()
306{ 313{
307 if (destroy_ev.active) 314 if (destroy_ev.is_active ())
308 return; 315 return;
309 316
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 318
313#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
314 scr_overlay_off (); 320 scr_overlay_off ();
315#endif 321#endif
316 322
317 if (display) 323 if (display)
318 { 324 {
319#if USE_XIM 325#if USE_XIM
320 im_ev.stop (display); 326 im_ev.stop (display);
321#endif 327#endif
322#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
324#endif 329#if ENABLE_TRANSPARENCY || ENABLE_PERL
325#if TRANSPARENT
326 rootwin_ev.stop (display); 330 rootwin_ev.stop (display);
327#endif 331#endif
328 incr_ev.stop (); 332 incr_ev.stop ();
329 termwin_ev.stop (display); 333 termwin_ev.stop (display);
330 vt_ev.stop (display); 334 vt_ev.stop (display);
331 } 335 }
332 336
333 check_ev.stop (); 337 flush_ev.stop ();
334 pty_ev.stop (); 338 pty_ev.stop ();
335#ifdef CURSOR_BLINK 339#ifdef CURSOR_BLINK
336 cursor_blink_ev.stop (); 340 cursor_blink_ev.stop ();
337#endif 341#endif
338#ifdef TEXT_BLINK 342#ifdef TEXT_BLINK
… …
346#endif 350#endif
347#ifdef POINTER_BLANK 351#ifdef POINTER_BLANK
348 pointer_ev.stop (); 352 pointer_ev.stop ();
349#endif 353#endif
350 354
351 destroy_ev.start (0); 355 destroy_ev.start ();
352} 356}
353 357
354void 358void
355rxvt_term::destroy_cb (time_watcher &w) 359rxvt_term::destroy_cb (ev::idle &w, int revents)
356{ 360{
357 make_current (); 361 make_current ();
358 362
359 delete this; 363 delete this;
364}
365
366void
367rxvt_term::set_option (uint8_t opt, bool set)
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 ? 0 : mask);
360} 376}
361 377
362/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
363/* 379/*
364 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
371{ 387{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
374} 390}
375 391
376#if ENABLE_FRILLS 392#if !ENABLE_MINIMAL
377static void 393static void
378print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
379{ 395{
380 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
382 char number[32]; 398 char number[32];
383 char *mtype = "XlibMessage"; 399 char *mtype = "XlibMessage";
384 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
385 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
386 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 402 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
387 rxvt_warn ("%s: %s\n", mesg, buffer); 403 rxvt_warn ("%s: %s\n", mesg, buffer);
388 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
389 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
390 sprintf(number, "%d", event->request_code); 406 sprintf(number, "%d", event->request_code);
391 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
392 rxvt_warn ("(which is %s)\n", buffer); 408 rxvt_warn ("(which is %s)\n", buffer);
393 if (event->request_code >= 128) { 409 if (event->request_code >= 128) {
394 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
395 mesg, BUFSIZ); 411 mesg, BUFSIZ);
396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
397 } 413 }
398 if ((event->error_code == BadWindow) || 414 if ((event->error_code == BadWindow) ||
399 (event->error_code == BadPixmap) || 415 (event->error_code == BadPixmap) ||
400 (event->error_code == BadCursor) || 416 (event->error_code == BadCursor) ||
401 (event->error_code == BadFont) || 417 (event->error_code == BadFont) ||
402 (event->error_code == BadDrawable) || 418 (event->error_code == BadDrawable) ||
403 (event->error_code == BadColor) || 419 (event->error_code == BadColor) ||
404 (event->error_code == BadGC) || 420 (event->error_code == BadGC) ||
405 (event->error_code == BadIDChoice) || 421 (event->error_code == BadIDChoice) ||
406 (event->error_code == BadValue) || 422 (event->error_code == BadValue) ||
407 (event->error_code == BadAtom)) { 423 (event->error_code == BadAtom)) {
408 if (event->error_code == BadValue) 424 if (event->error_code == BadValue)
409 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
410 mesg, BUFSIZ); 426 mesg, BUFSIZ);
411 else if (event->error_code == BadAtom) 427 else if (event->error_code == BadAtom)
412 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
413 mesg, BUFSIZ); 429 mesg, BUFSIZ);
414 else 430 else
415 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
416 mesg, BUFSIZ); 432 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
418 } 434 }
419 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
420 mesg, BUFSIZ); 436 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
422} 438}
423#endif 439#endif
424 440
425int 441int
… …
429 GET_R->allowedxerror = event->error_code; 445 GET_R->allowedxerror = event->error_code;
430 else 446 else
431 { 447 {
432 // GET_R is most likely not the terminal which caused the error, 448 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 449 // so just output the error and continue
434#if ENABLE_FRILLS 450#if ENABLE_MINIMAL
451 old_xerror_handler (display, event);
452#else
435 print_x_error (display, event); 453 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 454#endif
439 } 455 }
440 456
441 return 0; 457 return 0;
442} 458}
… …
448 DisplayString (display)); 464 DisplayString (display));
449 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
450 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
451} 467}
452 468
453/*----------------------------------------------------------------------*/
454bool
455rxvt_term::init (int argc, const char *const *argv)
456{
457 SET_R (this);
458 set_locale ("");
459 set_environ (envv); // few things in X do not call setlocale :(
460
461 if (!init_vars ())
462 return false;
463
464 init_secondary ();
465
466 const char **cmd_argv = init_resources (argc, argv);
467
468#ifdef KEYSYM_RESOURCE
469 keyboard->register_done ();
470#endif
471
472#ifdef HAVE_SCROLLBARS
473 if (OPTION (Opt_scrollBar))
474 scrollBar.setIdle (); /* set existence for size calculations */
475#endif
476
477 pty = rxvt_new_ptytty ();
478
479 create_windows (argc, argv);
480
481 dDisp;
482
483 init_xlocale ();
484
485 scr_reset (); // initialize screen
486
487#if 0
488 XSynchronize (disp, True);
489#endif
490
491#ifdef HAVE_SCROLLBARS
492 if (OPTION (Opt_scrollBar))
493 resize_scrollbar (); /* create and map scrollbar */
494#endif
495#ifdef TRANSPARENT
496 if (OPTION (Opt_transparent))
497 {
498 XSelectInput (disp, display->root, PropertyChangeMask);
499 check_our_parents ();
500 rootwin_ev.start (display, display->root);
501 }
502#endif
503
504 set_colorfgbg ();
505
506 init_command (cmd_argv);
507
508 free (cmd_argv);
509
510 if (pty->pty >= 0)
511 pty_ev.start (pty->pty, EVENT_READ);
512
513 check_ev.start ();
514
515 HOOK_INVOKE ((this, HOOK_START, DT_END));
516
517 XMapWindow (disp, vt);
518 XMapWindow (disp, parent[0]);
519
520 return true;
521}
522
523static struct sig_handlers 469static struct sig_handlers
524{ 470{
525 sig_watcher sw_term, sw_int; 471 ev::sig sw_term, sw_int;
526 472
527 /* 473 /*
528 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
529 */ 475 */
530 void 476 void sig_term (ev::sig &w, int revents);
531 sig_term (sig_watcher &w) 477
478 sig_handlers ()
532 { 479 {
533#ifdef DEBUG_CMD 480 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
534 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
535#endif
536 rxvt_emergency_cleanup ();
537 signal (w.signum, SIG_DFL);
538 kill (getpid (), w.signum);
539 }
540
541 sig_handlers ()
542 : sw_term (this, &sig_handlers::sig_term),
543 sw_int (this, &sig_handlers::sig_term) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
544 {
545 } 482 }
546} sig_handlers; 483} sig_handlers;
547 484
485void
486sig_handlers::sig_term (ev::sig &w, int revents)
487{
488 rxvt_emergency_cleanup ();
489 w.stop ();
490 kill (getpid (), w.signum);
491}
492
493static void
494rxvt_get_ttymode (struct termios *tio)
495{
496 if (tcgetattr (STDIN_FILENO, tio) < 0)
497 memset (tio, 0, sizeof (struct termios));
498
499 for (int i = 0; i < NCCS; i++)
500 tio->c_cc[i] = VDISABLE;
501
502 tio->c_cc[VINTR] = CINTR;
503 tio->c_cc[VQUIT] = CQUIT;
504 tio->c_cc[VERASE] = CERASE;
505#ifdef VERASE2
506 tio->c_cc[VERASE2] = CERASE2;
507#endif
508 tio->c_cc[VKILL] = CKILL;
509 tio->c_cc[VEOF] = CEOF;
510 tio->c_cc[VSTART] = CSTART;
511 tio->c_cc[VSTOP] = CSTOP;
512 tio->c_cc[VSUSP] = CSUSP;
513# ifdef VDSUSP
514 tio->c_cc[VDSUSP] = CDSUSP;
515# endif
516# ifdef VREPRINT
517 tio->c_cc[VREPRINT] = CRPRNT;
518# endif
519# ifdef VDISCRD
520 tio->c_cc[VDISCRD] = CFLUSH;
521# endif
522# ifdef VWERSE
523 tio->c_cc[VWERSE] = CWERASE;
524# endif
525# ifdef VLNEXT
526 tio->c_cc[VLNEXT] = CLNEXT;
527# endif
528# ifdef VSTATUS
529 tio->c_cc[VSTATUS] = CSTATUS;
530# endif
531
532# if VMIN != VEOF
533 tio->c_cc[VMIN] = 1;
534# endif
535# if VTIME != VEOL
536 tio->c_cc[VTIME] = 0;
537# endif
538
539 /* input modes */
540 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
541# ifdef IMAXBEL
542 | IMAXBEL
543# endif
544 | IXON);
545
546 /* output modes */
547 tio->c_oflag = (OPOST | ONLCR);
548
549 /* control modes */
550 tio->c_cflag = (CS8 | CREAD);
551
552 /* local modes */
553 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
554# if defined (ECHOCTL) && defined (ECHOKE)
555 | ECHOCTL | ECHOKE
556# endif
557 | ECHOE | ECHOK);
558}
559
548char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
549 561
550void 562void
551rxvt_init () 563rxvt_init ()
552{ 564{
553 uid_t uid = getuid (); 565 assert (("fontMask must not overlap other RS masks",
554 gid_t gid = getgid (); 566 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
555
556 // before doing anything else, check for setuid/setgid operation,
557 // start the helper process and drop privileges
558 if (uid != geteuid ()
559 || gid != getegid ())
560 {
561#if PTYTTY_HELPER
562 rxvt_ptytty_server ();
563#else
564 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
565#endif
566 567
567 // drop privileges 568 rxvt_get_ttymode (&rxvt_term::def_tio);
568#if HAVE_SETRESUID
569 setresgid (gid, gid, gid);
570 setresuid (uid, uid, uid);
571#elif HAVE_SETREUID
572 setregid (gid, gid);
573 setreuid (uid, uid);
574#elif HAVE_SETUID
575 setgid (gid);
576 setuid (uid);
577#endif
578 569
579 if (uid != geteuid () 570 // get rid of stdin/stdout as we don't need them, to free resources
580 || gid != getegid ()) 571 dup2 (STDERR_FILENO, STDIN_FILENO);
581 rxvt_fatal ("unable to drop privileges, aborting.\n"); 572 dup2 (STDERR_FILENO, STDOUT_FILENO);
582 } 573
574 if (!ev_default_loop ())
575 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
583 576
584 rxvt_environ = environ; 577 rxvt_environ = environ;
585 578
586 signal (SIGHUP, SIG_IGN); 579 signal (SIGHUP, SIG_IGN);
587 signal (SIGPIPE, SIG_IGN); 580 signal (SIGPIPE, SIG_IGN);
588 581
589 sig_handlers.sw_term.start (SIGTERM); 582 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
590 sig_handlers.sw_int.start (SIGINT); 583 sig_handlers.sw_int.start (SIGINT); ev_unref ();
591
592 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
593 /* signal (SIGURG, SIG_DFL); */
594 584
595 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 585 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
596 // TODO: handle this with exceptions and tolerate the memory loss 586 // TODO: handle this with exceptions and tolerate the memory loss
597 XSetIOErrorHandler (rxvt_xioerror_handler); 587 XSetIOErrorHandler (rxvt_xioerror_handler);
598 588
599 XrmInitialize (); 589 XrmInitialize ();
600} 590}
601 591
602/* ------------------------------------------------------------------------- *
603 * MEMORY ALLOCATION WRAPPERS *
604 * ------------------------------------------------------------------------- */
605void *
606rxvt_malloc (size_t size)
607{
608 void *p = malloc (size);
609
610 if (!p)
611 rxvt_fatal ("memory allocation failure. aborting.\n");
612
613 return p;
614}
615
616void *
617rxvt_calloc (size_t number, size_t size)
618{
619 void *p = calloc (number, size);
620
621 if (!p)
622 rxvt_fatal ("memory allocation failure. aborting.\n");
623
624 return p;
625}
626
627void *
628rxvt_realloc (void *ptr, size_t size)
629{
630 void *p = realloc (ptr, size);
631
632 if (!p)
633 rxvt_fatal ("memory allocation failure. aborting.\n");
634
635 return p;
636}
637
638/*----------------------------------------------------------------------*/ 592/*----------------------------------------------------------------------*/
639/* 593/*
640 * window size/position calculcations for XSizeHint and other storage. 594 * window size/position calculations for XSizeHint and other storage.
641 * if width/height are non-zero then override calculated width/height 595 * if width/height are non-zero then override calculated width/height
642 */ 596 */
643void 597void
644rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 598rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
645{ 599{
646 short recalc_x, recalc_y; 600 short recalc_x, recalc_y;
647 int x, y, sb_w, flags; 601 int x, y, flags;
648 unsigned int w, h; 602 unsigned int w, h;
649 unsigned int max_width, max_height; 603 unsigned int max_width, max_height;
650 dDisp;
651
652 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
653 ncol, nrow, szHint.width, szHint.height));
654 604
655 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 605 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
656 szHint.win_gravity = NorthWestGravity; 606 szHint.win_gravity = NorthWestGravity;
657 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 607 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
658 608
… …
666 if (rs[Rs_geometry]) 616 if (rs[Rs_geometry])
667 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 617 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
668 618
669 if (flags & WidthValue) 619 if (flags & WidthValue)
670 { 620 {
621 if (!w)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
671 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 624 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
672 szHint.flags |= USSize; 625 szHint.flags |= USSize;
673 } 626 }
674 627
675 if (flags & HeightValue) 628 if (flags & HeightValue)
676 { 629 {
630 if (!h)
631 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
632
677 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 633 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
678 szHint.flags |= USSize; 634 szHint.flags |= USSize;
679 } 635 }
680 636
681 if (flags & XValue) 637 if (flags & XValue)
682 { 638 {
… …
713 max_width = MAX_COLS * fwidth; 669 max_width = MAX_COLS * fwidth;
714 max_height = MAX_ROWS * fheight; 670 max_height = MAX_ROWS * fheight;
715 671
716 szHint.base_width = szHint.base_height = 2 * int_bwidth; 672 szHint.base_width = szHint.base_height = 2 * int_bwidth;
717 673
718 sb_w = 0;
719 window_vt_x = window_vt_y = int_bwidth; 674 window_vt_x = window_vt_y = int_bwidth;
720 675
721 if (scrollBar.state) 676 if (scrollBar.state)
722 { 677 {
723 sb_w = scrollbar_TotalWidth (); 678 int sb_w = scrollBar.total_width ();
724 szHint.base_width += sb_w; 679 szHint.base_width += sb_w;
680
725 if (!OPTION (Opt_scrollBar_right)) 681 if (!option (Opt_scrollBar_right))
726 window_vt_x += sb_w; 682 window_vt_x += sb_w;
727 } 683 }
728 684
729 szHint.width_inc = fwidth; 685 szHint.width_inc = fwidth;
730 szHint.height_inc = fheight; 686 szHint.height_inc = fheight;
731 szHint.min_width = szHint.base_width + szHint.width_inc; 687 szHint.min_width = szHint.base_width + szHint.width_inc;
732 szHint.min_height = szHint.base_height + szHint.height_inc; 688 szHint.min_height = szHint.base_height + szHint.height_inc;
733 689
734 if (newwidth && newwidth - szHint.base_width < max_width) 690 if (newwidth && newwidth - szHint.base_width < max_width)
735 { 691 {
736 szHint.width = newwidth; 692 szHint.width = newwidth;
… …
751 { 707 {
752 min_it (height, max_height); 708 min_it (height, max_height);
753 szHint.height = szHint.base_height + height; 709 szHint.height = szHint.base_height + height;
754 } 710 }
755 711
756 if (scrollBar.state && OPTION (Opt_scrollBar_right))
757 window_sb_x = szHint.width - sb_w;
758
759 if (recalc_x) 712 if (recalc_x)
760 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 713 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
714
761 if (recalc_y) 715 if (recalc_y)
762 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 716 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
763 717
764 ncol = width / fwidth; 718 ncol = width / fwidth;
765 nrow = height / fheight; 719 nrow = height / fheight;
766 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
767 ncol, nrow, szHint.width,
768 szHint.height));
769 return;
770} 720}
771 721
772/*----------------------------------------------------------------------*/ 722/*----------------------------------------------------------------------*/
773/* 723/*
774 * Tell the teletype handler what size the window is. 724 * Tell the teletype handler what size the window is.
… …
784 734
785 ws.ws_col = ncol; 735 ws.ws_col = ncol;
786 ws.ws_row = nrow; 736 ws.ws_row = nrow;
787 ws.ws_xpixel = width; 737 ws.ws_xpixel = width;
788 ws.ws_ypixel = height; 738 ws.ws_ypixel = height;
789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 739 ioctl (pty->pty, TIOCSWINSZ, &ws);
790 740
791#if 0 741#if 0
792 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 742 // TIOCSWINSZ is supposed to do this automatically and correctly
793 if (cmd_pid) /* force through to the command */ 743 if (cmd_pid) /* force through to the command */
794 kill (-cmd_pid, SIGWINCH); 744 kill (-cmd_pid, SIGWINCH);
795#endif 745#endif
796} 746}
797 747
… …
824#endif 774#endif
825 775
826 delete fontset[0]; 776 delete fontset[0];
827 fontset[0] = fs; 777 fontset[0] = fs;
828 778
829 prop = (*fs)[1]->properties (); 779 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
830 prop.height += lineSpace; 780 prop.height += lineSpace;
781 prop.width += letterSpace;
782
831 fs->set_prop (prop); 783 fs->set_prop (prop, false);
832 784
833 fwidth = prop.width; 785 fwidth = prop.width;
834 fheight = prop.height; 786 fheight = prop.height;
835 fbase = prop.ascent; 787 fbase = prop.ascent;
836 788
… …
845 { 797 {
846 fontset[style] = fs = new rxvt_fontset (this); 798 fontset[style] = fs = new rxvt_fontset (this);
847 rxvt_fontprop prop2 = prop; 799 rxvt_fontprop prop2 = prop;
848 800
849 if (res) 801 if (res)
850 prop2.weight = prop2.slant = rxvt_fontprop::unset; 802 {
803 fs->populate (res);
804 fs->set_prop (prop2, false);
805 }
851 else 806 else
852 { 807 {
853 res = fontset[0]->fontdesc; 808 fs->populate (fontset[0]->fontdesc);
854 809
855 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 810 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
856 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 811 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
812
813 fs->set_prop (prop2, true);
857 } 814 }
858 815
859 fs->populate (res);
860 fs->set_prop (prop2);
861 } 816 }
862#else 817#else
863 fontset[style] = fontset[0]; 818 fontset[style] = fontset[0];
864#endif 819#endif
865 } 820 }
… …
867 if (parent[0]) 822 if (parent[0])
868 { 823 {
869 resize_all_windows (0, 0, 0); 824 resize_all_windows (0, 0, 0);
870 scr_remap_chars (); 825 scr_remap_chars ();
871 scr_touch (true); 826 scr_touch (true);
872 } 827 }
873 828
874 return true; 829 return true;
875} 830}
876 831
832void
877void rxvt_term::set_string_property (Atom prop, const char *str, int len) 833rxvt_term::set_string_property (Atom prop, const char *str, int len)
878{ 834{
879 XChangeProperty (display->display, parent[0], 835 XChangeProperty (dpy, parent[0],
880 prop, XA_STRING, 8, PropModeReplace, 836 prop, XA_STRING, 8, PropModeReplace,
881 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 837 (const unsigned char *)str, len >= 0 ? len : strlen (str));
882} 838}
883 839
840void
841rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
842{
843 XTextProperty ct;
844
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 {
847 XSetTextProperty (dpy, parent[0], &ct, prop);
848 XFree (ct.value);
849 }
850}
851
852void
884void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
885{ 854{
886 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
887 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
888 857
889 XChangeProperty (display->display, parent[0], 858 XChangeProperty (dpy, parent[0],
890 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
891 (const unsigned char *)s, strlen (s)); 860 (const unsigned char *)s, strlen (s));
892 861
893 free (s); 862 free (s);
894 free (ws); 863 free (ws);
… …
898/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
899/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
900void 869void
901rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
902{ 871{
903 set_string_property (XA_WM_NAME, str); 872 set_mbstring_property (XA_WM_NAME, str);
904#if ENABLE_EWMH 873#if ENABLE_EWMH
905 set_utf8_property (xa[XA_NET_WM_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_NAME], str);
906#endif 875#endif
907} 876}
908 877
909void 878void
910rxvt_term::set_icon_name (const char *str) 879rxvt_term::set_icon_name (const char *str)
911{ 880{
912 set_string_property (XA_WM_ICON_NAME, str); 881 set_mbstring_property (XA_WM_ICON_NAME, str);
913#if ENABLE_EWMH 882#if ENABLE_EWMH
914 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
915#endif 884#endif
916} 885}
917 886
887void
888rxvt_term::set_window_color (int idx, const char *color)
889{
918#ifdef XTERM_COLOR_CHANGE 890#ifdef XTERM_COLOR_CHANGE
919void
920rxvt_term::set_window_color (int idx, const char *color)
921{
922 rxvt_color xcol; 891 rxvt_color xcol;
923 int i;
924 892
925 if (color == NULL || *color == '\0') 893 if (color == NULL || *color == '\0')
926 return; 894 return;
927 895
896 color = strdup (color);
897 allocated.push_back ((void *)color);
898 rs[Rs_color + idx] = color;
899
928 /* handle color aliases */ 900 /* handle color aliases */
929 if (isdigit (*color)) 901 if (isdigit (*color))
930 { 902 {
931 i = atoi (color); 903 int i = atoi (color);
932 904
933 if (i >= 8 && i <= 15) 905 if (i >= 8 && i <= 15)
906 {
934 { /* bright colors */ 907 /* bright colors */
935 i -= 8;
936 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
937 SET_PIXCOLOR (idx);
938 goto done; 909 goto done;
939 } 910 }
940 911
941 if (i >= 0 && i <= 7) 912 if (i >= 0 && i <= 7)
913 {
942 { /* normal colors */ 914 /* normal colors */
943 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
944 SET_PIXCOLOR (idx);
945 goto done; 916 goto done;
946 } 917 }
947 } 918 }
948 919
949 if (!rXParseAllocColor (&xcol, color)) 920 set_color (xcol, color);
950 return;
951
952 /* XStoreColor (display->display, display->cmap, XColor*); */
953 921
954 /* 922 /*
955 * FIXME: should free colors here, but no idea how to do it so instead, 923 * FIXME: should free colors here, but no idea how to do it so instead,
956 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
957 */ 925 */
958# if 0
959 for (i = Color_Black; i <= Color_White; i++)
960 if (pix_colors[idx] == pix_colors[i])
961 break;
962 if (i > Color_White)
963 {
964 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
965 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
966 DisplayPlanes (display->display, display->screen));
967 }
968# endif
969 926
970 pix_colors_focused[idx] = xcol; 927 pix_colors_focused[idx] = xcol;
971 SET_PIXCOLOR (idx);
972 928
973 /* XSetWindowAttributes attr; */
974 /* Cursor cursor; */
975done: 929done:
976
977#if OFF_FOCUS_FADING
978 if (rs[Rs_fade])
979 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
980#endif
981
982 /*TODO: handle Color_BD, scrollbar background, etc. */ 930 /*TODO: handle Color_BD, scrollbar background, etc. */
983 931
932 update_fade_color (idx);
984 recolour_cursor (); 933 recolour_cursor ();
985 scr_recolour (); 934 scr_recolour ();
935#endif /* XTERM_COLOR_CHANGE */
986} 936}
987
988#else
989# define set_window_color (idx,color) ((void)0)
990#endif /* XTERM_COLOR_CHANGE */
991 937
992void 938void
993rxvt_term::recolour_cursor () 939rxvt_term::recolour_cursor ()
994{ 940{
995 XColor xcol[2]; 941 XColor fg, bg;
996 942
997 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 943 (ISSET_PIXCOLOR (Color_pointer_fg)
998 ? pix_colors_focused[Color_pointer_fg] 944 ? pix_colors_focused[Color_pointer_fg]
999 : pix_colors_focused[Color_fg]; 945 : pix_colors_focused[Color_fg]).get (fg);
946
1000 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 947 (ISSET_PIXCOLOR (Color_pointer_bg)
1001 ? pix_colors_focused[Color_pointer_bg] 948 ? pix_colors_focused[Color_pointer_bg]
1002 : pix_colors_focused[Color_bg]; 949 : pix_colors_focused[Color_bg]).get (bg);
1003 950
1004 XQueryColors (display->display, display->cmap, xcol, 2); 951 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1005 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1006} 952}
1007 953
1008/*----------------------------------------------------------------------*/ 954/*----------------------------------------------------------------------*/
1009/* 955/*
1010 * find if fg/bg matches any of the normal (low-intensity) colors 956 * find if fg/bg matches any of the normal (low-intensity) colors
1011 */ 957 */
1012void 958void
1013rxvt_term::set_colorfgbg () 959rxvt_term::set_colorfgbg ()
1014{ 960{
1015 unsigned int i; 961 unsigned int i;
1016 const char *xpmb = "\0"; 962 const char *xpmb = "";
1017 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 963 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1018 964
1019 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1020 strcpy (fstr, "default"); 965 strcpy (fstr, "default");
1021 strcpy (bstr, "default"); 966 strcpy (bstr, "default");
1022 for (i = Color_Black; i <= Color_White; i++) 967 for (i = Color_Black; i <= Color_White; i++)
1023 if (pix_colors[Color_fg] == pix_colors[i]) 968 if (pix_colors[Color_fg] == pix_colors[i])
1024 { 969 {
… …
1028 973
1029 for (i = Color_Black; i <= Color_White; i++) 974 for (i = Color_Black; i <= Color_White; i++)
1030 if (pix_colors[Color_bg] == pix_colors[i]) 975 if (pix_colors[Color_bg] == pix_colors[i])
1031 { 976 {
1032 sprintf (bstr, "%d", (i - Color_Black)); 977 sprintf (bstr, "%d", (i - Color_Black));
1033#ifdef XPM_BACKGROUND 978#ifdef BG_IMAGE_FROM_FILE
1034 xpmb = "default;"; 979 xpmb = "default;";
1035#endif 980#endif
1036 break; 981 break;
1037 } 982 }
1038 983
1039 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 984 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1040} 985}
1041 986
1042/*----------------------------------------------------------------------*/ 987/*----------------------------------------------------------------------*/
1043 988
1044int 989bool
1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 990rxvt_term::set_color (rxvt_color &color, const char *name)
1046{ 991{
1047 if (!screen_in_out->set (display, colour)) 992 if (color.set (this, name))
1048 {
1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1050 return false;
1051 }
1052
1053 return true; 993 return true;
994
995 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
996 return false;
997}
998
999void
1000rxvt_term::alias_color (int dst, int src)
1001{
1002 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1054} 1003}
1055 1004
1056/* -------------------------------------------------------------------- * 1005/* -------------------------------------------------------------------- *
1057 * - WINDOW RESIZING - * 1006 * - WINDOW RESIZING - *
1058 * -------------------------------------------------------------------- */ 1007 * -------------------------------------------------------------------- */
1059void 1008void
1060rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1009rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1061{ 1010{
1062 int fix_screen; 1011 int fix_screen;
1063 int old_width = szHint.width, old_height = szHint.height; 1012 int old_width = szHint.width;
1064 dDisp; 1013 int old_height = szHint.height;
1065 1014
1066 window_calc (newwidth, newheight); 1015 window_calc (newwidth, newheight);
1016
1017 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1018
1019 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1020 if (set_hint)
1021 {
1022 szHint.flags &= ~(PBaseSize | PResizeInc);
1067 XSetWMNormalHints (disp, parent[0], &szHint); 1023 XSetWMNormalHints (dpy, parent[0], &szHint);
1024 szHint.flags |= PBaseSize | PResizeInc;
1025 }
1068 1026
1069 if (!ignoreparent) 1027 if (!ignoreparent)
1070 { 1028 {
1071#ifdef SMART_RESIZE 1029#ifdef SMART_RESIZE
1072 /* 1030 /*
… …
1076 int x, y, x1, y1; 1034 int x, y, x1, y1;
1077 int dx, dy; 1035 int dx, dy;
1078 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1036 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1079 Window unused_cr; 1037 Window unused_cr;
1080 1038
1081 XTranslateCoordinates (disp, parent[0], display->root, 1039 XTranslateCoordinates (dpy, parent[0], display->root,
1082 0, 0, &x, &y, &unused_cr); 1040 0, 0, &x, &y, &unused_cr);
1083 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1041 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1084 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1042 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1085 /* 1043 /*
1086 * if display->root isn't the parent window, a WM will probably have offset 1044 * if display->root isn't the parent window, a WM will probably have offset
1087 * our position for handles and decorations. Counter it 1045 * our position for handles and decorations. Counter it
1088 */ 1046 */
… …
1090 { 1048 {
1091 x -= x1; 1049 x -= x1;
1092 y -= y1; 1050 y -= y1;
1093 } 1051 }
1094 1052
1095 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1053 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1096 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1054 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1097 dx = old_width - szHint.width; 1055 dx = old_width - szHint.width;
1098 dy = old_height - szHint.height; 1056 dy = old_height - szHint.height;
1099 1057
1100 /* Check position of the center of the window */ 1058 /* Check position of the center of the window */
1101 if (x < x1) /* left half */ 1059 if (x < x1) /* left half */
1102 dx = 0; 1060 dx = 0;
… …
1105 if (y < y1) /* top half */ 1063 if (y < y1) /* top half */
1106 dy = 0; 1064 dy = 0;
1107 else if (y == y1) /* exact center */ 1065 else if (y == y1) /* exact center */
1108 dy /= 2; 1066 dy /= 2;
1109 1067
1110 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1068 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1111 szHint.width, szHint.height); 1069 szHint.width, szHint.height);
1112#else 1070#else
1113 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1071 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1114#endif 1072#endif
1115 } 1073 }
1074
1075 if (set_hint)
1076 XSetWMNormalHints (dpy, parent[0], &szHint);
1116 1077
1117 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1078 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1118 1079
1119 if (fix_screen || newwidth != old_width || newheight != old_height) 1080 if (fix_screen || newwidth != old_width || newheight != old_height)
1120 { 1081 {
1121 if (scrollBar.state) 1082 if (scrollBar.state)
1122 { 1083 scrollBar.resize ();
1123 XMoveResizeWindow (disp, scrollBar.win,
1124 window_sb_x, 0,
1125 scrollbar_TotalWidth (), szHint.height);
1126 resize_scrollbar ();
1127 }
1128 1084
1129 XMoveResizeWindow (disp, vt, 1085 XMoveResizeWindow (dpy, vt,
1130 window_vt_x, window_vt_y, 1086 window_vt_x, window_vt_y,
1131 width, height); 1087 width, height);
1132 1088
1133 scr_clear (); 1089#ifdef HAVE_BG_PIXMAP
1134#ifdef XPM_BACKGROUND 1090 if (bgPixmap.window_size_sensitive ())
1135 resize_pixmap (); 1091 update_background ();
1136#endif 1092#endif
1137 } 1093 }
1138 1094
1139 if (fix_screen || old_height == 0) 1095 if (fix_screen || old_height == 0)
1140 {
1141 int curr_screen = -1;
1142 int old_ncol = prev_ncol;
1143
1144 /* scr_reset only works on the primary screen */
1145 if (old_height) /* this is not the first time through */
1146 {
1147 unsigned int ocol = ncol;
1148 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1149 curr_screen = scr_change_screen (PRIMARY);
1150 ncol = ocol;
1151 }
1152
1153 scr_reset (); 1096 scr_reset ();
1154 1097
1155 if (curr_screen >= 0) /* this is not the first time through */ 1098#ifdef HAVE_BG_PIXMAP
1156 { 1099// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1157 scr_change_screen (curr_screen); 1100// if (bgPixmap.pixmap)
1158 selection_check (old_ncol != ncol ? 4 : 0);
1159 }
1160 }
1161
1162 old_width = szHint.width;
1163 old_height = szHint.height;
1164
1165#ifdef XPM_BACKGROUND
1166 if (pixmap)
1167 scr_touch (false); 1101// scr_touch (false);
1168#endif 1102#endif
1169 1103
1170#ifdef USE_XIM 1104#ifdef USE_XIM
1171 IMSetStatusPosition (); 1105 IMSetPosition ();
1172#endif 1106#endif
1173} 1107}
1174 1108
1175/* 1109/*
1176 * Set the width/height of the vt window in characters. Units are pixels. 1110 * Set the width/height of the vt window in characters. Units are pixels.
… …
1181{ 1115{
1182 XWindowAttributes wattr; 1116 XWindowAttributes wattr;
1183 1117
1184 if (newwidth == 0 || newheight == 0) 1118 if (newwidth == 0 || newheight == 0)
1185 { 1119 {
1186 XGetWindowAttributes (display->display, display->root, &wattr); 1120 XGetWindowAttributes (dpy, display->root, &wattr);
1187 1121
1188 if (newwidth == 0) 1122 if (newwidth == 0)
1189 newwidth = wattr.width - szHint.base_width; 1123 newwidth = wattr.width - szHint.base_width;
1190 if (newheight == 0) 1124 if (newheight == 0)
1191 newheight = wattr.height - szHint.base_height; 1125 newheight = wattr.height - szHint.base_height;
… …
1205#ifdef USE_XIM 1139#ifdef USE_XIM
1206 1140
1207void 1141void
1208rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1209{ 1143{
1210 fg = pix_colors[Color_fg]; 1144 fg = pix_colors [Color_fg];
1211 bg = pix_colors[Color_bg]; 1145 bg = pix_colors [Color_bg];
1212} 1146}
1213 1147
1214void 1148void
1215rxvt_term::im_set_size (XRectangle &size) 1149rxvt_term::im_set_size (XRectangle &size)
1216{ 1150{
… …
1239 1173
1240/* Checking whether input method is running. */ 1174/* Checking whether input method is running. */
1241bool 1175bool
1242rxvt_term::IMisRunning () 1176rxvt_term::IMisRunning ()
1243{ 1177{
1244 char *p;
1245 Atom atom; 1178 Atom atom;
1246 Window win; 1179 Window win;
1247 char server[IMBUFSIZ]; 1180 char server[IMBUFSIZ];
1248 1181
1249 /* get current locale modifier */ 1182 /* get current locale modifier */
1250 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1183 if (char *p = XSetLocaleModifiers (0))
1251 { 1184 {
1252 strcpy (server, "@server="); 1185 strcpy (server, "@server=");
1253 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1186 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1254 1187
1255 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1188 if (p = strchr (server + 1, '@')) /* first one only */
1256 *p = '\0'; 1189 *p = '\0';
1257 1190
1258 atom = XInternAtom (display->display, server, False); 1191 atom = XInternAtom (dpy, server, False);
1259 win = XGetSelectionOwner (display->display, atom); 1192 win = XGetSelectionOwner (dpy, atom);
1260 1193
1261 if (win != None) 1194 if (win != None)
1262 return True; 1195 return True;
1263 } 1196 }
1264 1197
… …
1271 XPoint nspot; 1204 XPoint nspot;
1272 XVaNestedList preedit_attr; 1205 XVaNestedList preedit_attr;
1273 1206
1274 if (!Input_Context 1207 if (!Input_Context
1275 || !focus 1208 || !focus
1276 || !(input_style & XIMPreeditPosition)) 1209 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1277 return; 1210 return;
1278 1211
1279 im_set_position (nspot); 1212 im_set_position (nspot);
1280 1213
1281 if (nspot.x == spot.x && nspot.y == spot.y) 1214 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1300 input_method = 0; 1233 input_method = 0;
1301 } 1234 }
1302 1235
1303 Input_Context = 0; 1236 Input_Context = 0;
1304} 1237}
1238
1239#ifdef ENABLE_XIM_ONTHESPOT
1240
1241static void
1242xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1243{
1244 ((rxvt_term *)client_data)->make_current ();
1245 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1246}
1247
1248static void
1249xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1250{
1251 ((rxvt_term *)client_data)->make_current ();
1252 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1253}
1254
1255static void
1256xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1257{
1258 rxvt_term *term = (rxvt_term *)client_data;
1259 XIMText *text = call_data->text;
1260
1261 term->make_current ();
1262
1263 if (text)
1264 {
1265 wchar_t *str;
1266
1267 if (!text->encoding_is_wchar && text->string.multi_byte)
1268 {
1269 // of course, X makes it ugly again
1270 if (term->rs[Rs_imLocale])
1271 SET_LOCALE (term->rs[Rs_imLocale]);
1272
1273 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1274 mbstowcs (str, text->string.multi_byte, text->length + 1);
1275
1276 if (term->rs[Rs_imLocale])
1277 SET_LOCALE (term->locale);
1278 }
1279 else
1280 str = text->string.wide_char;
1281
1282 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1283 DT_INT, call_data->caret,
1284 DT_INT, call_data->chg_first,
1285 DT_INT, call_data->chg_length,
1286 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1287 DT_WCS_LEN, str, str ? (int)text->length : 0,
1288 DT_END));
1289 }
1290 else
1291 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1292 DT_INT, call_data->caret,
1293 DT_INT, call_data->chg_first,
1294 DT_INT, call_data->chg_length,
1295 DT_END));
1296}
1297
1298#if 0
1299static void
1300xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1301{
1302 ((rxvt_term *)client_data)->make_current ();
1303 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1304 DT_INT, call_data->position,
1305 DT_INT, call_data->direction,
1306 DT_INT, call_data->style,
1307 DT_END));
1308}
1309#endif
1310
1311#endif
1305 1312
1306/* 1313/*
1307 * Try to open a XIM with the current modifiers, then see if we can 1314 * Try to open a XIM with the current modifiers, then see if we can
1308 * open a suitable preedit type 1315 * open a suitable preedit type
1309 */ 1316 */
… …
1316 XRectangle rect, status_rect, needed_rect; 1323 XRectangle rect, status_rect, needed_rect;
1317 unsigned long fg, bg; 1324 unsigned long fg, bg;
1318 const char *p; 1325 const char *p;
1319 char **s; 1326 char **s;
1320 XIMStyles *xim_styles; 1327 XIMStyles *xim_styles;
1328#ifdef ENABLE_XIM_ONTHESPOT
1329 XIMCallback xcb[4];
1330#endif
1321 1331
1322 set_environ (envv); 1332 set_environ (envv);
1323 1333
1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1325 return false; 1335 return false;
1326 1336
1327 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1328 input_method = display->get_xim (locale, modifiers); 1337 input_method = display->get_xim (locale, modifiers);
1329 if (input_method == NULL) 1338 if (input_method == NULL)
1330 return false; 1339 return false;
1331 1340
1332 xim = input_method->xim; 1341 xim = input_method->xim;
… …
1352 s = rxvt_splitcommastring (p); 1361 s = rxvt_splitcommastring (p);
1353 1362
1354 for (i = found = 0; !found && s[i]; i++) 1363 for (i = found = 0; !found && s[i]; i++)
1355 { 1364 {
1356 if (!strcmp (s[i], "OverTheSpot")) 1365 if (!strcmp (s[i], "OverTheSpot"))
1357 input_style = (XIMPreeditPosition | XIMStatusNothing); 1366 input_style = XIMPreeditPosition | XIMStatusNothing;
1358 else if (!strcmp (s[i], "OffTheSpot")) 1367 else if (!strcmp (s[i], "OffTheSpot"))
1359 input_style = (XIMPreeditArea | XIMStatusArea); 1368 input_style = XIMPreeditArea | XIMStatusArea;
1360 else if (!strcmp (s[i], "Root")) 1369 else if (!strcmp (s[i], "Root"))
1361 input_style = (XIMPreeditNothing | XIMStatusNothing); 1370 input_style = XIMPreeditNothing | XIMStatusNothing;
1362 else if (!strcmp (s[i], "None")) 1371 else if (!strcmp (s[i], "None"))
1363 input_style = (XIMPreeditNone | XIMStatusNone); 1372 input_style = XIMPreeditNone | XIMStatusNone;
1373#ifdef ENABLE_XIM_ONTHESPOT
1374 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1375 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1376#endif
1377 else
1378 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 1379
1365 for (j = 0; j < xim_styles->count_styles; j++) 1380 for (j = 0; j < xim_styles->count_styles; j++)
1366 if (input_style == xim_styles->supported_styles[j]) 1381 if (input_style == xim_styles->supported_styles[j])
1367 { 1382 {
1368 rxvt_freecommastring (s); 1383 rxvt_freecommastring (s);
… …
1406 "*", 1421 "*",
1407 fheight, 1422 fheight,
1408 fheight + 1, fheight - 1, 1423 fheight + 1, fheight - 1,
1409 fheight - 2, fheight + 2); 1424 fheight - 2, fheight + 2);
1410 1425
1411 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1426 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1412 &missing_charset_list, &missing_charset_count, &def_string); 1427 &missing_charset_list, &missing_charset_count, &def_string);
1413 1428
1414 if (missing_charset_list) 1429 if (missing_charset_list)
1415 XFreeStringList (missing_charset_list); 1430 XFreeStringList (missing_charset_list);
1416 1431
… …
1457 XNBackground, bg, 1472 XNBackground, bg,
1458 XNArea, &status_rect, 1473 XNArea, &status_rect,
1459 XNFontSet, fs, 1474 XNFontSet, fs,
1460 NULL); 1475 NULL);
1461 } 1476 }
1477#if ENABLE_XIM_ONTHESPOT
1478 else if (input_style & XIMPreeditCallbacks)
1479 {
1480 im_set_position (spot);
1481
1482 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1483 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1484 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1485# if 0
1486 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1487# endif
1488
1489 preedit_attr = XVaCreateNestedList (0,
1490 XNSpotLocation, &spot,
1491 XNPreeditStartCallback, &xcb[0],
1492 XNPreeditDoneCallback , &xcb[1],
1493 XNPreeditDrawCallback , &xcb[2],
1494# if 0
1495 XNPreeditCaretCallback, &xcb[3],
1496# endif
1497 NULL);
1498 }
1499#endif
1462 1500
1463 Input_Context = XCreateIC (xim, 1501 Input_Context = XCreateIC (xim,
1464 XNInputStyle, input_style, 1502 XNInputStyle, input_style,
1465 XNClientWindow, vt, 1503 XNClientWindow, vt,
1466 XNFocusWindow, parent[0], 1504 XNFocusWindow, parent[0],
… …
1468 preedit_attr, 1506 preedit_attr,
1469 status_attr ? XNStatusAttributes : NULL, 1507 status_attr ? XNStatusAttributes : NULL,
1470 status_attr, NULL); 1508 status_attr, NULL);
1471 1509
1472 if (preedit_attr) XFree (preedit_attr); 1510 if (preedit_attr) XFree (preedit_attr);
1473 if (status_attr) XFree (status_attr); 1511 if (status_attr) XFree (status_attr);
1474 if (fs) XFreeFontSet (display->display, fs); 1512 if (fs) XFreeFontSet (dpy, fs);
1475 1513
1476 if (Input_Context == NULL) 1514 if (Input_Context == NULL)
1477 { 1515 {
1478 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1516 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1479 im_destroy (); 1517 im_destroy ();
1480 return false; 1518 return false;
1481 } 1519 }
1482 1520
1483 if (input_style & XIMPreeditArea) 1521#if 0
1522 // unfortunately, only the focus window is used by XIM, hard to fix
1523 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1524 vt_select_input ();
1525#endif
1526
1484 IMSetStatusPosition (); 1527 IMSetPosition ();
1485 1528
1486 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1487 return true; 1529 return true;
1488} 1530}
1489 1531
1490void 1532void
1491rxvt_term::im_cb () 1533rxvt_term::im_cb ()
… …
1497 1539
1498 make_current (); 1540 make_current ();
1499 1541
1500 im_destroy (); 1542 im_destroy ();
1501 1543
1502 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1503 if (Input_Context) 1544 if (Input_Context)
1504 return; 1545 return;
1505 1546
1506#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1547#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1507 if (rs[Rs_imLocale]) 1548 if (rs[Rs_imLocale])
… …
1549 SET_LOCALE (locale); 1590 SET_LOCALE (locale);
1550#endif 1591#endif
1551} 1592}
1552 1593
1553void 1594void
1554rxvt_term::IMSetStatusPosition () 1595rxvt_term::IMSetPosition ()
1555{ 1596{
1556 XRectangle preedit_rect, status_rect, *needed_rect; 1597 XRectangle preedit_rect, status_rect, *needed_rect;
1557 XVaNestedList preedit_attr, status_attr; 1598 XVaNestedList preedit_attr, status_attr;
1558 1599
1559 if (!Input_Context 1600 if (!Input_Context
1560 || !focus 1601 || !focus
1561 || !(input_style & XIMPreeditArea) 1602 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1562 || !IMisRunning ()) 1603 || !IMisRunning ())
1563 return; 1604 return;
1564 1605
1606 if (input_style & XIMPreeditPosition)
1607 {
1608 im_set_size (preedit_rect);
1609 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1610
1611 XSetICValues (Input_Context,
1612 XNPreeditAttributes, preedit_attr, NULL);
1613 }
1614 else
1615 {
1565 /* Getting the necessary width of preedit area */ 1616 /* Getting the necessary width of preedit area */
1566 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1617 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1567 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1618 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1568 XFree (status_attr); 1619 XFree (status_attr);
1569 1620
1570 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1621 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1571 XFree (needed_rect); 1622 XFree (needed_rect);
1572 1623
1573 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1624 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1574 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1625 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1575 1626
1576 XSetICValues (Input_Context, 1627 XSetICValues (Input_Context,
1577 XNPreeditAttributes, preedit_attr, 1628 XNPreeditAttributes, preedit_attr,
1578 XNStatusAttributes, status_attr, NULL); 1629 XNStatusAttributes, status_attr,
1630 NULL);
1579 1631
1632 XFree (status_attr);
1633 }
1634
1580 XFree (preedit_attr); 1635 XFree (preedit_attr);
1581 XFree (status_attr);
1582} 1636}
1583#endif /* USE_XIM */ 1637#endif /* USE_XIM */
1638
1639void
1640rxvt_term::get_window_origin (int &x, int &y)
1641{
1642 Window cr;
1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1644}
1645
1646Pixmap
1647rxvt_term::get_pixmap_property (int prop_id)
1648{
1649 if (prop_id > 0 && prop_id < NUM_XA)
1650 if (xa[prop_id])
1651 {
1652 int aformat;
1653 unsigned long nitems, bytes_after;
1654 Atom atype;
1655 unsigned char *prop = NULL;
1656 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1657 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1658 &nitems, &bytes_after, &prop);
1659 if (result == Success && prop && atype == XA_PIXMAP)
1660 return *(Pixmap *)prop;
1661 }
1662
1663 return None;
1664}
1665
1666#ifdef HAVE_BG_PIXMAP
1667
1668void
1669rxvt_term::update_background ()
1670{
1671 if (update_background_ev.is_active ())
1672 return;
1673
1674 bgPixmap.invalidate ();
1675
1676 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1677
1678 if (to_wait <= 0.)
1679 bgPixmap.render ();
1680 else
1681 update_background_ev.start (to_wait);
1682}
1683
1684void
1685rxvt_term::update_background_cb (ev::timer &w, int revents)
1686{
1687 make_current ();
1688
1689 update_background_ev.stop ();
1690 bgPixmap.render ();
1691 refresh_check ();
1692}
1693
1694#endif /* HAVE_BG_PIXMAP */
1584 1695
1585/*----------------------- end-of-file (C source) -----------------------*/ 1696/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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