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.137 by root, Tue Feb 15 16:04:45 2005 UTC vs.
Revision 1.222 by root, Sun Feb 12 09:44:04 2006 UTC

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

Diff Legend

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