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.80 by root, Fri Aug 13 19:31:23 2004 UTC vs.
Revision 1.135 by root, Sun Feb 13 11:07:57 2005 UTC

32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35#include "main.intpro" /* PROTOS for internal routines */
36 36
37#include <signal.h> 37#include <csignal>
38#include <cstring>
38 39
39#ifdef TTY_GID_SUPPORT 40#ifdef TTY_GID_SUPPORT
40# include <grp.h> 41# include <grp.h>
41#endif 42#endif
42 43
43#ifdef HAVE_TERMIOS_H 44#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45# include <termios.h>
45#endif 46#endif
46 47
47#include <cstring> 48#ifdef KEYSYM_RESOURCE
49# include "keyboard.h"
50#endif
48 51
49vector<rxvt_term *> rxvt_term::termlist; 52vector<rxvt_term *> rxvt_term::termlist;
50 53
51static char curlocale[128]; 54static char curlocale[128];
52 55
53bool 56bool
54rxvt_set_locale (const char *locale) 57rxvt_set_locale (const char *locale)
55{ 58{
56 if (!locale || !STRNCMP (locale, curlocale, 128)) 59 if (!locale || !strncmp (locale, curlocale, 128))
57 return false; 60 return false;
58 61
59 STRNCPY (curlocale, locale, 128); 62 strncpy (curlocale, locale, 128);
60 setlocale (LC_CTYPE, curlocale); 63 setlocale (LC_CTYPE, curlocale);
61 return true; 64 return true;
62} 65}
63 66
64#if ENABLE_COMBINING 67#if ENABLE_COMBINING
123 return len; 126 return len;
124 127
125} 128}
126#endif 129#endif
127 130
128void *
129rxvt_term::operator new (size_t s)
130{
131 void *p = malloc (s);
132
133 MEMSET (p, 0, s);
134 return p;
135}
136
137void
138rxvt_term::operator delete (void *p, size_t s)
139{
140 free (p);
141}
142
143rxvt_term::rxvt_term () 131rxvt_term::rxvt_term ()
144 : 132 :
145#if TRANSPARENT 133#if TRANSPARENT
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 134 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 135#endif
170 pointer_ev (this, &rxvt_term::pointer_cb), 158 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 159#endif
172#ifdef USE_XIM 160#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 161 im_ev (this, &rxvt_term::im_cb),
174#endif 162#endif
163 sw_term (this, &rxvt_term::sig_term),
164 sw_int (this, &rxvt_term::sig_term),
165 sw_chld (this, &rxvt_term::sig_chld),
175 termwin_ev (this, &rxvt_term::x_cb), 166 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 167 vt_ev (this, &rxvt_term::x_cb),
177 check_ev (this, &rxvt_term::check_cb), 168 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb), 169 flush_ev (this, &rxvt_term::flush_cb),
179 destroy_ev (this, &rxvt_term::destroy_cb), 170 destroy_ev (this, &rxvt_term::destroy_cb),
181 incr_ev (this, &rxvt_term::incr_cb) 172 incr_ev (this, &rxvt_term::incr_cb)
182{ 173{
183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 174 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
184 175
185 termlist.push_back (this); 176 termlist.push_back (this);
186}
187 177
188rxvt_term::~rxvt_term () 178#ifdef KEYSYM_RESOURCE
189{ 179 keyboard = new keyboard_manager;
190 termlist.erase (find (termlist.begin (), termlist.end(), this));
191 180
181 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n");
183#endif
184}
185
186// clean up the most important stuff, do *not* call x or free mem etc.
187// for use before an emergency exit
188void rxvt_term::emergency_cleanup ()
189{
192 if (cmd_fd >= 0) 190 if (cmd_pid)
193 close (cmd_fd); 191 kill (-cmd_pid, SIGHUP);
194 192
195#ifndef NO_SETOWNER_TTYDEV
196 privileged_ttydev (RESTORE);
197#endif
198#ifdef UTMP_SUPPORT 193#ifdef UTMP_SUPPORT
199 privileged_utmp (RESTORE); 194 privileged_utmp (RESTORE);
200#endif 195#endif
201 196
197 pty.put ();
198}
199
200rxvt_term::~rxvt_term ()
201{
202 termlist.erase (find (termlist.begin (), termlist.end(), this));
203
204 emergency_cleanup ();
205
206#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0])
209 delete TermWin.fontset[i];
210#endif
202 delete TermWin.fontset; 211 delete TermWin.fontset[0];
203 212
204 if (display) 213 if (display)
205 { 214 {
215 dDisp;
216
206 selection_clear (); 217 selection_clear ();
207 218
208#ifdef USE_XIM 219#ifdef USE_XIM
209 im_destroy (); 220 im_destroy ();
210#endif 221#endif
211#ifdef MENUBAR 222#ifdef MENUBAR
212 if (menubarGC) XFreeGC (display->display, menubarGC); 223 if (menubarGC) XFreeGC (disp, menubarGC);
213#endif 224#endif
214#ifdef XTERM_SCROLLBAR 225#ifdef XTERM_SCROLLBAR
215 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
216 if (ShadowGC) XFreeGC (display->display, ShadowGC); 227 if (ShadowGC) XFreeGC (disp, ShadowGC);
217#endif 228#endif
218#ifdef PLAIN_SCROLLBAR 229#ifdef PLAIN_SCROLLBAR
219 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
220#endif 231#endif
221#ifdef NEXT_SCROLLBAR 232#ifdef NEXT_SCROLLBAR
222 if (blackGC) XFreeGC (display->display, blackGC); 233 if (blackGC) XFreeGC (disp, blackGC);
223 if (whiteGC) XFreeGC (display->display, whiteGC); 234 if (whiteGC) XFreeGC (disp, whiteGC);
224 if (grayGC) XFreeGC (display->display, grayGC); 235 if (grayGC) XFreeGC (disp, grayGC);
225 if (darkGC) XFreeGC (display->display, darkGC); 236 if (darkGC) XFreeGC (disp, darkGC);
226 if (stippleGC) XFreeGC (display->display, stippleGC); 237 if (stippleGC) XFreeGC (disp, stippleGC);
227 if (dimple) XFreePixmap (display->display, dimple); 238 if (dimple) XFreePixmap (disp, dimple);
228 if (upArrow) XFreePixmap (display->display, upArrow); 239 if (upArrow) XFreePixmap (disp, upArrow);
229 if (downArrow) XFreePixmap (display->display, downArrow); 240 if (downArrow) XFreePixmap (disp, downArrow);
230 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 241 if (upArrowHi) XFreePixmap (disp, upArrowHi);
231 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 242 if (downArrowHi) XFreePixmap (disp, downArrowHi);
232#endif 243#endif
233#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
234 if (topShadowGC) XFreeGC (display->display, topShadowGC); 245 if (topShadowGC) XFreeGC (disp, topShadowGC);
235 if (botShadowGC) XFreeGC (display->display, botShadowGC); 246 if (botShadowGC) XFreeGC (disp, botShadowGC);
236 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 247 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
237#endif 248#endif
238 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 249 if (TermWin.gc) XFreeGC (disp, TermWin.gc);
239 250
240#if defined(MENUBAR) && (MENUBAR_MAX > 1) 251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
241 delete menuBar.drawable; 252 delete menuBar.drawable;
242 //if (menuBar.win) 253 //if (menuBar.win)
243 // XDestroyWindow (display->display, menuBar.win); 254 // XDestroyWindow (disp, menuBar.win);
244#endif 255#endif
245 delete TermWin.drawable; 256 delete TermWin.drawable;
246 // destroy all windows 257 // destroy all windows
247 if (TermWin.parent[0]) 258 if (TermWin.parent[0])
248 XDestroyWindow (display->display, TermWin.parent[0]); 259 XDestroyWindow (disp, TermWin.parent[0]);
249 } 260 }
250 261
251 // TODO: free pixcolours, colours should become part of rxvt_display 262 // TODO: free pixcolours, colours should become part of rxvt_display
252 263
253 delete PixColorsFocused; 264 delete pix_colors_focused;
254#ifdef OFF_FOCUS_FADING 265#ifdef OFF_FOCUS_FADING
255 delete PixColorsUnFocused; 266 delete pix_colors_unfocused;
256#endif 267#endif
257 268
258 displays.put (display); 269 displays.put (display);
259 270
260 scr_release (); 271 scr_release ();
261 272
262 /* clear all resources */ 273 /* clear all resources */
263 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
264 free (allocated[i]); 275 free (allocated [i]);
265 276
266 free (selection.text); 277 free (selection.text);
267 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
268 free (env_windowid); 279 free (env_windowid);
269 free (env_display); 280 free (env_display);
270 free (env_term); 281 free (env_term);
271 free (env_colorfgbg); 282 free (env_colorfgbg);
272 free (locale); 283 free (locale);
273#if 0 284 free (v_buffer);
274 free (codeset); 285 free (incr_buf);
275#endif
276 286
277 delete envv; 287 delete envv;
278 delete argv; 288 delete argv;
289
290#ifdef KEYSYM_RESOURCE
291 delete keyboard;
292#endif
279} 293}
280 294
281void 295void
282rxvt_term::destroy () 296rxvt_term::destroy ()
283{ 297{
284 if (destroy_ev.active) 298 if (destroy_ev.active)
285 return; 299 return;
300
301#if ENABLE_OVERLAY
302 scr_overlay_off ();
303#endif
286 304
287 if (display) 305 if (display)
288 { 306 {
289#if USE_XIM 307#if USE_XIM
290 im_ev.stop (display); 308 im_ev.stop (display);
331 349
332 delete this; 350 delete this;
333} 351}
334 352
335/*----------------------------------------------------------------------*/ 353/*----------------------------------------------------------------------*/
354/*
355 * Exit gracefully, clearing the utmp entry and restoring tty attributes
356 * TODO: if debugging, this should free up any known resources if we can
357 */
358static XErrorHandler old_xerror_handler;
359
360static void
361rxvt_emergency_cleanup ()
362{
363 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
364 (*t)->emergency_cleanup ();
365}
366
367#if ENABLE_FRILLS
368static void
369print_x_error (Display *dpy, XErrorEvent *event)
370{
371 char buffer[BUFSIZ];
372 char mesg[BUFSIZ];
373 char number[32];
374 char *mtype = "XlibMessage";
375 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
376 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
377 rxvt_warn ("An X Error occured, trying to continue after report.\n");
378 rxvt_warn ("%s: %s\n", mesg, buffer);
379 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
380 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
381 sprintf(number, "%d", event->request_code);
382 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
383 rxvt_warn ("(which is %s)\n", buffer);
384 if (event->request_code >= 128) {
385 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
386 mesg, BUFSIZ);
387 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
388 }
389 if ((event->error_code == BadWindow) ||
390 (event->error_code == BadPixmap) ||
391 (event->error_code == BadCursor) ||
392 (event->error_code == BadFont) ||
393 (event->error_code == BadDrawable) ||
394 (event->error_code == BadColor) ||
395 (event->error_code == BadGC) ||
396 (event->error_code == BadIDChoice) ||
397 (event->error_code == BadValue) ||
398 (event->error_code == BadAtom)) {
399 if (event->error_code == BadValue)
400 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
401 mesg, BUFSIZ);
402 else if (event->error_code == BadAtom)
403 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
404 mesg, BUFSIZ);
405 else
406 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
407 mesg, BUFSIZ);
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
409 }
410 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
411 mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
413}
414#endif
415
416int
417rxvt_xerror_handler (Display *display, XErrorEvent *event)
418{
419 if (GET_R->allowedxerror == -1)
420 GET_R->allowedxerror = event->error_code;
421 else
422 {
423 //TODO: GET_R is most likely not the terminal which caused the error
424 //TODO: maybe just output the error and continue?
425#if ENABLE_FRILLS
426 print_x_error (display, event);
427#else
428 old_xerror_handler (display, event);
429#endif
430 }
431
432 return 0;
433}
434
435int
436rxvt_xioerror_handler (Display *display)
437{
438 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
439 DisplayString (display));
440 rxvt_emergency_cleanup ();
441 _exit (EXIT_FAILURE);
442}
443
444/*
445 * Catch a fatal signal and tidy up before quitting
446 */
447void
448rxvt_term::sig_term (sig_watcher &w)
449{
450#ifdef DEBUG_CMD
451 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
452#endif
453 rxvt_emergency_cleanup ();
454 signal (w.signum, SIG_DFL);
455 kill (getpid (), w.signum);
456}
457
458/*----------------------------------------------------------------------*/
336/* rxvt_init () */ 459/* rxvt_init () */
337bool 460bool
338rxvt_term::init (int argc, const char *const *argv) 461rxvt_term::init (int argc, const char *const *argv)
339{ 462{
340 SET_R (this); 463 SET_R (this);
341 464
465 set_locale ("");
466
342 if (!init_vars ()) 467 if (!init_vars ())
343 return false; 468 return false;
344 469
470 init_secondary ();
471
472 const char **cmd_argv = init_resources (argc, argv);
473
474#ifdef KEYSYM_RESOURCE
475 keyboard->register_done ();
476#endif
477
478#if MENUBAR_MAX
479 menubar_read (rs[Rs_menu]);
480#endif
481#ifdef HAVE_SCROLLBARS
482 if (options & Opt_scrollBar)
483 scrollBar.setIdle (); /* set existence for size calculations */
484#endif
485
486 create_windows (argc, argv);
487
488 dDisp;
489
490 init_xlocale ();
491
492 scr_reset (); /* initialize screen */
493
494#if 0
495 XSynchronize (disp, True);
496#endif
497
498#ifdef HAVE_SCROLLBARS
499 if (options & Opt_scrollBar)
500 resize_scrollbar (); /* create and map scrollbar */
501#endif
502#if (MENUBAR_MAX)
503 if (menubar_visible ())
504 XMapWindow (disp, menuBar.win);
505#endif
506#ifdef TRANSPARENT
507 if (options & Opt_transparent)
508 {
509 XSelectInput (disp, display->root, PropertyChangeMask);
510 check_our_parents ();
511 rootwin_ev.start (display, display->root);
512 }
513#endif
514
515 XMapWindow (disp, TermWin.vt);
516 XMapWindow (disp, TermWin.parent[0]);
517
518 set_colorfgbg ();
519
520 init_command (cmd_argv);
521
522 free (cmd_argv);
523
524 pty_ev.start (pty.pty, EVENT_READ);
525
526 check_ev.start ();
527
528 return true;
529}
530
531void
532rxvt_init ()
533{
345 /* 534 /*
346 * Save and then give up any super-user privileges 535 * Save and then give up any super-user privileges
347 * If we need privileges in any area then we must specifically request it. 536 * If we need privileges in any area then we must specifically request it.
348 * We should only need to be root in these cases: 537 * We should only need to be root in these cases:
349 * 1. write utmp entries on some systems 538 * 1. write utmp entries on some systems
350 * 2. chown tty on some systems 539 * 2. chown tty on some systems
351 */ 540 */
352 privileges (SAVE); 541 rxvt_privileges (SAVE);
353 privileges (IGNORE); 542 rxvt_privileges (IGNORE);
354 543
355 init_secondary (); 544 signal (SIGHUP, SIG_IGN);
356 545 signal (SIGPIPE, SIG_IGN);
357 const char **cmd_argv = init_resources (argc, argv);
358
359 set_locale ("");
360
361#if MENUBAR_MAX
362 menubar_read (rs[Rs_menu]);
363#endif
364#ifdef HAVE_SCROLLBARS
365 if (Options & Opt_scrollBar)
366 scrollBar.setIdle (); /* set existence for size calculations */
367#endif
368
369 create_windows (argc, argv);
370
371 init_xlocale ();
372
373 scr_reset (); /* initialize screen */
374
375#if 0
376 XSynchronize (display->display, True);
377#endif
378
379#ifdef HAVE_SCROLLBARS
380 if (Options & Opt_scrollBar)
381 resize_scrollbar (); /* create and map scrollbar */
382#endif
383#if (MENUBAR_MAX)
384 if (menubar_visible ())
385 XMapWindow (display->display, menuBar.win);
386#endif
387#ifdef TRANSPARENT
388 if (Options & Opt_transparent)
389 {
390 XSelectInput (display->display, display->root, PropertyChangeMask);
391 check_our_parents ();
392 rootwin_ev.start (display, display->root);
393 }
394#endif
395
396 XMapWindow (display->display, TermWin.vt);
397 XMapWindow (display->display, TermWin.parent[0]);
398
399 init_command (cmd_argv);
400
401 pty_ev.start (cmd_fd, EVENT_READ);
402
403 check_ev.start ();
404
405 return true;
406}
407
408static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
409
410void
411rxvt_init_signals ()
412{
413 /* install exit handler for cleanup */
414#if 0
415#ifdef HAVE_ATEXIT
416 atexit (rxvt_clean_exit);
417#else
418#endif
419#endif
420
421 struct sigaction sa;
422
423 sigfillset (&sa.sa_mask);
424 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
425 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
426 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
427 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
428 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
429 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
430 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
431 546
432 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 547 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
433 /* signal (SIGURG, SIG_DFL); */ 548 /* signal (SIGURG, SIG_DFL); */
434 549
435 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 550 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
551 // TODO: handle this with exceptions and tolerate the memory loss
436 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 552 XSetIOErrorHandler (rxvt_xioerror_handler);
437} 553}
438 554
439/* ------------------------------------------------------------------------- * 555/* ------------------------------------------------------------------------- *
440 * SIGNAL HANDLING & EXIT HANDLER * 556 * SIGNAL HANDLING & EXIT HANDLER *
441 * ------------------------------------------------------------------------- */ 557 * ------------------------------------------------------------------------- */
442/* 558/*
443 * Catch a SIGCHLD signal and exit if the direct child has died 559 * Catch a SIGCHLD signal and exit if the direct child has died
444 */ 560 */
445 561
446void rxvt_term::child_exited (int pid) 562void
563rxvt_term::sig_chld (sig_watcher &w)
447{ 564{
448 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 565 // we are being called for every SIGCHLD, not just ours
449 if (pid == (*t)->cmd_pid) 566 int pid;
450 {
451 (*t)->destroy ();
452 break;
453 }
454}
455
456/* ARGSUSED */
457/* EXTPROTO */
458RETSIGTYPE
459rxvt_Child_signal (int sig __attribute__ ((unused)))
460{
461 int pid, save_errno = errno;
462 567
463 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 568 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
464 rxvt_term::child_exited (pid); 569 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
465 570 if (pid == (*t)->cmd_pid)
466 errno = save_errno; 571 {
467} 572 (*t)->destroy ();
468 573 break;
469/* 574 }
470 * Catch a fatal signal and tidy up before quitting
471 */
472/* EXTPROTO */
473RETSIGTYPE
474rxvt_Exit_signal (int sig)
475{
476 signal (sig, SIG_DFL);
477#ifdef DEBUG_CMD
478 rxvt_warn ("caught signal %d, exiting.\n", sig);
479#endif
480 rxvt_clean_exit ();
481 kill (getpid (), sig);
482}
483
484/* INTPROTO */
485int
486rxvt_xerror_handler (Display *display, XErrorEvent *event)
487{
488 if (GET_R->allowedxerror == -1)
489 GET_R->allowedxerror = event->error_code;
490 else
491 {
492 old_xerror_handler (display, event);
493 GET_R->destroy ();
494 }
495
496 return 0;
497}
498
499/*----------------------------------------------------------------------*/
500/*
501 * Exit gracefully, clearing the utmp entry and restoring tty attributes
502 * TODO: if debugging, this should free up any known resources if we can
503 */
504/* EXTPROTO */
505void
506rxvt_clean_exit ()
507{
508 // TODO: rxvtd should clean up all ressources
509 if (GET_R)
510 GET_R->destroy ();
511} 575}
512 576
513/* ------------------------------------------------------------------------- * 577/* ------------------------------------------------------------------------- *
514 * MEMORY ALLOCATION WRAPPERS * 578 * MEMORY ALLOCATION WRAPPERS *
515 * ------------------------------------------------------------------------- */ 579 * ------------------------------------------------------------------------- */
516/* EXTPROTO */ 580void *
517void *
518rxvt_malloc (size_t size) 581rxvt_malloc (size_t size)
519{ 582{
520 void *p;
521
522 p = malloc (size); 583 void *p = malloc (size);
584
523 if (p) 585 if (!p)
586 rxvt_fatal ("memory allocation failure. aborting.\n");
587
524 return p; 588 return p;
525
526 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
527 rxvt_clean_exit ();
528 exit (EXIT_FAILURE);
529 /* NOTREACHED */
530} 589}
531 590
532/* EXTPROTO */ 591/* INTPROTO */
533void * 592void *
534rxvt_calloc (size_t number, size_t size) 593rxvt_calloc (size_t number, size_t size)
535{ 594{
536 void *p;
537
538 p = calloc (number, size); 595 void *p = calloc (number, size);
596
539 if (p) 597 if (!p)
598 rxvt_fatal ("memory allocation failure. aborting.\n");
599
540 return p; 600 return p;
541
542 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
543 rxvt_clean_exit ();
544 exit (EXIT_FAILURE);
545 /* NOTREACHED */
546} 601}
547 602
548/* EXTPROTO */ 603/* INTPROTO */
549void * 604void *
550rxvt_realloc (void *ptr, size_t size) 605rxvt_realloc (void *ptr, size_t size)
551{ 606{
552 void *p;
553
554 if (ptr)
555 p = realloc (ptr, size); 607 void *p = realloc (ptr, size);
556 else 608
557 p = malloc (size);
558 if (p) 609 if (!p)
610 rxvt_fatal ("memory allocation failure. aborting.\n");
611
559 return p; 612 return p;
560
561 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
562 rxvt_clean_exit ();
563 exit (EXIT_FAILURE);
564 /* NOTREACHED */
565} 613}
566 614
567/* ------------------------------------------------------------------------- * 615/* ------------------------------------------------------------------------- *
568 * PRIVILEGED OPERATIONS * 616 * PRIVILEGED OPERATIONS *
569 * ------------------------------------------------------------------------- */ 617 * ------------------------------------------------------------------------- */
570/* take care of suid/sgid super-user (root) privileges */ 618/* take care of suid/sgid super-user (root) privileges */
571void 619void
572rxvt_term::privileges (int mode) 620rxvt_privileges (rxvt_privaction action)
573{ 621{
622#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
623 static uid_t euid;
624 static gid_t egid;
625#endif
626
574#if ! defined(__CYGWIN32__) 627#if ! defined(__CYGWIN32__)
575# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 628# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
576 /* setreuid () is the poor man's setuid (), seteuid () */ 629 /* setreuid () is the poor man's setuid (), seteuid () */
577# define seteuid(a) setreuid(-1, (a)) 630# define seteuid(a) setreuid(-1, (a))
578# define setegid(a) setregid(-1, (a)) 631# define setegid(a) setregid(-1, (a))
579# define HAVE_SETEUID 632# define HAVE_SETEUID
580# endif 633# endif
581# ifdef HAVE_SETEUID 634# ifdef HAVE_SETEUID
582 switch (mode) 635 switch (action)
583 { 636 {
584 case IGNORE: 637 case IGNORE:
585 /* 638 /*
586 * change effective uid/gid - not real uid/gid - so we can switch 639 * change effective uid/gid - not real uid/gid - so we can switch
587 * back to root later, as required 640 * back to root later, as required
597 seteuid (euid); 650 seteuid (euid);
598 setegid (egid); 651 setegid (egid);
599 break; 652 break;
600 } 653 }
601# else 654# else
602 switch (mode) 655 switch (action)
603 { 656 {
604 case IGNORE: 657 case IGNORE:
605 setuid (getuid ()); 658 setuid (getuid ());
606 setgid (getgid ()); 659 setgid (getgid ());
607 /* FALLTHROUGH */ 660 /* FALLTHROUGH */
614#endif 667#endif
615} 668}
616 669
617#ifdef UTMP_SUPPORT 670#ifdef UTMP_SUPPORT
618void 671void
619rxvt_term::privileged_utmp (char action) 672rxvt_term::privileged_utmp (rxvt_privaction action)
620{ 673{
621 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
622 action, next_utmp_action, getpid ()));
623 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
624 || (Options & Opt_utmpInhibit) 674 if ((options & Opt_utmpInhibit)
625 || ttydev == NULL || *ttydev == '\0') 675 || !pty.name || !*pty.name)
626 return; 676 return;
627 677
628 privileges (RESTORE); 678 rxvt_privileges (RESTORE);
679
629 if (action == SAVE) 680 if (action == SAVE)
630 {
631 next_utmp_action = RESTORE;
632 makeutent (ttydev, rs[Rs_display_name]); 681 makeutent (pty.name, rs[Rs_display_name]);
633 }
634 else 682 else
635 { /* action == RESTORE */
636 next_utmp_action = IGNORE;
637 cleanutent (); 683 cleanutent ();
638 } 684
639 privileges (IGNORE); 685 rxvt_privileges (IGNORE);
640}
641#endif
642
643#ifndef NO_SETOWNER_TTYDEV
644void
645rxvt_term::privileged_ttydev (char action)
646{
647 D_MAIN ((stderr,
648 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
649 action, next_tty_action, getpid ()));
650 if (next_tty_action != action || (action != SAVE && action != RESTORE)
651 || ttydev == NULL || *ttydev == '\0')
652 return;
653
654 privileges (RESTORE);
655
656 if (action == SAVE)
657 {
658 next_tty_action = RESTORE;
659# ifndef RESET_TTY_TO_COMMON_DEFAULTS
660 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
661 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
662 next_tty_action = IGNORE;
663 else
664# endif
665
666 {
667 chown (ttydev, getuid (), ttygid); /* fail silently */
668 chmod (ttydev, ttymode);
669# ifdef HAVE_REVOKE
670 revoke (ttydev);
671# endif
672
673 }
674 }
675 else
676 { /* action == RESTORE */
677 next_tty_action = IGNORE;
678# ifndef RESET_TTY_TO_COMMON_DEFAULTS
679 chmod (ttydev, ttyfd_stat.st_mode);
680 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
681# else
682 chmod (ttydev,
683 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
684 chown (ttydev, 0, 0);
685# endif
686
687 }
688
689 privileges (IGNORE);
690
691# ifndef RESET_TTY_TO_COMMON_DEFAULTS
692 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
693 action == RESTORE ? "Restoring" : (action ==
694 SAVE ? "Saving" :
695 "UNKNOWN ERROR for"), ttydev,
696 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
697 ttyfd_stat.st_gid));
698# endif
699} 686}
700#endif 687#endif
701 688
702/*----------------------------------------------------------------------*/ 689/*----------------------------------------------------------------------*/
703/* 690/*
705 * if width/height are non-zero then override calculated width/height 692 * if width/height are non-zero then override calculated width/height
706 */ 693 */
707void 694void
708rxvt_term::window_calc (unsigned int width, unsigned int height) 695rxvt_term::window_calc (unsigned int width, unsigned int height)
709{ 696{
710 short recalc_x, recalc_y; 697 short recalc_x, recalc_y;
711 int x, y, sb_w, mb_h, flags; 698 int x, y, sb_w, mb_h, flags;
712 unsigned int w, h; 699 unsigned int w, h;
713 unsigned int max_width, max_height; 700 unsigned int max_width, max_height;
701 dDisp;
714 702
715 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 703 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
716 TermWin.ncol, TermWin.nrow, szHint.width, 704 TermWin.ncol, TermWin.nrow, szHint.width,
717 szHint.height)); 705 szHint.height));
718 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 706 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
774 762
775 if (scrollbar_visible ()) 763 if (scrollbar_visible ())
776 { 764 {
777 sb_w = scrollbar_TotalWidth (); 765 sb_w = scrollbar_TotalWidth ();
778 szHint.base_width += sb_w; 766 szHint.base_width += sb_w;
779 if (!(Options & Opt_scrollBar_right)) 767 if (!(options & Opt_scrollBar_right))
780 window_vt_x += sb_w; 768 window_vt_x += sb_w;
781 } 769 }
782 770
783 if (menubar_visible ()) 771 if (menubar_visible ())
784 { 772 {
812 { 800 {
813 MIN_IT (TermWin.height, max_height); 801 MIN_IT (TermWin.height, max_height);
814 szHint.height = szHint.base_height + TermWin.height; 802 szHint.height = szHint.base_height + TermWin.height;
815 } 803 }
816 804
817 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 805 if (scrollbar_visible () && (options & Opt_scrollBar_right))
818 window_sb_x = szHint.width - sb_w; 806 window_sb_x = szHint.width - sb_w;
819 807
820 if (recalc_x) 808 if (recalc_x)
821 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 809 szHint.x += (DisplayWidth (disp, display->screen)
822 - szHint.width - 2 * TermWin.ext_bwidth); 810 - szHint.width - 2 * TermWin.ext_bwidth);
823 if (recalc_y) 811 if (recalc_y)
824 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 812 szHint.y += (DisplayHeight (disp, display->screen)
825 - szHint.height - 2 * TermWin.ext_bwidth); 813 - szHint.height - 2 * TermWin.ext_bwidth);
826 814
827 TermWin.ncol = TermWin.width / TermWin.fwidth; 815 TermWin.ncol = TermWin.width / TermWin.fwidth;
828 TermWin.nrow = TermWin.height / TermWin.fheight; 816 TermWin.nrow = TermWin.height / TermWin.fheight;
829 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 817 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
838 * Called after a window size change. 826 * Called after a window size change.
839 */ 827 */
840void 828void
841rxvt_term::tt_winch () 829rxvt_term::tt_winch ()
842{ 830{
831 if (pty.pty < 0)
832 return;
833
843 struct winsize ws; 834 struct winsize ws;
844
845 if (cmd_fd < 0)
846 return;
847 835
848 ws.ws_col = TermWin.ncol; 836 ws.ws_col = TermWin.ncol;
849 ws.ws_row = TermWin.nrow; 837 ws.ws_row = TermWin.nrow;
850 ws.ws_xpixel = ws.ws_ypixel = 0; 838 ws.ws_xpixel = TermWin.width;
851#ifndef DEBUG_SIZE 839 ws.ws_ypixel = TermWin.height;
852 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 840 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
853#else 841
854 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 842#if 0
855 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 843 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
856# ifdef SIGWINCH
857 else if (cmd_pid) /* force through to the command */ 844 if (cmd_pid) /* force through to the command */
858 kill (cmd_pid, SIGWINCH); 845 kill (cmd_pid, SIGWINCH);
859# endif
860#endif 846#endif
861} 847}
862 848
863/*----------------------------------------------------------------------*/ 849/*----------------------------------------------------------------------*/
864/* rxvt_change_font () - Switch to a new font */ 850/* set_fonts () - load and set the various fonts
865/* 851/*
866 * init = 1 - initialize 852 * init = 1 - initialize
867 * 853 *
868 * fontname == FONT_UP - switch to bigger font 854 * fontname == FONT_UP - switch to bigger font
869 * fontname == FONT_DN - switch to smaller font 855 * fontname == FONT_DN - switch to smaller font
870 */ 856 */
871bool 857bool
872rxvt_term::change_font (const char *fontname) 858rxvt_term::set_fonts ()
873{ 859{
874 if (fontname == FONT_UP)
875 {
876 // TODO
877 }
878 else if (fontname == FONT_DN)
879 {
880 // TODO
881 }
882 else
883 {
884 rxvt_fontset *fs = new rxvt_fontset (this); 860 rxvt_fontset *fs = new rxvt_fontset (this);
861 rxvt_fontprop prop;
885 862
886 if (fs && fs->populate (fontname ? fontname : "fixed")) 863 if (!fs
864 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
865 || !fs->realize_font (1))
866 {
867 delete fs;
868 return false;
869 }
870
871#if ENABLE_STYLES
872 for (int i = RS_styleCount; --i; )
873 if (TermWin.fontset[i] != TermWin.fontset[0])
874 delete TermWin.fontset[i];
875#endif
876
877 delete TermWin.fontset[0];
878 TermWin.fontset[0] = fs;
879
880 prop = (*fs)[1]->properties ();
881 prop.height += TermWin.lineSpace;
882 fs->set_prop (prop);
883
884 TermWin.fwidth = prop.width;
885 TermWin.fheight = prop.height;
886 TermWin.fweight = prop.weight;
887 TermWin.fslant = prop.slant;
888 TermWin.fbase = (*fs)[1]->ascent;
889
890 for (int style = 1; style < 4; style++)
891 {
892#if ENABLE_STYLES
893 const char *res = rs[Rs_font + style];
894
895 if (res && !*res)
896 TermWin.fontset[style] = TermWin.fontset[0];
897 else
887 { 898 {
888 delete TermWin.fontset; 899 TermWin.fontset[style] = fs = new rxvt_fontset (this);
889 TermWin.fontset = fs; 900 rxvt_fontprop prop2 = prop;
890 TermWin.fwidth = fs->base_font ()->width;
891 TermWin.fheight = fs->base_font ()->height;
892 TermWin.fbase = fs->base_font ()->ascent;
893 901
894 if (TermWin.parent[0]) 902 if (res)
903 prop2.weight = prop2.slant = rxvt_fontprop::unset;
904 else
895 { 905 {
896 resize_all_windows (0, 0, 0); 906 res = TermWin.fontset[0]->fontdesc;
897 scr_remap_chars (); 907
898 scr_touch (true); 908 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
909 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
899 } 910 }
900 911
901 for (unicode_t ch = 0x20; ch <= 0x7f; ch++) 912 fs->populate (res);
902 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch); 913 fs->set_prop (prop2);
903
904 return true;
905 } 914 }
915#else
916 TermWin.fontset[style] = TermWin.fontset[0];
917#endif
918 }
919
920 if (TermWin.parent[0])
906 } 921 {
922 resize_all_windows (0, 0, 0);
923 scr_remap_chars ();
924 scr_touch (true);
925 }
907 926
908 return false; 927 return true;
909} 928}
910 929
911bool 930void rxvt_term::set_string_property (Atom prop, const char *str, int len)
912rxvt_term::font_up_down (int n, int direction)
913{ 931{
914 return false; 932 // TODO: SMART_WINDOW_TITLE
933 XChangeProperty (display->display, TermWin.parent[0],
934 prop, XA_STRING, 8, PropModeReplace,
935 (const unsigned char *)str, len >= 0 ? len : strlen (str));
936}
937
938void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
939{
940 // TODO: SMART_WINDOW_TITLE
941 wchar_t *ws = rxvt_mbstowcs (str, len);
942 char *s = rxvt_wcstoutf8 (ws);
943
944 XChangeProperty (display->display, TermWin.parent[0],
945 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
946 (const unsigned char *)s, strlen (s));
947
948 free (s);
949 free (ws);
915} 950}
916 951
917/*----------------------------------------------------------------------*/ 952/*----------------------------------------------------------------------*/
918/*----------------------------------------------------------------------*/ 953/*----------------------------------------------------------------------*/
919/* xterm sequences - title, iconName, color (exptl) */ 954/* xterm sequences - title, iconName, color (exptl) */
920void 955void
921rxvt_term::set_title (const char *str) 956rxvt_term::set_title (const char *str)
922{ 957{
923#ifdef SMART_WINDOW_TITLE 958 set_string_property (XA_WM_NAME, str);
924 char *name; 959#if ENABLE_FRILLS
925 960 set_utf8_property (xa[XA_NET_WM_NAME], str);
926 if (!XFetchName (display->display, TermWin.parent[0], &name))
927 name = NULL;
928
929 if (name == NULL || STRCMP (name, str))
930#endif
931 XStoreName (display->display, TermWin.parent[0], str);
932
933#ifdef SMART_WINDOW_TITLE
934 if (name)
935 XFree (name);
936#endif 961#endif
937} 962}
938 963
939void 964void
940rxvt_term::set_icon_name (const char *str) 965rxvt_term::set_icon_name (const char *str)
941{ 966{
942#ifdef SMART_WINDOW_TITLE 967 set_string_property (XA_WM_ICON_NAME, str);
943 char *name; 968#if ENABLE_FRILLS
944 969 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
945 if (!XGetIconName (display->display, TermWin.parent[0], &name))
946 name = NULL;
947
948 if (name == NULL || STRCMP (name, str))
949#endif
950 XSetIconName (display->display, TermWin.parent[0], str);
951
952#ifdef SMART_WINDOW_TITLE
953 if (name)
954 XFree (name);
955#endif 970#endif
956} 971}
957 972
958#ifdef XTERM_COLOR_CHANGE 973#ifdef XTERM_COLOR_CHANGE
959void 974void
967 982
968 /* handle color aliases */ 983 /* handle color aliases */
969 if (isdigit (*color)) 984 if (isdigit (*color))
970 { 985 {
971 i = atoi (color); 986 i = atoi (color);
987
972 if (i >= 8 && i <= 15) 988 if (i >= 8 && i <= 15)
973 { /* bright colors */ 989 { /* bright colors */
974 i -= 8; 990 i -= 8;
975# ifndef NO_BRIGHTCOLOR 991# ifndef NO_BRIGHTCOLOR
976 PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i]; 992 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
977 SET_PIXCOLOR (idx); 993 SET_PIXCOLOR (idx);
978 goto Done; 994 goto Done;
979# endif 995# endif
980
981 } 996 }
997
982 if (i >= 0 && i <= 7) 998 if (i >= 0 && i <= 7)
983 { /* normal colors */ 999 { /* normal colors */
984 PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i]; 1000 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
985 SET_PIXCOLOR (idx); 1001 SET_PIXCOLOR (idx);
986 goto Done; 1002 goto Done;
987 } 1003 }
988 } 1004 }
989 1005
990 if (!rXParseAllocColor (& xcol, color)) 1006 if (!rXParseAllocColor (&xcol, color))
991 return; 1007 return;
992 1008
993 /* XStoreColor (display->display, display->cmap, XColor*); */ 1009 /* XStoreColor (display->display, display->cmap, XColor*); */
994 1010
995 /* 1011 /*
996 * FIXME: should free colors here, but no idea how to do it so instead, 1012 * FIXME: should free colors here, but no idea how to do it so instead,
997 * so just keep gobbling up the colormap 1013 * so just keep gobbling up the colormap
998 */ 1014 */
999# if 0 1015# if 0
1000 for (i = Color_Black; i <= Color_White; i++) 1016 for (i = Color_Black; i <= Color_White; i++)
1001 if (PixColors[idx] == PixColors[i]) 1017 if (pix_colors[idx] == pix_colors[i])
1002 break; 1018 break;
1003 if (i > Color_White) 1019 if (i > Color_White)
1004 { 1020 {
1005 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 1021 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1006 XFreeColors (display->display, display->cmap, (PixColors + idx), 1, 1022 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1007 DisplayPlanes (display->display, display->screen)); 1023 DisplayPlanes (display->display, display->screen));
1008 } 1024 }
1009# endif 1025# endif
1010 1026
1011 PixColorsFocused[idx] = xcol; 1027 pix_colors_focused[idx] = xcol;
1012 SET_PIXCOLOR (idx); 1028 SET_PIXCOLOR (idx);
1013 1029
1014 /* XSetWindowAttributes attr; */ 1030 /* XSetWindowAttributes attr; */
1015 /* Cursor cursor; */ 1031 /* Cursor cursor; */
1016Done: 1032Done:
1017#ifdef OFF_FOCUS_FADING 1033#ifdef OFF_FOCUS_FADING
1034 if (rs[Rs_fade])
1018 PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade])); 1035 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
1019#endif 1036#endif
1020 if (idx == Color_bg && ! (Options & Opt_transparent))
1021 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1022 1037
1023 /* handle Color_BD, scrollbar background, etc. */ 1038 /*TODO: handle Color_BD, scrollbar background, etc. */
1024 1039
1025 set_colorfgbg ();
1026 recolour_cursor (); 1040 recolour_cursor ();
1027 scr_touch (true); 1041 scr_recolour ();
1028} 1042}
1029 1043
1030#else 1044#else
1031# define set_window_color (idx,color) ((void)0) 1045# define set_window_color (idx,color) ((void)0)
1032#endif /* XTERM_COLOR_CHANGE */ 1046#endif /* XTERM_COLOR_CHANGE */
1034void 1048void
1035rxvt_term::recolour_cursor () 1049rxvt_term::recolour_cursor ()
1036{ 1050{
1037 XColor xcol[2]; 1051 XColor xcol[2];
1038 1052
1039 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg]; 1053 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
1040 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg]; 1054 ? pix_colors_focused[Color_pointer_fg]
1055 : pix_colors_focused[Color_fg];
1056 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1057 ? pix_colors_focused[Color_pointer_bg]
1058 : pix_colors_focused[Color_bg];
1059
1041 XQueryColors (display->display, display->cmap, xcol, 2); 1060 XQueryColors (display->display, display->cmap, xcol, 2);
1042 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 1061 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1043} 1062}
1044 1063
1045/*----------------------------------------------------------------------*/ 1064/*----------------------------------------------------------------------*/
1047 * find if fg/bg matches any of the normal (low-intensity) colors 1066 * find if fg/bg matches any of the normal (low-intensity) colors
1048 */ 1067 */
1049void 1068void
1050rxvt_term::set_colorfgbg () 1069rxvt_term::set_colorfgbg ()
1051{ 1070{
1052 unsigned int i; 1071 unsigned int i;
1053 const char *xpmb = "\0"; 1072 const char *xpmb = "\0";
1054 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1073 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1055 1074
1056 env_colorfgbg =
1057 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1075 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1058 STRCPY (fstr, "default"); 1076 strcpy (fstr, "default");
1059 STRCPY (bstr, "default"); 1077 strcpy (bstr, "default");
1060 for (i = Color_Black; i <= Color_White; i++) 1078 for (i = Color_Black; i <= Color_White; i++)
1061 if (PixColors[Color_fg] == PixColors[i]) 1079 if (pix_colors[Color_fg] == pix_colors[i])
1062 { 1080 {
1063 sprintf (fstr, "%d", (i - Color_Black)); 1081 sprintf (fstr, "%d", (i - Color_Black));
1064 break; 1082 break;
1065 } 1083 }
1084
1066 for (i = Color_Black; i <= Color_White; i++) 1085 for (i = Color_Black; i <= Color_White; i++)
1067 if (PixColors[Color_bg] == PixColors[i]) 1086 if (pix_colors[Color_bg] == pix_colors[i])
1068 { 1087 {
1069 sprintf (bstr, "%d", (i - Color_Black)); 1088 sprintf (bstr, "%d", (i - Color_Black));
1070#ifdef XPM_BACKGROUND 1089#ifdef XPM_BACKGROUND
1071 xpmb = "default;"; 1090 xpmb = "default;";
1072#endif 1091#endif
1073 break; 1092 break;
1074 } 1093 }
1075 1094
1076 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1095 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1077
1078#ifndef NO_BRIGHTCOLOR
1079 colorfgbg = DEFAULT_RSTYLE;
1080 for (i = minCOLOR; i <= maxCOLOR; i++)
1081 {
1082 if (PixColors[Color_fg] == PixColors[i])
1083 colorfgbg = SET_FGCOLOR (colorfgbg, i);
1084 if (PixColors[Color_bg] == PixColors[i])
1085 colorfgbg = SET_BGCOLOR (colorfgbg, i);
1086 }
1087#endif
1088} 1096}
1089 1097
1090/*----------------------------------------------------------------------*/ 1098/*----------------------------------------------------------------------*/
1091/*
1092 * Colour determination for low colour displays, routine from
1093 * Hans de Goede <hans@highrise.nl>
1094 */
1095 1099
1096int 1100int
1097rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1101rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1098{ 1102{
1099 if (!screen_in_out->set (display, colour)) 1103 if (!screen_in_out->set (display, colour))
1110 * -------------------------------------------------------------------- */ 1114 * -------------------------------------------------------------------- */
1111void 1115void
1112rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1116rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
1113{ 1117{
1114 int fix_screen; 1118 int fix_screen;
1115
1116#ifdef SMART_RESIZE 1119#ifdef SMART_RESIZE
1117 int old_width = szHint.width, old_height = szHint.height; 1120 int old_width = szHint.width, old_height = szHint.height;
1118#endif 1121#endif
1122 dDisp;
1119 1123
1120 window_calc (width, height); 1124 window_calc (width, height);
1121 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1125 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1122 1126
1123 if (!ignoreparent) 1127 if (!ignoreparent)
1124 { 1128 {
1125#ifdef SMART_RESIZE 1129#ifdef SMART_RESIZE
1126 /* 1130 /*
1130 int x, y, x1, y1; 1134 int x, y, x1, y1;
1131 int dx, dy; 1135 int dx, dy;
1132 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1136 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1133 Window unused_cr; 1137 Window unused_cr;
1134 1138
1135 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1139 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1136 0, 0, &x, &y, &unused_cr); 1140 0, 0, &x, &y, &unused_cr);
1137 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1141 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
1138 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1142 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1139 /* 1143 /*
1140 * if display->root isn't the parent window, a WM will probably have offset 1144 * if display->root isn't the parent window, a WM will probably have offset
1141 * our position for handles and decorations. Counter it 1145 * our position for handles and decorations. Counter it
1142 */ 1146 */
1144 { 1148 {
1145 x -= x1; 1149 x -= x1;
1146 y -= y1; 1150 y -= y1;
1147 } 1151 }
1148 1152
1149 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1153 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1150 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1154 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1151 dx = old_width - szHint.width; 1155 dx = old_width - szHint.width;
1152 dy = old_height - szHint.height; 1156 dy = old_height - szHint.height;
1153 1157
1154 /* Check position of the center of the window */ 1158 /* Check position of the center of the window */
1155 if (x < x1) /* left half */ 1159 if (x < x1) /* left half */
1159 if (y < y1) /* top half */ 1163 if (y < y1) /* top half */
1160 dy = 0; 1164 dy = 0;
1161 else if (y == y1) /* exact center */ 1165 else if (y == y1) /* exact center */
1162 dy /= 2; 1166 dy /= 2;
1163 1167
1164 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1168 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
1165 szHint.width, szHint.height); 1169 szHint.width, szHint.height);
1166#else 1170#else
1167 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1171 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
1168#endif 1172#endif
1169 } 1173 }
1170 1174
1171 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1175 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1172 1176
1173 if (fix_screen || width != old_width || height != old_height) 1177 if (fix_screen || width != old_width || height != old_height)
1174 { 1178 {
1175 if (scrollbar_visible ()) 1179 if (scrollbar_visible ())
1176 { 1180 {
1177 XMoveResizeWindow (display->display, scrollBar.win, 1181 XMoveResizeWindow (disp, scrollBar.win,
1178 window_sb_x, 0, 1182 window_sb_x, 0,
1179 scrollbar_TotalWidth (), szHint.height); 1183 scrollbar_TotalWidth (), szHint.height);
1180 resize_scrollbar (); 1184 resize_scrollbar ();
1181 } 1185 }
1182 1186
1183 if (menubar_visible ()) 1187 if (menubar_visible ())
1184 XMoveResizeWindow (display->display, menuBar.win, 1188 XMoveResizeWindow (disp, menuBar.win,
1185 window_vt_x, 0, 1189 window_vt_x, 0,
1186 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1190 TermWin_TotalWidth (), menuBar_TotalHeight ());
1187 1191
1188 XMoveResizeWindow (display->display, TermWin.vt, 1192 XMoveResizeWindow (disp, TermWin.vt,
1189 window_vt_x, window_vt_y, 1193 window_vt_x, window_vt_y,
1190 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1194 TermWin_TotalWidth (), TermWin_TotalHeight ());
1195
1191 scr_clear (); 1196 scr_clear ();
1192#ifdef XPM_BACKGROUND 1197#ifdef XPM_BACKGROUND
1193 resize_pixmap (); 1198 resize_pixmap ();
1194#endif 1199#endif
1195 } 1200 }
1218 } 1223 }
1219 1224
1220 old_width = szHint.width; 1225 old_width = szHint.width;
1221 old_height = szHint.height; 1226 old_height = szHint.height;
1222 1227
1228#ifdef XPM_BACKGROUND
1229 if (TermWin.pixmap)
1230 scr_touch (false);
1231#endif
1232
1223#ifdef USE_XIM 1233#ifdef USE_XIM
1224 IMSetStatusPosition (); 1234 IMSetStatusPosition ();
1225#endif 1235#endif
1226} 1236}
1227 1237
1255 * - X INPUT METHOD ROUTINES - * 1265 * - X INPUT METHOD ROUTINES - *
1256 * -------------------------------------------------------------------- */ 1266 * -------------------------------------------------------------------- */
1257#ifdef USE_XIM 1267#ifdef USE_XIM
1258 1268
1259void 1269void
1270rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1271{
1272 fg = pix_colors[Color_fg];
1273 bg = pix_colors[Color_bg];
1274}
1275
1276void
1260rxvt_term::im_set_size (XRectangle *size) 1277rxvt_term::im_set_size (XRectangle &size)
1261{ 1278{
1279 // the int_bwidth terms make no sense to me
1262 size->x = TermWin.int_bwidth; 1280 size.x = TermWin.int_bwidth;
1263 size->y = TermWin.int_bwidth; 1281 size.y = TermWin.int_bwidth;
1264 size->width = Width2Pixel (TermWin.ncol); 1282 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1265 size->height = Height2Pixel (TermWin.nrow); 1283 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1266} 1284}
1267 1285
1268void 1286void
1269rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1287rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1288 XRectangle &status_rect,
1289 const XRectangle &needed_rect)
1270{ 1290{
1271 *fg = PixColors[Color_fg]; 1291 preedit_rect.x = needed_rect.width;
1272 *bg = PixColors[Color_bg]; 1292 preedit_rect.y = 0;
1293 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
1294 preedit_rect.height = TermWin.fheight;
1295
1296 status_rect.x = 0;
1297 status_rect.y = 0;
1298 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
1299 status_rect.height = TermWin.fheight;
1273} 1300}
1274 1301
1275/* Checking whether input method is running. */ 1302/* Checking whether input method is running. */
1276bool 1303bool
1277rxvt_term::IMisRunning () 1304rxvt_term::IMisRunning ()
1278{ 1305{
1279 char *p; 1306 char *p;
1280 Atom atom; 1307 Atom atom;
1281 Window win; 1308 Window win;
1282 char server[IMBUFSIZ]; 1309 char server[IMBUFSIZ];
1283 1310
1284 /* get current locale modifier */ 1311 /* get current locale modifier */
1285 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1312 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1286 { 1313 {
1287 STRCPY (server, "@server="); 1314 strcpy (server, "@server=");
1288 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1315 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1316
1289 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1317 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1290 *p = '\0'; 1318 *p = '\0';
1291 1319
1292 atom = XInternAtom (display->display, server, False); 1320 atom = XInternAtom (display->display, server, False);
1293 win = XGetSelectionOwner (display->display, atom); 1321 win = XGetSelectionOwner (display->display, atom);
1322
1294 if (win != None) 1323 if (win != None)
1295 return True; 1324 return True;
1296 } 1325 }
1326
1297 return False; 1327 return False;
1298} 1328}
1299 1329
1300void 1330void
1301rxvt_term::IMSendSpot () 1331rxvt_term::IMSendSpot ()
1302{ 1332{
1303 XPoint spot; 1333 XPoint nspot;
1304 XVaNestedList preedit_attr; 1334 XVaNestedList preedit_attr;
1305 1335
1306 if (Input_Context == NULL 1336 if (!Input_Context
1337 || !TermWin.focus
1307 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1338 || !(input_style & XIMPreeditPosition))
1308 || ! (event_type == KeyPress
1309 || event_type == Expose
1310 || event_type == NoExpose
1311 || event_type == SelectionNotify
1312 || event_type == ButtonRelease || event_type == FocusIn)
1313 || !IMisRunning ())
1314 return; 1339 return;
1315 1340
1316 im_set_position (&spot); 1341 im_set_position (nspot);
1342
1343 if (nspot.x == spot.x && nspot.y == spot.y)
1344 return;
1345
1346 spot = nspot;
1317 1347
1318 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1348 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1319 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1349 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1320 XFree (preedit_attr); 1350 XFree (preedit_attr);
1321} 1351}
1322 1352
1323void 1353void
1324rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1325 XRectangle * needed_rect)
1326{
1327 int mbh, vtx = 0;
1328
1329 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1330 vtx = scrollbar_TotalWidth ();
1331
1332 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1333 mbh -= TermWin.lineSpace;
1334
1335 preedit_rect->x = needed_rect->width + vtx;
1336 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1337
1338 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1339 preedit_rect->height = Height2Pixel (1);
1340
1341 status_rect->x = vtx;
1342 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1343
1344 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1345 status_rect->height = Height2Pixel (1);
1346}
1347
1348void
1349rxvt_term::im_destroy () 1354rxvt_term::im_destroy ()
1350{ 1355{
1351 if (Input_Context)
1352 {
1353 XDestroyIC (Input_Context);
1354 Input_Context = NULL;
1355 }
1356
1357 if (input_method) 1356 if (input_method)
1358 { 1357 {
1358 if (Input_Context && input_method->xim)
1359 XDestroyIC (Input_Context);
1360
1359 display->put_xim (input_method); 1361 display->put_xim (input_method);
1360 input_method = 0; 1362 input_method = 0;
1361 } 1363 }
1364
1365 Input_Context = 0;
1362} 1366}
1363 1367
1364/* 1368/*
1365 * Try to open a XIM with the current modifiers, then see if we can 1369 * Try to open a XIM with the current modifiers, then see if we can
1366 * open a suitable preedit type 1370 * open a suitable preedit type
1367 */ 1371 */
1368bool 1372bool
1369rxvt_term::IM_get_IC (const char *modifiers) 1373rxvt_term::IM_get_IC (const char *modifiers)
1370{ 1374{
1371 int i, j, found; 1375 int i, j, found;
1372 XIM xim; 1376 XIM xim;
1373 XPoint spot; 1377 XPoint spot;
1374 XRectangle rect, status_rect, needed_rect; 1378 XRectangle rect, status_rect, needed_rect;
1375 unsigned long fg, bg; 1379 unsigned long fg, bg;
1376 const char *p; 1380 const char *p;
1377 char **s; 1381 char **s;
1378 XIMStyles *xim_styles; 1382 XIMStyles *xim_styles;
1379 XVaNestedList preedit_attr, status_attr;
1380 1383
1381 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1384 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1382 return false; 1385 return false;
1383 1386
1384 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1387 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1385 input_method = display->get_xim (locale, modifiers); 1388 input_method = display->get_xim (locale, modifiers);
1386 if (input_method == NULL) 1389 if (input_method == NULL)
1387 return false; 1390 return false;
1388 1391
1389 xim = input_method->xim; 1392 xim = input_method->xim;
1393 spot.x = spot.y = -1;
1390 1394
1391 xim_styles = NULL; 1395 xim_styles = NULL;
1392 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1396 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1393 || !xim_styles || !xim_styles->count_styles) 1397 || !xim_styles || !xim_styles->count_styles)
1394 { 1398 {
1395 display->put_xim (input_method); 1399 im_destroy ();
1396 return false; 1400 return false;
1397 } 1401 }
1398 1402
1399 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1403 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1404
1405 for (int pi = 0; pi < 2; pi++)
1406 {
1407 p = pet[pi];
1408
1409 if (!p)
1410 continue;
1411
1400 s = rxvt_splitcommastring (p); 1412 s = rxvt_splitcommastring (p);
1413
1401 for (i = found = 0; !found && s[i]; i++) 1414 for (i = found = 0; !found && s[i]; i++)
1402 { 1415 {
1403 if (!STRCMP (s[i], "OverTheSpot")) 1416 if (!strcmp (s[i], "OverTheSpot"))
1404 input_style = (XIMPreeditPosition | XIMStatusNothing); 1417 input_style = (XIMPreeditPosition | XIMStatusNothing);
1405 else if (!STRCMP (s[i], "OffTheSpot")) 1418 else if (!strcmp (s[i], "OffTheSpot"))
1406 input_style = (XIMPreeditArea | XIMStatusArea); 1419 input_style = (XIMPreeditArea | XIMStatusArea);
1407 else if (!STRCMP (s[i], "Root")) 1420 else if (!strcmp (s[i], "Root"))
1408 input_style = (XIMPreeditNothing | XIMStatusNothing); 1421 input_style = (XIMPreeditNothing | XIMStatusNothing);
1422 else if (!strcmp (s[i], "None"))
1423 input_style = (XIMPreeditNone | XIMStatusNone);
1409 1424
1410 for (j = 0; j < xim_styles->count_styles; j++) 1425 for (j = 0; j < xim_styles->count_styles; j++)
1411 if (input_style == xim_styles->supported_styles[j]) 1426 if (input_style == xim_styles->supported_styles[j])
1412 { 1427 {
1428 rxvt_freecommastring (s);
1429
1413 found = 1; 1430 found = 1;
1414 break; 1431 goto foundpet;
1432 }
1433
1415 } 1434 }
1416 }
1417 1435
1418 for (i = 0; s[i]; i++) 1436 rxvt_freecommastring (s);
1419 free (s[i]); 1437 }
1420 1438
1421 free (s); 1439foundpet:
1440
1422 XFree (xim_styles); 1441 XFree (xim_styles);
1423 1442
1424 if (!found) 1443 if (!found)
1425 { 1444 {
1426 display->put_xim (input_method); 1445 im_destroy ();
1427 return false; 1446 return false;
1428 } 1447 }
1429 1448
1430 preedit_attr = status_attr = NULL; 1449 XFontSet fs = 0;
1450 XVaNestedList preedit_attr = 0, status_attr = 0;
1451
1452 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1453 {
1454 // fake us a font-set, please
1455 char **missing_charset_list;
1456 int missing_charset_count;
1457 char *def_string;
1458 char pat[512];
1459
1460 sprintf (pat,
1461 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1462 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1463 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1464 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "*",
1467 TermWin.fheight,
1468 TermWin.fheight + 1, TermWin.fheight - 1,
1469 TermWin.fheight - 2, TermWin.fheight + 2);
1470
1471 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1472 &missing_charset_list, &missing_charset_count, &def_string);
1473
1474 if (missing_charset_list)
1475 XFreeStringList (missing_charset_list);
1476
1477 if (!fs)
1478 {
1479 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1480 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1481 }
1482 }
1431 1483
1432 if (input_style & XIMPreeditPosition) 1484 if (input_style & XIMPreeditPosition)
1433 { 1485 {
1434 im_set_size (&rect); 1486 im_set_size (rect);
1435 im_set_position (&spot); 1487 im_set_position (spot);
1436 im_set_color (&fg, &bg); 1488 im_set_color (fg, bg);
1437 1489
1438 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1490 preedit_attr = XVaCreateNestedList (0,
1491 XNForeground, fg,
1492 XNBackground, bg,
1493 XNArea, &rect,
1439 XNSpotLocation, &spot, 1494 XNSpotLocation, &spot,
1440 XNForeground, fg, XNBackground, bg,
1441 //XNFontSet, TermWin.fontset, 1495 XNFontSet, fs,
1442 NULL); 1496 NULL);
1443 } 1497 }
1444 else if (input_style & XIMPreeditArea) 1498 else if (input_style & XIMPreeditArea)
1445 { 1499 {
1446 im_set_color (&fg, &bg); 1500 im_set_color (fg, bg);
1447 1501
1448 /* 1502 /*
1449 * The necessary width of preedit area is unknown 1503 * The necessary width of preedit area is unknown
1450 * until create input context. 1504 * until create input context.
1451 */ 1505 */
1452 needed_rect.width = 0; 1506 needed_rect.width = 0;
1453
1454 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1507 im_set_preedit_area (rect, status_rect, needed_rect);
1455 1508
1456 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1509 preedit_attr = XVaCreateNestedList (0,
1510 XNForeground, fg,
1457 XNForeground, fg, XNBackground, bg, 1511 XNBackground, bg,
1512 XNArea, &rect,
1513 XNFontSet, fs,
1514 NULL);
1515 status_attr = XVaCreateNestedList (0,
1516 XNForeground, fg,
1517 XNBackground, bg,
1518 XNArea, &status_rect,
1458 //XNFontSet, TermWin.fontset, 1519 XNFontSet, fs,
1459 NULL); 1520 NULL);
1460 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1461 XNForeground, fg, XNBackground, bg,
1462 //XNFontSet, TermWin.fontset,
1463 NULL);
1464 } 1521 }
1465 1522
1466 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1523 Input_Context = XCreateIC (xim,
1524 XNInputStyle, input_style,
1467 XNClientWindow, TermWin.parent[0], 1525 XNClientWindow, TermWin.vt,
1468 XNFocusWindow, TermWin.parent[0], 1526 XNFocusWindow, TermWin.parent[0],
1469 preedit_attr ? XNPreeditAttributes : NULL, 1527 preedit_attr ? XNPreeditAttributes : NULL,
1470 preedit_attr, 1528 preedit_attr,
1471 status_attr ? XNStatusAttributes : NULL, 1529 status_attr ? XNStatusAttributes : NULL,
1472 status_attr, NULL); 1530 status_attr, NULL);
1531
1473 if (preedit_attr) XFree (preedit_attr); 1532 if (preedit_attr) XFree (preedit_attr);
1474 if (status_attr) XFree (status_attr); 1533 if (status_attr) XFree (status_attr);
1534 if (fs) XFreeFontSet (display->display, fs);
1475 1535
1476 if (Input_Context == NULL) 1536 if (Input_Context == NULL)
1477 { 1537 {
1478 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1538 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1479 display->put_xim (input_method); 1539 im_destroy ();
1480 return false; 1540 return false;
1481 } 1541 }
1482 1542
1483 if (input_style & XIMPreeditArea) 1543 if (input_style & XIMPreeditArea)
1484 IMSetStatusPosition (); 1544 IMSetStatusPosition ();
1493 int i, found, had_im; 1553 int i, found, had_im;
1494 const char *p; 1554 const char *p;
1495 char **s; 1555 char **s;
1496 char buf[IMBUFSIZ]; 1556 char buf[IMBUFSIZ];
1497 1557
1558 SET_R (this);
1559
1498 im_destroy (); 1560 im_destroy ();
1499 1561
1500 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1562 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1501 if (Input_Context) 1563 if (Input_Context)
1502 return; 1564 return;
1510 if (p && *p) 1572 if (p && *p)
1511 { 1573 {
1512 bool found = false; 1574 bool found = false;
1513 1575
1514 s = rxvt_splitcommastring (p); 1576 s = rxvt_splitcommastring (p);
1577
1515 for (i = 0; s[i]; i++) 1578 for (i = 0; s[i]; i++)
1516 { 1579 {
1517 if (*s[i]) 1580 if (*s[i])
1518 { 1581 {
1519 STRCPY (buf, "@im="); 1582 strcpy (buf, "@im=");
1520 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1583 strncat (buf, s[i], IMBUFSIZ - 5);
1521 if (IM_get_IC (buf)) 1584 if (IM_get_IC (buf))
1522 { 1585 {
1523 found = true; 1586 found = true;
1524 break; 1587 break;
1525 } 1588 }
1526 } 1589 }
1527 } 1590 }
1528 for (i = 0; s[i]; i++) 1591
1529 free (s[i]); 1592 rxvt_freecommastring (s);
1530 free (s);
1531 1593
1532 if (found) 1594 if (found)
1533 goto done; 1595 goto done;
1534 } 1596 }
1535 1597
1549} 1611}
1550 1612
1551void 1613void
1552rxvt_term::IMSetStatusPosition () 1614rxvt_term::IMSetStatusPosition ()
1553{ 1615{
1554 XRectangle preedit_rect, status_rect, *needed_rect; 1616 XRectangle preedit_rect, status_rect, *needed_rect;
1555 XVaNestedList preedit_attr, status_attr; 1617 XVaNestedList preedit_attr, status_attr;
1556 1618
1557 if (Input_Context == NULL 1619 if (!Input_Context
1620 || !TermWin.focus
1558 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1621 || !(input_style & XIMPreeditArea)
1559 || !IMisRunning ()) 1622 || !IMisRunning ())
1560 return; 1623 return;
1561 1624
1562 /* Getting the necessary width of preedit area */ 1625 /* Getting the necessary width of preedit area */
1563 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1626 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1564 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1627 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1565 XFree (status_attr); 1628 XFree (status_attr);
1566 1629
1567 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1630 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1631 XFree (needed_rect);
1568 1632
1569 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1570 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1634 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1571 1635
1572 XSetICValues (Input_Context, 1636 XSetICValues (Input_Context,
1573 XNPreeditAttributes, preedit_attr, 1637 XNPreeditAttributes, preedit_attr,
1574 XNStatusAttributes, status_attr, NULL); 1638 XNStatusAttributes, status_attr, NULL);
1575 1639
1576 XFree (preedit_attr); 1640 XFree (preedit_attr);
1577 XFree (status_attr); 1641 XFree (status_attr);
1578} 1642}
1579#endif /* USE_XIM */ 1643#endif /* USE_XIM */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines