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

Diff Legend

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