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

Diff Legend

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