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.148 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.257 by root, Sun Nov 11 17:10:45 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 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 "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
35 39
36#include <csignal> 40#include <csignal>
37#include <cstring> 41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT
40# include <grp.h>
41#endif
42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#ifdef KEYSYM_RESOURCE 47#ifdef HAVE_XSETLOCALE
48# include "keyboard.h" 48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
49#endif 54#endif
50 55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
58// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term;
60
53static char curlocale[128]; 61static char curlocale[128], savelocale[128];
54 62
55bool 63bool
56rxvt_set_locale (const char *locale) 64rxvt_set_locale (const char *locale) NOTHROW
57{ 65{
66 int size = strlen (locale) + 1;
67
68 if (size > sizeof (curlocale))
69 rxvt_fatal ("locale string too long, aborting.\n");
70
58 if (!locale || !strncmp (locale, curlocale, 128)) 71 if (!locale || !memcmp (locale, curlocale, size))
59 return false; 72 return false;
60 73
61 strncpy (curlocale, locale, 128); 74 memcpy (curlocale, locale, size);
62 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
63 return true; 76 return true;
64} 77}
65 78
79void
80rxvt_push_locale (const char *locale) NOTHROW
81{
82 strcpy (savelocale, curlocale);
83 rxvt_set_locale (locale);
84}
85
86void
87rxvt_pop_locale () NOTHROW
88{
89 rxvt_set_locale (savelocale);
90}
91
66#if ENABLE_COMBINING 92#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
68 94
69text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
70{ 96{
71 compose_char *cc; 97 compose_char *cc;
72 98
73 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
74 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
75 cc = (*this)[c1]; 101 cc = (*this)[c1];
76 while (cc) 102 while (cc)
77 { 103 {
… …
127} 153}
128#endif 154#endif
129 155
130rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
131 : 157 :
132#if TRANSPARENT 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
133 rootwin_ev (this, &rxvt_term::rootwin_cb), 159 rootwin_ev (this, &rxvt_term::rootwin_cb),
160#endif
161#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb),
134#endif 163#endif
135#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
136 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
137#endif 166#endif
138#ifdef MENUBAR
139 menubar_ev (this, &rxvt_term::x_cb),
140#endif
141#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
142 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143#endif 169#endif
144#ifdef TEXT_BLINK 170#ifdef TEXT_BLINK
145 text_blink_ev (this, &rxvt_term::text_blink_cb), 171 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 184#endif
159#ifdef USE_XIM 185#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 186 im_ev (this, &rxvt_term::im_cb),
161#endif 187#endif
188#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb),
190#endif
162 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
163 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
164 check_ev (this, &rxvt_term::check_cb), 193 child_ev (this, &rxvt_term::child_cb),
194 prepare_ev (this, &rxvt_term::prepare_cb),
165 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
166 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
167 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
168 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
169{ 199{
… …
171 201
172 termlist.push_back (this); 202 termlist.push_back (this);
173 203
174#ifdef KEYSYM_RESOURCE 204#ifdef KEYSYM_RESOURCE
175 keyboard = new keyboard_manager; 205 keyboard = new keyboard_manager;
176
177 if (!keyboard)
178 rxvt_fatal ("out of memory, aborting.\n");
179#endif 206#endif
180} 207}
181 208
182// clean up the most important stuff, do *not* call x or free mem etc. 209// clean up the most important stuff, do *not* call x or free mem etc.
183// for use before an emergency exit 210// for use before an emergency exit
211void
184void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
185{ 213{
186 if (cmd_pid) 214 if (cmd_pid)
187 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
188 216
189#ifdef UTMP_SUPPORT 217 pty_ev.stop ();
190 privileged_utmp (RESTORE); 218 delete pty; pty = 0;
191#endif
192
193 pty.put ();
194} 219}
195 220
196rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
197{ 222{
198 termlist.erase (find (termlist.begin (), termlist.end(), this)); 223 termlist.erase (find (termlist.begin (), termlist.end(), this));
199 224
200 emergency_cleanup (); 225 emergency_cleanup ();
201 226
202#if ENABLE_STYLES 227#if ENABLE_STYLES
203 for (int i = RS_styleCount; --i; ) 228 for (int i = RS_styleCount; --i; )
204 if (TermWin.fontset[i] != TermWin.fontset[0]) 229 if (fontset[i] != fontset[0])
205 delete TermWin.fontset[i]; 230 delete fontset[i];
206#endif 231#endif
207 delete TermWin.fontset[0]; 232 delete fontset[0];
208 233
209 if (display) 234 if (display)
210 { 235 {
211 dDisp;
212
213 selection_clear (); 236 selection_clear ();
214 237
215#ifdef USE_XIM 238#ifdef USE_XIM
216 im_destroy (); 239 im_destroy ();
217#endif 240#endif
218#ifdef MENUBAR
219 if (menubarGC) XFreeGC (disp, menubarGC);
220#endif
221#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
222 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
223 if (ShadowGC) XFreeGC (disp, ShadowGC); 243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
224#endif 244#endif
225#ifdef PLAIN_SCROLLBAR 245#ifdef PLAIN_SCROLLBAR
226 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
227#endif 247#endif
228#ifdef NEXT_SCROLLBAR 248#ifdef NEXT_SCROLLBAR
229 if (blackGC) XFreeGC (disp, blackGC); 249 if (blackGC) XFreeGC (dpy, blackGC);
230 if (whiteGC) XFreeGC (disp, whiteGC); 250 if (whiteGC) XFreeGC (dpy, whiteGC);
231 if (grayGC) XFreeGC (disp, grayGC); 251 if (grayGC) XFreeGC (dpy, grayGC);
232 if (darkGC) XFreeGC (disp, darkGC); 252 if (darkGC) XFreeGC (dpy, darkGC);
233 if (stippleGC) XFreeGC (disp, stippleGC); 253 if (stippleGC) XFreeGC (dpy, stippleGC);
234 if (dimple) XFreePixmap (disp, dimple); 254 if (dimple) XFreePixmap (dpy, dimple);
235 if (upArrow) XFreePixmap (disp, upArrow); 255 if (upArrow) XFreePixmap (dpy, upArrow);
236 if (downArrow) XFreePixmap (disp, downArrow); 256 if (downArrow) XFreePixmap (dpy, downArrow);
237 if (upArrowHi) XFreePixmap (disp, upArrowHi); 257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
238 if (downArrowHi) XFreePixmap (disp, downArrowHi); 258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
239#endif 259#endif
240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 260#ifdef RXVT_SCROLLBAR
241 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
242 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
243 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
244#endif 264#endif
245 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 265 if (gc) XFreeGC (dpy, gc);
246 266
247#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248 delete menuBar.drawable; 267 delete drawable;
249 //if (menuBar.win)
250 // XDestroyWindow (disp, menuBar.win);
251#endif
252 delete TermWin.drawable;
253 // destroy all windows 268 // destroy all windows
254 if (TermWin.parent[0]) 269 if (parent[0])
255 XDestroyWindow (disp, TermWin.parent[0]); 270 XDestroyWindow (dpy, parent[0]);
256 }
257 271
258 // TODO: free pixcolours, colours should become part of rxvt_display 272 for (int i = 0; i < TOTAL_COLORS; i++)
259 273 if (ISSET_PIXCOLOR (i))
260 delete pix_colors_focused; 274 {
275 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
277 pix_colors_unfocused [i].free (this);
278#endif
279 }
280
281 clear ();
282 }
283
284 delete [] pix_colors_focused;
285#if OFF_FOCUS_FADING
262 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
263#endif 287#endif
264 288
265 displays.put (display); 289 displays.put (display);
266 290
267 scr_release (); 291 scr_release ();
… …
270 for (int i = 0; i < allocated.size (); i++) 294 for (int i = 0; i < allocated.size (); i++)
271 free (allocated [i]); 295 free (allocated [i]);
272 296
273 free (selection.text); 297 free (selection.text);
274 // TODO: manage env vars in child only(!) 298 // TODO: manage env vars in child only(!)
275 free (env_windowid);
276 free (env_display); 299 free (env_display);
277 free (env_term); 300 free (env_term);
278 free (env_colorfgbg);
279 free (locale); 301 free (locale);
280 free (v_buffer); 302 free (v_buffer);
281 free (incr_buf); 303 free (incr_buf);
282 304
283 delete envv; 305 delete envv;
… …
286#ifdef KEYSYM_RESOURCE 308#ifdef KEYSYM_RESOURCE
287 delete keyboard; 309 delete keyboard;
288#endif 310#endif
289} 311}
290 312
313// child has exited, usually destroys
314void
315rxvt_term::child_cb (ev::child &w, int status)
316{
317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
318
319 cmd_pid = 0;
320
321 if (!option (Opt_hold))
322 destroy ();
323}
324
291void 325void
292rxvt_term::destroy () 326rxvt_term::destroy ()
293{ 327{
294 if (destroy_ev.active) 328 if (destroy_ev.active)
295 return; 329 return;
296 330
331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332
297#if ENABLE_OVERLAY 333#if ENABLE_OVERLAY
298 scr_overlay_off (); 334 scr_overlay_off ();
299#endif 335#endif
300 336
301 if (display) 337 if (display)
… …
304 im_ev.stop (display); 340 im_ev.stop (display);
305#endif 341#endif
306#if HAVE_SCROLLBARS 342#if HAVE_SCROLLBARS
307 scrollbar_ev.stop (display); 343 scrollbar_ev.stop (display);
308#endif 344#endif
309#if MENUBAR 345#if ENABLE_TRANSPARENCY || ENABLE_PERL
310 menubar_ev.stop (display);
311#endif
312#if TRANSPARENT
313 rootwin_ev.stop (display); 346 rootwin_ev.stop (display);
314#endif 347#endif
315 incr_ev.stop (); 348 incr_ev.stop ();
316 termwin_ev.stop (display); 349 termwin_ev.stop (display);
317 vt_ev.stop (display); 350 vt_ev.stop (display);
318 } 351 }
319 352
320 check_ev.stop (); 353 prepare_ev.stop ();
321 pty_ev.stop (); 354 pty_ev.stop ();
322#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
323 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
324#endif 357#endif
325#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
… …
333#endif 366#endif
334#ifdef POINTER_BLANK 367#ifdef POINTER_BLANK
335 pointer_ev.stop (); 368 pointer_ev.stop ();
336#endif 369#endif
337 370
338 destroy_ev.start (0); 371 destroy_ev.start ();
339} 372}
340 373
341void 374void
342rxvt_term::destroy_cb (time_watcher &w) 375rxvt_term::destroy_cb (ev::check &w, int revents)
343{ 376{
344 SET_R (this); 377 make_current ();
345 378
346 delete this; 379 delete this;
347} 380}
348 381
349/*----------------------------------------------------------------------*/ 382/*----------------------------------------------------------------------*/
… …
358{ 391{
359 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 392 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
360 (*t)->emergency_cleanup (); 393 (*t)->emergency_cleanup ();
361} 394}
362 395
363#if ENABLE_FRILLS 396#if !ENABLE_MINIMAL
364static void 397static void
365print_x_error (Display *dpy, XErrorEvent *event) 398print_x_error (Display *dpy, XErrorEvent *event)
366{ 399{
367 char buffer[BUFSIZ]; 400 char buffer[BUFSIZ];
368 char mesg[BUFSIZ]; 401 char mesg[BUFSIZ];
… …
401 else 434 else
402 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
403 mesg, BUFSIZ); 436 mesg, BUFSIZ);
404 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
405 } 438 }
406 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
407 mesg, BUFSIZ); 440 mesg, BUFSIZ);
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
409} 442}
410#endif 443#endif
411 444
… …
416 GET_R->allowedxerror = event->error_code; 449 GET_R->allowedxerror = event->error_code;
417 else 450 else
418 { 451 {
419 // GET_R is most likely not the terminal which caused the error, 452 // GET_R is most likely not the terminal which caused the error,
420 // so just output the error and continue 453 // so just output the error and continue
421#if ENABLE_FRILLS 454#if ENABLE_MINIMAL
455 old_xerror_handler (display, event);
456#else
422 print_x_error (display, event); 457 print_x_error (display, event);
423#else
424 old_xerror_handler (display, event);
425#endif 458#endif
426 } 459 }
427 460
428 return 0; 461 return 0;
429} 462}
… …
437 _exit (EXIT_FAILURE); 470 _exit (EXIT_FAILURE);
438} 471}
439 472
440/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
441bool 474bool
442rxvt_term::init (int argc, const char *const *argv) 475rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
443{ 476{
477 this->envv = envv;
478
444 SET_R (this); 479 SET_R (this);
445
446 set_locale (""); 480 set_locale ("");
481 set_environ (envv); // few things in X do not call setlocale :(
447 482
448 if (!init_vars ()) 483 if (!init_vars ())
449 return false; 484 return false;
450 485
451 init_secondary (); 486 init_secondary ();
… …
454 489
455#ifdef KEYSYM_RESOURCE 490#ifdef KEYSYM_RESOURCE
456 keyboard->register_done (); 491 keyboard->register_done ();
457#endif 492#endif
458 493
459#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]);
461#endif
462#ifdef HAVE_SCROLLBARS 494#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 495 if (option (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 496 scrollBar.setIdle (); /* set existence for size calculations */
465#endif 497#endif
466 498
499 pty = ptytty::create ();
500
467 create_windows (argc, argv); 501 create_windows (argc, argv);
468 502
469 dDisp;
470
471 init_xlocale (); 503 init_xlocale ();
472 504
473 scr_reset (); /* initialize screen */ 505 scr_reset (); // initialize screen
474 506
475#if 0 507#if 0
476 XSynchronize (disp, True); 508 XSynchronize (dpy, True);
477#endif 509#endif
478 510
479#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 512 if (option (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 513 resize_scrollbar (); /* create and map scrollbar */
482#endif 514#endif
483#if (MENUBAR_MAX) 515#ifdef HAVE_BG_PIXMAP
484 if (menubar_visible ()) 516 {
485 XMapWindow (disp, menuBar.win); 517 bgPixmap.set_target (this);
486#endif 518
487#ifdef TRANSPARENT 519#ifdef ENABLE_TRANSPARENCY
488 if (options & Opt_transparent) 520 if (option (Opt_transparent))
489 { 521 {
522 bgPixmap.set_transparent ();
523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif
527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
490 XSelectInput (disp, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
491 check_our_parents ();
492 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
493 } 535 }
494#endif 536#endif
495 537
496 XMapWindow (disp, TermWin.vt); 538#ifdef BG_IMAGE_FROM_FILE
497 XMapWindow (disp, TermWin.parent[0]); 539 if (rs[Rs_backgroundPixmap] != NULL)
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != NULL)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
561#endif
498 562
499 set_colorfgbg (); 563 set_colorfgbg ();
500 564
501 init_command (cmd_argv); 565 init_command (cmd_argv);
502 566
503 free (cmd_argv); 567 free (cmd_argv);
504 568
569 if (pty->pty >= 0)
505 pty_ev.start (pty.pty, EVENT_READ); 570 pty_ev.start (pty->pty, ev::READ);
506 571
507 check_ev.start (); 572 prepare_ev.start ();
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
508 588
509 return true; 589 return true;
510} 590}
511 591
512static struct sig_handlers 592static struct sig_handlers
513{ 593{
514 sig_watcher sw_chld, sw_term, sw_int; 594 ev::sig sw_term, sw_int;
515
516 void sig_chld (sig_watcher &w)
517 {
518 // we are being called for every SIGCHLD, find the corresponding term
519 int pid;
520
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid)
524 {
525 (*t)->destroy ();
526 break;
527 }
528 }
529 595
530 /* 596 /*
531 * Catch a fatal signal and tidy up before quitting 597 * Catch a fatal signal and tidy up before quitting
532 */ 598 */
533 void 599 void
534 sig_term (sig_watcher &w) 600 sig_term (ev::sig &w, int revents)
535 { 601 {
536#ifdef DEBUG_CMD
537 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
538#endif
539 rxvt_emergency_cleanup (); 602 rxvt_emergency_cleanup ();
540 signal (w.signum, SIG_DFL); 603 w.stop ();
541 kill (getpid (), w.signum); 604 kill (getpid (), w.signum);
542 } 605 }
543 606
544 sig_handlers () 607 sig_handlers ()
545 : sw_chld (this, &sig_handlers::sig_chld),
546 sw_term (this, &sig_handlers::sig_term), 608 : sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term) 609 sw_int (this, &sig_handlers::sig_term)
548 { 610 {
549 } 611 }
550} sig_handlers; 612} sig_handlers;
551 613
614char **rxvt_environ; // startup environment
615
552void 616void
553rxvt_init () 617rxvt_init ()
554{ 618{
555 /* 619 ptytty::init ();
556 * Save and then give up any super-user privileges 620
557 * If we need privileges in any area then we must specifically request it. 621 if (!ev::ev_default_loop (0))
558 * We should only need to be root in these cases: 622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
559 * 1. write utmp entries on some systems 623
560 * 2. chown tty on some systems 624 rxvt_environ = environ;
561 */
562 rxvt_privileges (SAVE);
563 rxvt_privileges (IGNORE);
564 625
565 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
567 628
568 sig_handlers.sw_chld.start (SIGCHLD);
569 sig_handlers.sw_term.start (SIGTERM); 629 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
570 sig_handlers.sw_int.start (SIGINT); 630 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
571 631
572 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
573 /* signal (SIGURG, SIG_DFL); */ 633 /* signal (SIGURG, SIG_DFL); */
574 634
575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss 636 // TODO: handle this with exceptions and tolerate the memory loss
577 XSetIOErrorHandler (rxvt_xioerror_handler); 637 XSetIOErrorHandler (rxvt_xioerror_handler);
638
639 XrmInitialize ();
578} 640}
579 641
580/* ------------------------------------------------------------------------- * 642/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 643 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 644 * ------------------------------------------------------------------------- */
… …
600 rxvt_fatal ("memory allocation failure. aborting.\n"); 662 rxvt_fatal ("memory allocation failure. aborting.\n");
601 663
602 return p; 664 return p;
603} 665}
604 666
605void * 667void *
606rxvt_realloc (void *ptr, size_t size) 668rxvt_realloc (void *ptr, size_t size)
607{ 669{
608 void *p = realloc (ptr, size); 670 void *p = realloc (ptr, size);
609 671
610 if (!p) 672 if (!p)
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 673 rxvt_fatal ("memory allocation failure. aborting.\n");
612 674
613 return p; 675 return p;
614} 676}
615 677
616/* ------------------------------------------------------------------------- *
617 * PRIVILEGED OPERATIONS *
618 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */
620void
621rxvt_privileges (rxvt_privaction action)
622{
623#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
624 static uid_t euid;
625 static gid_t egid;
626#endif
627
628#if ! defined(__CYGWIN32__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a))
633# define HAVE_SETEUID
634# endif
635# ifdef HAVE_SETEUID
636 switch (action)
637 {
638 case IGNORE:
639 /*
640 * change effective uid/gid - not real uid/gid - so we can switch
641 * back to root later, as required
642 */
643 seteuid (getuid ());
644 setegid (getgid ());
645 break;
646 case SAVE:
647 euid = geteuid ();
648 egid = getegid ();
649 break;
650 case RESTORE:
651 seteuid (euid);
652 setegid (egid);
653 break;
654 }
655# else
656 switch (action)
657 {
658 case IGNORE:
659 setuid (getuid ());
660 setgid (getgid ());
661 /* FALLTHROUGH */
662 case SAVE:
663 /* FALLTHROUGH */
664 case RESTORE:
665 break;
666 }
667# endif
668#endif
669}
670
671#ifdef UTMP_SUPPORT
672void
673rxvt_term::privileged_utmp (rxvt_privaction action)
674{
675 if ((options & Opt_utmpInhibit)
676 || !pty.name || !*pty.name)
677 return;
678
679 rxvt_privileges (RESTORE);
680
681 if (action == SAVE)
682 makeutent (pty.name, rs[Rs_display_name]);
683 else
684 cleanutent ();
685
686 rxvt_privileges (IGNORE);
687}
688#endif
689
690/*----------------------------------------------------------------------*/ 678/*----------------------------------------------------------------------*/
691/* 679/*
692 * window size/position calculcations for XSizeHint and other storage. 680 * window size/position calculations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 681 * if width/height are non-zero then override calculated width/height
694 */ 682 */
695void 683void
696rxvt_term::window_calc (unsigned int width, unsigned int height) 684rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 685{
698 short recalc_x, recalc_y; 686 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 687 int x, y, sb_w, flags;
700 unsigned int w, h; 688 unsigned int w, h;
701 unsigned int max_width, max_height; 689 unsigned int max_width, max_height;
702 dDisp;
703 690
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705 TermWin.ncol, TermWin.nrow, szHint.width,
706 szHint.height));
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 691 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 692 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 693 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 694
711 recalc_x = recalc_y = 0; 695 recalc_x = recalc_y = 0;
712 flags = 0; 696 flags = 0;
697
713 if (!parsed_geometry) 698 if (!parsed_geometry)
714 { 699 {
715 parsed_geometry = 1; 700 parsed_geometry = 1;
701
716 if (rs[Rs_geometry]) 702 if (rs[Rs_geometry])
717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 703 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718 704
719 if (flags & WidthValue) 705 if (flags & WidthValue)
720 { 706 {
721 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 707 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 708 szHint.flags |= USSize;
723 } 709 }
724 710
725 if (flags & HeightValue) 711 if (flags & HeightValue)
726 { 712 {
727 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 713 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728 szHint.flags |= USSize; 714 szHint.flags |= USSize;
729 } 715 }
730 716
731 if (flags & XValue) 717 if (flags & XValue)
732 { 718 {
733 szHint.x = x; 719 szHint.x = x;
734 szHint.flags |= USPosition; 720 szHint.flags |= USPosition;
721
735 if (flags & XNegative) 722 if (flags & XNegative)
736 { 723 {
737 recalc_x = 1; 724 recalc_x = 1;
738 szHint.win_gravity = NorthEastGravity; 725 szHint.win_gravity = NorthEastGravity;
739 } 726 }
… …
741 728
742 if (flags & YValue) 729 if (flags & YValue)
743 { 730 {
744 szHint.y = y; 731 szHint.y = y;
745 szHint.flags |= USPosition; 732 szHint.flags |= USPosition;
733
746 if (flags & YNegative) 734 if (flags & YNegative)
747 { 735 {
748 recalc_y = 1; 736 recalc_y = 1;
737
749 if (szHint.win_gravity == NorthEastGravity) 738 if (szHint.win_gravity == NorthEastGravity)
750 szHint.win_gravity = SouthEastGravity; 739 szHint.win_gravity = SouthEastGravity;
751 else 740 else
752 szHint.win_gravity = SouthWestGravity; 741 szHint.win_gravity = SouthWestGravity;
753 } 742 }
754 } 743 }
755 } 744 }
756 745
757 /* TODO: BOUNDS */ 746 /* TODO: BOUNDS */
758 TermWin.width = TermWin.ncol * TermWin.fwidth; 747 width = ncol * fwidth;
759 TermWin.height = TermWin.nrow * TermWin.fheight; 748 height = nrow * fheight;
760 max_width = MAX_COLS * TermWin.fwidth; 749 max_width = MAX_COLS * fwidth;
761 max_height = MAX_ROWS * TermWin.fheight; 750 max_height = MAX_ROWS * fheight;
762 751
763 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 752 szHint.base_width = szHint.base_height = 2 * int_bwidth;
764 753
765 sb_w = mb_h = 0; 754 sb_w = 0;
766 window_vt_x = window_vt_y = TermWin.int_bwidth; 755 window_vt_x = window_vt_y = int_bwidth;
767 756
768 if (scrollbar_visible ()) 757 if (scrollBar.state)
769 { 758 {
770 sb_w = scrollbar_TotalWidth (); 759 sb_w = scrollbar_TotalWidth ();
771 szHint.base_width += sb_w; 760 szHint.base_width += sb_w;
761
772 if (!(options & Opt_scrollBar_right)) 762 if (!option (Opt_scrollBar_right))
773 window_vt_x += sb_w; 763 window_vt_x += sb_w;
774 } 764 }
775 765
776 if (menubar_visible ())
777 {
778 mb_h = menuBar_TotalHeight ();
779 szHint.base_height += mb_h;
780 window_vt_y += mb_h;
781 }
782
783 szHint.width_inc = TermWin.fwidth; 766 szHint.width_inc = fwidth;
784 szHint.height_inc = TermWin.fheight; 767 szHint.height_inc = fheight;
785 szHint.min_width = szHint.base_width + szHint.width_inc; 768 szHint.min_width = szHint.base_width + szHint.width_inc;
786 szHint.min_height = szHint.base_height + szHint.height_inc; 769 szHint.min_height = szHint.base_height + szHint.height_inc;
787 770
788 if (width && width - szHint.base_width < max_width) 771 if (newwidth && newwidth - szHint.base_width < max_width)
789 { 772 {
790 szHint.width = width; 773 szHint.width = newwidth;
791 TermWin.width = width - szHint.base_width; 774 width = newwidth - szHint.base_width;
792 } 775 }
793 else 776 else
794 { 777 {
795 MIN_IT (TermWin.width, max_width); 778 min_it (width, max_width);
796 szHint.width = szHint.base_width + TermWin.width; 779 szHint.width = szHint.base_width + width;
797 } 780 }
798 781
799 if (height && height - szHint.base_height < max_height) 782 if (newheight && newheight - szHint.base_height < max_height)
800 { 783 {
801 szHint.height = height; 784 szHint.height = newheight;
802 TermWin.height = height - szHint.base_height; 785 height = newheight - szHint.base_height;
803 } 786 }
804 else 787 else
805 { 788 {
806 MIN_IT (TermWin.height, max_height); 789 min_it (height, max_height);
807 szHint.height = szHint.base_height + TermWin.height; 790 szHint.height = szHint.base_height + height;
808 } 791 }
809 792
810 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 793 if (scrollBar.state && option (Opt_scrollBar_right))
811 window_sb_x = szHint.width - sb_w; 794 window_sb_x = szHint.width - sb_w;
812 795
813 if (recalc_x) 796 if (recalc_x)
814 szHint.x += (DisplayWidth (disp, display->screen) 797 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
815 - szHint.width - 2 * TermWin.ext_bwidth); 798
816 if (recalc_y) 799 if (recalc_y)
817 szHint.y += (DisplayHeight (disp, display->screen) 800 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
818 - szHint.height - 2 * TermWin.ext_bwidth);
819 801
820 TermWin.ncol = TermWin.width / TermWin.fwidth; 802 ncol = width / fwidth;
821 TermWin.nrow = TermWin.height / TermWin.fheight; 803 nrow = height / fheight;
822 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823 TermWin.ncol, TermWin.nrow, szHint.width,
824 szHint.height));
825 return;
826} 804}
827 805
828/*----------------------------------------------------------------------*/ 806/*----------------------------------------------------------------------*/
829/* 807/*
830 * Tell the teletype handler what size the window is. 808 * Tell the teletype handler what size the window is.
831 * Called after a window size change. 809 * Called after a window size change.
832 */ 810 */
833void 811void
834rxvt_term::tt_winch () 812rxvt_term::tt_winch ()
835{ 813{
836 if (pty.pty < 0) 814 if (pty->pty < 0)
837 return; 815 return;
838 816
839 struct winsize ws; 817 struct winsize ws;
840 818
841 ws.ws_col = TermWin.ncol; 819 ws.ws_col = ncol;
842 ws.ws_row = TermWin.nrow; 820 ws.ws_row = nrow;
843 ws.ws_xpixel = TermWin.width; 821 ws.ws_xpixel = width;
844 ws.ws_ypixel = TermWin.height; 822 ws.ws_ypixel = height;
845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 823 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
846 824
847#if 0 825#if 0
848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 826 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849 if (cmd_pid) /* force through to the command */ 827 if (cmd_pid) /* force through to the command */
850 kill (-cmd_pid, SIGWINCH); 828 kill (-cmd_pid, SIGWINCH);
… …
873 return false; 851 return false;
874 } 852 }
875 853
876#if ENABLE_STYLES 854#if ENABLE_STYLES
877 for (int i = RS_styleCount; --i; ) 855 for (int i = RS_styleCount; --i; )
878 if (TermWin.fontset[i] != TermWin.fontset[0]) 856 if (fontset[i] != fontset[0])
879 delete TermWin.fontset[i]; 857 delete fontset[i];
880#endif 858#endif
881 859
882 delete TermWin.fontset[0]; 860 delete fontset[0];
883 TermWin.fontset[0] = fs; 861 fontset[0] = fs;
884 862
885 prop = (*fs)[1]->properties (); 863 prop = (*fs)[1]->properties ();
886 prop.height += TermWin.lineSpace; 864 prop.height += lineSpace;
865
887 fs->set_prop (prop); 866 fs->set_prop (prop, false);
888 867
889 TermWin.fwidth = prop.width; 868 fwidth = prop.width;
890 TermWin.fheight = prop.height; 869 fheight = prop.height;
891 TermWin.fweight = prop.weight; 870 fbase = prop.ascent;
892 TermWin.fslant = prop.slant;
893 TermWin.fbase = (*fs)[1]->ascent;
894 871
895 for (int style = 1; style < 4; style++) 872 for (int style = 1; style < 4; style++)
896 { 873 {
897#if ENABLE_STYLES 874#if ENABLE_STYLES
898 const char *res = rs[Rs_font + style]; 875 const char *res = rs[Rs_font + style];
899 876
900 if (res && !*res) 877 if (res && !*res)
901 TermWin.fontset[style] = TermWin.fontset[0]; 878 fontset[style] = fontset[0];
902 else 879 else
903 { 880 {
904 TermWin.fontset[style] = fs = new rxvt_fontset (this); 881 fontset[style] = fs = new rxvt_fontset (this);
905 rxvt_fontprop prop2 = prop; 882 rxvt_fontprop prop2 = prop;
906 883
907 if (res) 884 if (res)
908 prop2.weight = prop2.slant = rxvt_fontprop::unset; 885 {
886 fs->populate (res);
887 fs->set_prop (prop2, false);
888 }
909 else 889 else
910 { 890 {
911 res = TermWin.fontset[0]->fontdesc; 891 fs->populate (fontset[0]->fontdesc);
912 892
913 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 893 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
914 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 894 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
895
896 fs->set_prop (prop2, true);
915 } 897 }
916 898
917 fs->populate (res);
918 fs->set_prop (prop2);
919 } 899 }
920#else 900#else
921 TermWin.fontset[style] = TermWin.fontset[0]; 901 fontset[style] = fontset[0];
922#endif 902#endif
923 } 903 }
924 904
925 if (TermWin.parent[0]) 905 if (parent[0])
926 { 906 {
927 resize_all_windows (0, 0, 0); 907 resize_all_windows (0, 0, 0);
928 scr_remap_chars (); 908 scr_remap_chars ();
929 scr_touch (true); 909 scr_touch (true);
930 } 910 }
931 911
932 return true; 912 return true;
933} 913}
934 914
915void
935void rxvt_term::set_string_property (Atom prop, const char *str, int len) 916rxvt_term::set_string_property (Atom prop, const char *str, int len)
936{ 917{
937 // TODO: SMART_WINDOW_TITLE
938 XChangeProperty (display->display, TermWin.parent[0], 918 XChangeProperty (dpy, parent[0],
939 prop, XA_STRING, 8, PropModeReplace, 919 prop, XA_STRING, 8, PropModeReplace,
940 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 920 (const unsigned char *)str, len >= 0 ? len : strlen (str));
941} 921}
942 922
923void
943void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 924rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944{ 925{
945 // TODO: SMART_WINDOW_TITLE
946 wchar_t *ws = rxvt_mbstowcs (str, len); 926 wchar_t *ws = rxvt_mbstowcs (str, len);
947 char *s = rxvt_wcstoutf8 (ws); 927 char *s = rxvt_wcstoutf8 (ws);
948 928
949 XChangeProperty (display->display, TermWin.parent[0], 929 XChangeProperty (dpy, parent[0],
950 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 930 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951 (const unsigned char *)s, strlen (s)); 931 (const unsigned char *)s, strlen (s));
952 932
953 free (s); 933 free (s);
954 free (ws); 934 free (ws);
… …
973#if ENABLE_EWMH 953#if ENABLE_EWMH
974 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 954 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
975#endif 955#endif
976} 956}
977 957
958void
959rxvt_term::set_window_color (int idx, const char *color)
960{
978#ifdef XTERM_COLOR_CHANGE 961#ifdef XTERM_COLOR_CHANGE
979void
980rxvt_term::set_window_color (int idx, const char *color)
981{
982 rxvt_color xcol; 962 rxvt_color xcol;
983 int i; 963 int i;
984 964
985 if (color == NULL || *color == '\0') 965 if (color == NULL || *color == '\0')
986 return; 966 return;
967
968 color = strdup (color);
969 allocated.push_back ((void *)color);
970 rs[Rs_color + idx] = color;
987 971
988 /* handle color aliases */ 972 /* handle color aliases */
989 if (isdigit (*color)) 973 if (isdigit (*color))
990 { 974 {
991 i = atoi (color); 975 i = atoi (color);
992 976
993 if (i >= 8 && i <= 15) 977 if (i >= 8 && i <= 15)
994 { /* bright colors */ 978 { /* bright colors */
995 i -= 8; 979 i -= 8;
996# ifndef NO_BRIGHTCOLOR
997 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
998 SET_PIXCOLOR (idx);
999 goto done; 981 goto done;
1000# endif
1001 } 982 }
1002 983
1003 if (i >= 0 && i <= 7) 984 if (i >= 0 && i <= 7)
1004 { /* normal colors */ 985 { /* normal colors */
1005 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1006 SET_PIXCOLOR (idx);
1007 goto done; 987 goto done;
1008 } 988 }
1009 } 989 }
1010 990
1011 if (!rXParseAllocColor (&xcol, color)) 991 set_color (xcol, color);
1012 return;
1013
1014 /* XStoreColor (display->display, display->cmap, XColor*); */
1015 992
1016 /* 993 /*
1017 * FIXME: should free colors here, but no idea how to do it so instead, 994 * FIXME: should free colors here, but no idea how to do it so instead,
1018 * so just keep gobbling up the colormap 995 * so just keep gobbling up the colormap
1019 */ 996 */
1020# if 0
1021 for (i = Color_Black; i <= Color_White; i++)
1022 if (pix_colors[idx] == pix_colors[i])
1023 break;
1024 if (i > Color_White)
1025 {
1026 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1027 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1028 DisplayPlanes (display->display, display->screen));
1029 }
1030# endif
1031 997
1032 pix_colors_focused[idx] = xcol; 998 pix_colors_focused[idx] = xcol;
1033 SET_PIXCOLOR (idx);
1034 999
1035 /* XSetWindowAttributes attr; */ 1000 /* XSetWindowAttributes attr; */
1036 /* Cursor cursor; */ 1001 /* Cursor cursor; */
1037done: 1002done:
1038
1039#if OFF_FOCUS_FADING
1040 if (rs[Rs_fade])
1041 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1042#endif
1043
1044 /*TODO: handle Color_BD, scrollbar background, etc. */ 1003 /*TODO: handle Color_BD, scrollbar background, etc. */
1045 1004
1005 update_fade_color (idx);
1046 recolour_cursor (); 1006 recolour_cursor ();
1047 scr_recolour (); 1007 scr_recolour ();
1048}
1049
1050#else
1051# define set_window_color (idx,color) ((void)0)
1052#endif /* XTERM_COLOR_CHANGE */ 1008#endif /* XTERM_COLOR_CHANGE */
1009}
1053 1010
1054void 1011void
1055rxvt_term::recolour_cursor () 1012rxvt_term::recolour_cursor ()
1056{ 1013{
1057 XColor xcol[2]; 1014 XColor fg, bg;
1058 1015
1059 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1016 (ISSET_PIXCOLOR (Color_pointer_fg)
1060 ? pix_colors_focused[Color_pointer_fg] 1017 ? pix_colors_focused[Color_pointer_fg]
1061 : pix_colors_focused[Color_fg]; 1018 : pix_colors_focused[Color_fg]).get (fg);
1019
1062 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1020 (ISSET_PIXCOLOR (Color_pointer_bg)
1063 ? pix_colors_focused[Color_pointer_bg] 1021 ? pix_colors_focused[Color_pointer_bg]
1064 : pix_colors_focused[Color_bg]; 1022 : pix_colors_focused[Color_bg]).get (bg);
1065 1023
1066 XQueryColors (display->display, display->cmap, xcol, 2); 1024 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1067 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1068} 1025}
1069 1026
1070/*----------------------------------------------------------------------*/ 1027/*----------------------------------------------------------------------*/
1071/* 1028/*
1072 * find if fg/bg matches any of the normal (low-intensity) colors 1029 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1076{ 1033{
1077 unsigned int i; 1034 unsigned int i;
1078 const char *xpmb = "\0"; 1035 const char *xpmb = "\0";
1079 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1036 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1080 1037
1081 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1082 strcpy (fstr, "default"); 1038 strcpy (fstr, "default");
1083 strcpy (bstr, "default"); 1039 strcpy (bstr, "default");
1084 for (i = Color_Black; i <= Color_White; i++) 1040 for (i = Color_Black; i <= Color_White; i++)
1085 if (pix_colors[Color_fg] == pix_colors[i]) 1041 if (pix_colors[Color_fg] == pix_colors[i])
1086 { 1042 {
… …
1090 1046
1091 for (i = Color_Black; i <= Color_White; i++) 1047 for (i = Color_Black; i <= Color_White; i++)
1092 if (pix_colors[Color_bg] == pix_colors[i]) 1048 if (pix_colors[Color_bg] == pix_colors[i])
1093 { 1049 {
1094 sprintf (bstr, "%d", (i - Color_Black)); 1050 sprintf (bstr, "%d", (i - Color_Black));
1095#ifdef XPM_BACKGROUND 1051#ifdef BG_IMAGE_FROM_FILE
1096 xpmb = "default;"; 1052 xpmb = "default;";
1097#endif 1053#endif
1098 break; 1054 break;
1099 } 1055 }
1100 1056
1101 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1057 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1102} 1058}
1103 1059
1104/*----------------------------------------------------------------------*/ 1060/*----------------------------------------------------------------------*/
1105 1061
1106int 1062bool
1107rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1063rxvt_term::set_color (rxvt_color &color, const char *name)
1108{ 1064{
1109 if (!screen_in_out->set (display, colour)) 1065 if (color.set (this, name))
1110 {
1111 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1112 return false;
1113 }
1114
1115 return true; 1066 return true;
1067
1068 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1069 return false;
1070}
1071
1072void
1073rxvt_term::alias_color (int dst, int src)
1074{
1075 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1116} 1076}
1117 1077
1118/* -------------------------------------------------------------------- * 1078/* -------------------------------------------------------------------- *
1119 * - WINDOW RESIZING - * 1079 * - WINDOW RESIZING - *
1120 * -------------------------------------------------------------------- */ 1080 * -------------------------------------------------------------------- */
1121void 1081void
1122rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1082rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1123{ 1083{
1124 int fix_screen; 1084 int fix_screen;
1125#ifdef SMART_RESIZE 1085 int old_width = szHint.width;
1126 int old_width = szHint.width, old_height = szHint.height; 1086 int old_height = szHint.height;
1127#endif
1128 dDisp;
1129 1087
1130 window_calc (width, height); 1088 window_calc (newwidth, newheight);
1089
1090 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1131 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1091 XSetWMNormalHints (dpy, parent[0], &szHint);
1132 1092
1133 if (!ignoreparent) 1093 if (!ignoreparent)
1134 { 1094 {
1135#ifdef SMART_RESIZE 1095#ifdef SMART_RESIZE
1136 /* 1096 /*
… …
1140 int x, y, x1, y1; 1100 int x, y, x1, y1;
1141 int dx, dy; 1101 int dx, dy;
1142 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1102 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1143 Window unused_cr; 1103 Window unused_cr;
1144 1104
1145 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1105 XTranslateCoordinates (dpy, parent[0], display->root,
1146 0, 0, &x, &y, &unused_cr); 1106 0, 0, &x, &y, &unused_cr);
1147 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1107 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1148 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1108 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1149 /* 1109 /*
1150 * if display->root isn't the parent window, a WM will probably have offset 1110 * if display->root isn't the parent window, a WM will probably have offset
1151 * our position for handles and decorations. Counter it 1111 * our position for handles and decorations. Counter it
1152 */ 1112 */
… …
1154 { 1114 {
1155 x -= x1; 1115 x -= x1;
1156 y -= y1; 1116 y -= y1;
1157 } 1117 }
1158 1118
1159 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1119 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1160 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1120 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1161 dx = old_width - szHint.width; 1121 dx = old_width - szHint.width;
1162 dy = old_height - szHint.height; 1122 dy = old_height - szHint.height;
1163 1123
1164 /* Check position of the center of the window */ 1124 /* Check position of the center of the window */
1165 if (x < x1) /* left half */ 1125 if (x < x1) /* left half */
1166 dx = 0; 1126 dx = 0;
… …
1169 if (y < y1) /* top half */ 1129 if (y < y1) /* top half */
1170 dy = 0; 1130 dy = 0;
1171 else if (y == y1) /* exact center */ 1131 else if (y == y1) /* exact center */
1172 dy /= 2; 1132 dy /= 2;
1173 1133
1174 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1134 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1175 szHint.width, szHint.height); 1135 szHint.width, szHint.height);
1176#else 1136#else
1177 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1137 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1178#endif 1138#endif
1179 } 1139 }
1180 1140
1181 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1141 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1182 1142
1183 if (fix_screen || width != old_width || height != old_height) 1143 if (fix_screen || newwidth != old_width || newheight != old_height)
1184 { 1144 {
1185 if (scrollbar_visible ()) 1145 if (scrollBar.state)
1186 { 1146 {
1187 XMoveResizeWindow (disp, scrollBar.win, 1147 XMoveResizeWindow (dpy, scrollBar.win,
1188 window_sb_x, 0, 1148 window_sb_x, 0,
1189 scrollbar_TotalWidth (), szHint.height); 1149 scrollbar_TotalWidth (), szHint.height);
1190 resize_scrollbar (); 1150 resize_scrollbar ();
1191 } 1151 }
1192 1152
1193 if (menubar_visible ())
1194 XMoveResizeWindow (disp, menuBar.win,
1195 window_vt_x, 0,
1196 TermWin_TotalWidth (), menuBar_TotalHeight ());
1197
1198 XMoveResizeWindow (disp, TermWin.vt, 1153 XMoveResizeWindow (dpy, vt,
1199 window_vt_x, window_vt_y, 1154 window_vt_x, window_vt_y,
1200 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1155 width, height);
1156
1157#ifdef HAVE_BG_PIXMAP
1158 if (bgPixmap.window_size_sensitive ())
1159 update_background ();
1160#endif
1201 1161
1202 scr_clear (); 1162 scr_clear ();
1203#ifdef XPM_BACKGROUND
1204 resize_pixmap ();
1205#endif
1206 } 1163 }
1207 1164
1208 if (fix_screen || old_height == 0) 1165 if (fix_screen || old_height == 0)
1209 {
1210 int curr_screen = -1;
1211 int old_ncol = prev_ncol;
1212
1213 /* scr_reset only works on the primary screen */
1214 if (old_height) /* this is not the first time through */
1215 {
1216 unsigned int ncol = TermWin.ncol;
1217 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1218 curr_screen = scr_change_screen (PRIMARY);
1219 TermWin.ncol = ncol;
1220 }
1221
1222 scr_reset (); 1166 scr_reset ();
1223 1167
1224 if (curr_screen >= 0) /* this is not the first time through */ 1168 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1225 { 1169 //scr_touch (false);
1226 scr_change_screen (curr_screen);
1227 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1228 }
1229 }
1230 1170
1231 old_width = szHint.width; 1171#ifdef HAVE_BG_PIXMAP
1232 old_height = szHint.height; 1172// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1233 1173// if (bgPixmap.pixmap)
1234#ifdef XPM_BACKGROUND
1235 if (TermWin.pixmap)
1236 scr_touch (false); 1174// scr_touch (false);
1237#endif 1175#endif
1238 1176
1239#ifdef USE_XIM 1177#ifdef USE_XIM
1240 IMSetStatusPosition (); 1178 IMSetPosition ();
1241#endif 1179#endif
1242} 1180}
1243 1181
1244/* 1182/*
1245 * Set the width/height of the vt window in characters. Units are pixels. 1183 * Set the width/height of the vt window in characters. Units are pixels.
1246 * good for toggling 80/132 columns 1184 * good for toggling 80/132 columns
1247 */ 1185 */
1248void 1186void
1249rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1187rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1250{ 1188{
1251 XWindowAttributes wattr; 1189 XWindowAttributes wattr;
1252 1190
1253 if (width == 0 || height == 0) 1191 if (newwidth == 0 || newheight == 0)
1254 { 1192 {
1255 XGetWindowAttributes (display->display, display->root, &wattr); 1193 XGetWindowAttributes (dpy, display->root, &wattr);
1256 1194
1257 if (width == 0) 1195 if (newwidth == 0)
1258 width = wattr.width - szHint.base_width; 1196 newwidth = wattr.width - szHint.base_width;
1259 if (height == 0) 1197 if (newheight == 0)
1260 height = wattr.height - szHint.base_height; 1198 newheight = wattr.height - szHint.base_height;
1261 }
1262
1263 if (width != TermWin.width || height != TermWin.height)
1264 { 1199 }
1200
1201 if (newwidth != width || newheight != height)
1202 {
1265 width += szHint.base_width; 1203 newwidth += szHint.base_width;
1266 height += szHint.base_height; 1204 newheight += szHint.base_height;
1267 resize_all_windows (width, height, 0); 1205 resize_all_windows (newwidth, newheight, 0);
1268 } 1206 }
1269} 1207}
1270 1208
1271/* -------------------------------------------------------------------- * 1209/* -------------------------------------------------------------------- *
1272 * - X INPUT METHOD ROUTINES - * 1210 * - X INPUT METHOD ROUTINES - *
… …
1274#ifdef USE_XIM 1212#ifdef USE_XIM
1275 1213
1276void 1214void
1277rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1215rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1278{ 1216{
1279 fg = pix_colors[Color_fg]; 1217 fg = pix_colors [Color_fg];
1280 bg = pix_colors[Color_bg]; 1218 bg = pix_colors [Color_bg];
1281} 1219}
1282 1220
1283void 1221void
1284rxvt_term::im_set_size (XRectangle &size) 1222rxvt_term::im_set_size (XRectangle &size)
1285{ 1223{
1286 // the int_bwidth terms make no sense to me 1224 // the int_bwidth terms make no sense to me
1287 size.x = TermWin.int_bwidth; 1225 size.x = int_bwidth;
1288 size.y = TermWin.int_bwidth; 1226 size.y = int_bwidth;
1289 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1227 size.width = Width2Pixel (ncol) + int_bwidth;
1290 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1228 size.height = Height2Pixel (nrow) + int_bwidth;
1291} 1229}
1292 1230
1293void 1231void
1294rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1232rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295 XRectangle &status_rect, 1233 XRectangle &status_rect,
1296 const XRectangle &needed_rect) 1234 const XRectangle &needed_rect)
1297{ 1235{
1298 preedit_rect.x = needed_rect.width; 1236 preedit_rect.x = needed_rect.width;
1299 preedit_rect.y = 0; 1237 preedit_rect.y = 0;
1300 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1238 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301 preedit_rect.height = TermWin.fheight; 1239 preedit_rect.height = fheight;
1302 1240
1303 status_rect.x = 0; 1241 status_rect.x = 0;
1304 status_rect.y = 0; 1242 status_rect.y = 0;
1305 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1243 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306 status_rect.height = TermWin.fheight; 1244 status_rect.height = fheight;
1307} 1245}
1308 1246
1309/* Checking whether input method is running. */ 1247/* Checking whether input method is running. */
1310bool 1248bool
1311rxvt_term::IMisRunning () 1249rxvt_term::IMisRunning ()
… …
1322 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1260 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1323 1261
1324 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1262 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1325 *p = '\0'; 1263 *p = '\0';
1326 1264
1327 atom = XInternAtom (display->display, server, False); 1265 atom = XInternAtom (dpy, server, False);
1328 win = XGetSelectionOwner (display->display, atom); 1266 win = XGetSelectionOwner (dpy, atom);
1329 1267
1330 if (win != None) 1268 if (win != None)
1331 return True; 1269 return True;
1332 } 1270 }
1333 1271
… …
1339{ 1277{
1340 XPoint nspot; 1278 XPoint nspot;
1341 XVaNestedList preedit_attr; 1279 XVaNestedList preedit_attr;
1342 1280
1343 if (!Input_Context 1281 if (!Input_Context
1344 || !TermWin.focus 1282 || !focus
1345 || !(input_style & XIMPreeditPosition)) 1283 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1346 return; 1284 return;
1347 1285
1348 im_set_position (nspot); 1286 im_set_position (nspot);
1349 1287
1350 if (nspot.x == spot.x && nspot.y == spot.y) 1288 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1369 input_method = 0; 1307 input_method = 0;
1370 } 1308 }
1371 1309
1372 Input_Context = 0; 1310 Input_Context = 0;
1373} 1311}
1312
1313#ifdef ENABLE_XIM_ONTHESPOT
1314
1315static void
1316xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1317{
1318 ((rxvt_term *)client_data)->make_current ();
1319 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1320}
1321
1322static void
1323xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1324{
1325 ((rxvt_term *)client_data)->make_current ();
1326 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1327}
1328
1329static void
1330xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1331{
1332 rxvt_term *term = (rxvt_term *)client_data;
1333 XIMText *text = call_data->text;
1334
1335 term->make_current ();
1336
1337 if (text)
1338 {
1339 void *str;
1340
1341 if (!text->encoding_is_wchar && text->string.multi_byte)
1342 {
1343 // of course, X makes it ugly again
1344 if (term->rs[Rs_imLocale])
1345 SET_LOCALE (term->rs[Rs_imLocale]);
1346
1347 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1348 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1349
1350 if (term->rs[Rs_imLocale])
1351 SET_LOCALE (term->locale);
1352 }
1353 else
1354 str = (void *)text->string.wide_char;
1355
1356 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1357 DT_INT, call_data->caret,
1358 DT_INT, call_data->chg_first,
1359 DT_INT, call_data->chg_length,
1360 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1361 DT_WCS_LEN, str, str ? (int)text->length : 0,
1362 DT_END));
1363 }
1364 else
1365 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1366 DT_INT, call_data->caret,
1367 DT_INT, call_data->chg_first,
1368 DT_INT, call_data->chg_length,
1369 DT_END));
1370}
1371
1372#if 0
1373static void
1374xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1375{
1376 ((rxvt_term *)client_data)->make_current ();
1377 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1378 DT_INT, call_data->position,
1379 DT_INT, call_data->direction,
1380 DT_INT, call_data->style,
1381 DT_END));
1382}
1383#endif
1384
1385#endif
1374 1386
1375/* 1387/*
1376 * Try to open a XIM with the current modifiers, then see if we can 1388 * Try to open a XIM with the current modifiers, then see if we can
1377 * open a suitable preedit type 1389 * open a suitable preedit type
1378 */ 1390 */
… …
1385 XRectangle rect, status_rect, needed_rect; 1397 XRectangle rect, status_rect, needed_rect;
1386 unsigned long fg, bg; 1398 unsigned long fg, bg;
1387 const char *p; 1399 const char *p;
1388 char **s; 1400 char **s;
1389 XIMStyles *xim_styles; 1401 XIMStyles *xim_styles;
1402#ifdef ENABLE_XIM_ONTHESPOT
1403 XIMCallback xcb[4];
1404#endif
1405
1406 set_environ (envv);
1390 1407
1391 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1408 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1392 return false; 1409 return false;
1393 1410
1394 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1395 input_method = display->get_xim (locale, modifiers); 1411 input_method = display->get_xim (locale, modifiers);
1396 if (input_method == NULL) 1412 if (input_method == NULL)
1397 return false; 1413 return false;
1398 1414
1399 xim = input_method->xim; 1415 xim = input_method->xim;
… …
1419 s = rxvt_splitcommastring (p); 1435 s = rxvt_splitcommastring (p);
1420 1436
1421 for (i = found = 0; !found && s[i]; i++) 1437 for (i = found = 0; !found && s[i]; i++)
1422 { 1438 {
1423 if (!strcmp (s[i], "OverTheSpot")) 1439 if (!strcmp (s[i], "OverTheSpot"))
1424 input_style = (XIMPreeditPosition | XIMStatusNothing); 1440 input_style = XIMPreeditPosition | XIMStatusNothing;
1425 else if (!strcmp (s[i], "OffTheSpot")) 1441 else if (!strcmp (s[i], "OffTheSpot"))
1426 input_style = (XIMPreeditArea | XIMStatusArea); 1442 input_style = XIMPreeditArea | XIMStatusArea;
1427 else if (!strcmp (s[i], "Root")) 1443 else if (!strcmp (s[i], "Root"))
1428 input_style = (XIMPreeditNothing | XIMStatusNothing); 1444 input_style = XIMPreeditNothing | XIMStatusNothing;
1429 else if (!strcmp (s[i], "None")) 1445 else if (!strcmp (s[i], "None"))
1430 input_style = (XIMPreeditNone | XIMStatusNone); 1446 input_style = XIMPreeditNone | XIMStatusNone;
1447#ifdef ENABLE_XIM_ONTHESPOT
1448 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1449 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1450#endif
1451 else
1452 input_style = XIMPreeditNothing | XIMStatusNothing;
1431 1453
1432 for (j = 0; j < xim_styles->count_styles; j++) 1454 for (j = 0; j < xim_styles->count_styles; j++)
1433 if (input_style == xim_styles->supported_styles[j]) 1455 if (input_style == xim_styles->supported_styles[j])
1434 { 1456 {
1435 rxvt_freecommastring (s); 1457 rxvt_freecommastring (s);
… …
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1491 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1492 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1493 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1494 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "*", 1495 "*",
1474 TermWin.fheight, 1496 fheight,
1475 TermWin.fheight + 1, TermWin.fheight - 1, 1497 fheight + 1, fheight - 1,
1476 TermWin.fheight - 2, TermWin.fheight + 2); 1498 fheight - 2, fheight + 2);
1477 1499
1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1500 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479 &missing_charset_list, &missing_charset_count, &def_string); 1501 &missing_charset_list, &missing_charset_count, &def_string);
1480 1502
1481 if (missing_charset_list) 1503 if (missing_charset_list)
1482 XFreeStringList (missing_charset_list); 1504 XFreeStringList (missing_charset_list);
1483 1505
… …
1524 XNBackground, bg, 1546 XNBackground, bg,
1525 XNArea, &status_rect, 1547 XNArea, &status_rect,
1526 XNFontSet, fs, 1548 XNFontSet, fs,
1527 NULL); 1549 NULL);
1528 } 1550 }
1551#if ENABLE_XIM_ONTHESPOT
1552 else if (input_style & XIMPreeditCallbacks)
1553 {
1554 im_set_position (spot);
1555
1556 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1557 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1558 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1559# if 0
1560 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1561# endif
1562
1563 preedit_attr = XVaCreateNestedList (0,
1564 XNSpotLocation, &spot,
1565 XNPreeditStartCallback, &xcb[0],
1566 XNPreeditDoneCallback , &xcb[1],
1567 XNPreeditDrawCallback , &xcb[2],
1568# if 0
1569 XNPreeditCaretCallback, &xcb[3],
1570# endif
1571 NULL);
1572 }
1573#endif
1529 1574
1530 Input_Context = XCreateIC (xim, 1575 Input_Context = XCreateIC (xim,
1531 XNInputStyle, input_style, 1576 XNInputStyle, input_style,
1532 XNClientWindow, TermWin.vt, 1577 XNClientWindow, vt,
1533 XNFocusWindow, TermWin.parent[0], 1578 XNFocusWindow, parent[0],
1534 preedit_attr ? XNPreeditAttributes : NULL, 1579 preedit_attr ? XNPreeditAttributes : NULL,
1535 preedit_attr, 1580 preedit_attr,
1536 status_attr ? XNStatusAttributes : NULL, 1581 status_attr ? XNStatusAttributes : NULL,
1537 status_attr, NULL); 1582 status_attr, NULL);
1538 1583
1539 if (preedit_attr) XFree (preedit_attr); 1584 if (preedit_attr) XFree (preedit_attr);
1540 if (status_attr) XFree (status_attr); 1585 if (status_attr) XFree (status_attr);
1541 if (fs) XFreeFontSet (display->display, fs); 1586 if (fs) XFreeFontSet (dpy, fs);
1542 1587
1543 if (Input_Context == NULL) 1588 if (Input_Context == NULL)
1544 { 1589 {
1545 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1590 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1546 im_destroy (); 1591 im_destroy ();
1547 return false; 1592 return false;
1548 } 1593 }
1549 1594
1550 if (input_style & XIMPreeditArea) 1595#if 0
1596 // unfortunately, only the focus window is used by XIM, hard to fix
1597 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1598 vt_select_input ();
1599#endif
1600
1551 IMSetStatusPosition (); 1601 IMSetPosition ();
1552 1602
1553 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1554 return true; 1603 return true;
1555} 1604}
1556 1605
1557void 1606void
1558rxvt_term::im_cb () 1607rxvt_term::im_cb ()
… …
1560 int i; 1609 int i;
1561 const char *p; 1610 const char *p;
1562 char **s; 1611 char **s;
1563 char buf[IMBUFSIZ]; 1612 char buf[IMBUFSIZ];
1564 1613
1565 SET_R (this); 1614 make_current ();
1566 1615
1567 im_destroy (); 1616 im_destroy ();
1568 1617
1569 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1570 if (Input_Context) 1618 if (Input_Context)
1571 return; 1619 return;
1572 1620
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1621#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1622 if (rs[Rs_imLocale])
… …
1616 SET_LOCALE (locale); 1664 SET_LOCALE (locale);
1617#endif 1665#endif
1618} 1666}
1619 1667
1620void 1668void
1621rxvt_term::IMSetStatusPosition () 1669rxvt_term::IMSetPosition ()
1622{ 1670{
1623 XRectangle preedit_rect, status_rect, *needed_rect; 1671 XRectangle preedit_rect, status_rect, *needed_rect;
1624 XVaNestedList preedit_attr, status_attr; 1672 XVaNestedList preedit_attr, status_attr;
1625 1673
1626 if (!Input_Context 1674 if (!Input_Context
1627 || !TermWin.focus 1675 || !focus
1628 || !(input_style & XIMPreeditArea) 1676 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1629 || !IMisRunning ()) 1677 || !IMisRunning ())
1630 return; 1678 return;
1631 1679
1680 if (input_style & XIMPreeditPosition)
1681 {
1682 im_set_size (preedit_rect);
1683 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1684
1685 XSetICValues (Input_Context,
1686 XNPreeditAttributes, preedit_attr, NULL);
1687 }
1688 else
1689 {
1632 /* Getting the necessary width of preedit area */ 1690 /* Getting the necessary width of preedit area */
1633 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1691 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1634 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1692 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1635 XFree (status_attr); 1693 XFree (status_attr);
1636 1694
1637 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1695 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1638 XFree (needed_rect); 1696 XFree (needed_rect);
1639 1697
1640 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1698 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1641 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1699 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1642 1700
1643 XSetICValues (Input_Context, 1701 XSetICValues (Input_Context,
1644 XNPreeditAttributes, preedit_attr, 1702 XNPreeditAttributes, preedit_attr,
1645 XNStatusAttributes, status_attr, NULL); 1703 XNStatusAttributes, status_attr,
1704 NULL);
1646 1705
1706 XFree (status_attr);
1707 }
1708
1647 XFree (preedit_attr); 1709 XFree (preedit_attr);
1648 XFree (status_attr);
1649} 1710}
1650#endif /* USE_XIM */ 1711#endif /* USE_XIM */
1651 1712
1652/*----------------------------------------------------------------------*/ 1713void
1653rxvt_t rxvt_current_term; 1714rxvt_term::get_window_origin (int &x, int &y)
1715{
1716 Window cr;
1717 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1718/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1719}
1720
1721Pixmap
1722rxvt_term::get_pixmap_property (int prop_id)
1723{
1724 if (prop_id > 0 && prop_id < NUM_XA)
1725 if (xa[prop_id])
1726 {
1727 int aformat;
1728 unsigned long nitems, bytes_after;
1729 Atom atype;
1730 unsigned char *prop = NULL;
1731 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1732 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1733 &nitems, &bytes_after, &prop);
1734 if (result == Success && prop && atype == XA_PIXMAP)
1735 {
1736 return *(Pixmap *)prop;
1737 }
1738 }
1739 return None;
1740}
1741
1742#ifdef HAVE_BG_PIXMAP
1743int
1744rxvt_term::update_background ()
1745{
1746 bgPixmap.invalidate ();
1747
1748 /* no chance of real time refresh if we are blurring! */
1749 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1750 bgPixmap.render ();
1751 else
1752 {
1753 update_background_ev.stop ();
1754
1755 if (!bgPixmap.need_client_side_rendering())
1756 update_background_ev.start (.05);
1757 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1758 update_background_ev.start (.20); /* very slow !!! */
1759 else
1760 update_background_ev.start (.07);
1761 }
1762
1763 return 0;
1764}
1765
1766void
1767rxvt_term::update_background_cb (ev::timer &w, int revents)
1768{
1769 bgPixmap.render ();
1770}
1771
1772#endif /* HAVE_BG_PIXMAP */
1654 1773
1655/*----------------------- end-of-file (C source) -----------------------*/ 1774/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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