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

Diff Legend

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