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

Diff Legend

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