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.94 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.137 by root, Tue Feb 15 16:04:45 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
… …
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_pid) 190 if (cmd_pid)
193 kill (-cmd_pid, SIGHUP); 191 kill (-cmd_pid, SIGHUP);
194 192
195 pty.put ();
196
197#ifdef UTMP_SUPPORT 193#ifdef UTMP_SUPPORT
198 privileged_utmp (RESTORE); 194 privileged_utmp (RESTORE);
199#endif 195#endif
200 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
201 delete TermWin.fontset; 211 delete TermWin.fontset[0];
202 212
203 if (display) 213 if (display)
204 { 214 {
215 dDisp;
216
205 selection_clear (); 217 selection_clear ();
206 218
207#ifdef USE_XIM 219#ifdef USE_XIM
208 im_destroy (); 220 im_destroy ();
209#endif 221#endif
210#ifdef MENUBAR 222#ifdef MENUBAR
211 if (menubarGC) XFreeGC (display->display, menubarGC); 223 if (menubarGC) XFreeGC (disp, menubarGC);
212#endif 224#endif
213#ifdef XTERM_SCROLLBAR 225#ifdef XTERM_SCROLLBAR
214 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
215 if (ShadowGC) XFreeGC (display->display, ShadowGC); 227 if (ShadowGC) XFreeGC (disp, ShadowGC);
216#endif 228#endif
217#ifdef PLAIN_SCROLLBAR 229#ifdef PLAIN_SCROLLBAR
218 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
219#endif 231#endif
220#ifdef NEXT_SCROLLBAR 232#ifdef NEXT_SCROLLBAR
221 if (blackGC) XFreeGC (display->display, blackGC); 233 if (blackGC) XFreeGC (disp, blackGC);
222 if (whiteGC) XFreeGC (display->display, whiteGC); 234 if (whiteGC) XFreeGC (disp, whiteGC);
223 if (grayGC) XFreeGC (display->display, grayGC); 235 if (grayGC) XFreeGC (disp, grayGC);
224 if (darkGC) XFreeGC (display->display, darkGC); 236 if (darkGC) XFreeGC (disp, darkGC);
225 if (stippleGC) XFreeGC (display->display, stippleGC); 237 if (stippleGC) XFreeGC (disp, stippleGC);
226 if (dimple) XFreePixmap (display->display, dimple); 238 if (dimple) XFreePixmap (disp, dimple);
227 if (upArrow) XFreePixmap (display->display, upArrow); 239 if (upArrow) XFreePixmap (disp, upArrow);
228 if (downArrow) XFreePixmap (display->display, downArrow); 240 if (downArrow) XFreePixmap (disp, downArrow);
229 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 241 if (upArrowHi) XFreePixmap (disp, upArrowHi);
230 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 242 if (downArrowHi) XFreePixmap (disp, downArrowHi);
231#endif 243#endif
232#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
233 if (topShadowGC) XFreeGC (display->display, topShadowGC); 245 if (topShadowGC) XFreeGC (disp, topShadowGC);
234 if (botShadowGC) XFreeGC (display->display, botShadowGC); 246 if (botShadowGC) XFreeGC (disp, botShadowGC);
235 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 247 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
236#endif 248#endif
237 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 249 if (TermWin.gc) XFreeGC (disp, TermWin.gc);
238 250
239#if defined(MENUBAR) && (MENUBAR_MAX > 1) 251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
240 delete menuBar.drawable; 252 delete menuBar.drawable;
241 //if (menuBar.win) 253 //if (menuBar.win)
242 // XDestroyWindow (display->display, menuBar.win); 254 // XDestroyWindow (disp, menuBar.win);
243#endif 255#endif
244 delete TermWin.drawable; 256 delete TermWin.drawable;
245 // destroy all windows 257 // destroy all windows
246 if (TermWin.parent[0]) 258 if (TermWin.parent[0]
259#if ENABLE_FRILLS
260 && !rs[Rs_embed]
261#endif
262 )
247 XDestroyWindow (display->display, TermWin.parent[0]); 263 XDestroyWindow (disp, TermWin.parent[0]);
248 } 264 }
249 265
250 // TODO: free pixcolours, colours should become part of rxvt_display 266 // TODO: free pixcolours, colours should become part of rxvt_display
251 267
252 delete pix_colors_focused; 268 delete pix_colors_focused;
… …
258 274
259 scr_release (); 275 scr_release ();
260 276
261 /* clear all resources */ 277 /* clear all resources */
262 for (int i = 0; i < allocated.size (); i++) 278 for (int i = 0; i < allocated.size (); i++)
263 free (allocated[i]); 279 free (allocated [i]);
264 280
265 free (selection.text); 281 free (selection.text);
266 // TODO: manage env vars in child only(!) 282 // TODO: manage env vars in child only(!)
267 free (env_windowid); 283 free (env_windowid);
268 free (env_display); 284 free (env_display);
269 free (env_term); 285 free (env_term);
270 free (env_colorfgbg); 286 free (env_colorfgbg);
271 free (locale); 287 free (locale);
272#if 0 288 free (v_buffer);
273 free (codeset); 289 free (incr_buf);
274#endif
275 290
276 delete envv; 291 delete envv;
277 delete argv; 292 delete argv;
293
294#ifdef KEYSYM_RESOURCE
295 delete keyboard;
296#endif
278} 297}
279 298
280void 299void
281rxvt_term::destroy () 300rxvt_term::destroy ()
282{ 301{
… …
334 353
335 delete this; 354 delete this;
336} 355}
337 356
338/*----------------------------------------------------------------------*/ 357/*----------------------------------------------------------------------*/
358/*
359 * Exit gracefully, clearing the utmp entry and restoring tty attributes
360 * TODO: if debugging, this should free up any known resources if we can
361 */
362static XErrorHandler old_xerror_handler;
363
364static void
365rxvt_emergency_cleanup ()
366{
367 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
368 (*t)->emergency_cleanup ();
369}
370
371#if ENABLE_FRILLS
372static void
373print_x_error (Display *dpy, XErrorEvent *event)
374{
375 char buffer[BUFSIZ];
376 char mesg[BUFSIZ];
377 char number[32];
378 char *mtype = "XlibMessage";
379 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
380 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
381 rxvt_warn ("An X Error occured, trying to continue after report.\n");
382 rxvt_warn ("%s: %s\n", mesg, buffer);
383 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
384 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
385 sprintf(number, "%d", event->request_code);
386 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
387 rxvt_warn ("(which is %s)\n", buffer);
388 if (event->request_code >= 128) {
389 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
390 mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
392 }
393 if ((event->error_code == BadWindow) ||
394 (event->error_code == BadPixmap) ||
395 (event->error_code == BadCursor) ||
396 (event->error_code == BadFont) ||
397 (event->error_code == BadDrawable) ||
398 (event->error_code == BadColor) ||
399 (event->error_code == BadGC) ||
400 (event->error_code == BadIDChoice) ||
401 (event->error_code == BadValue) ||
402 (event->error_code == BadAtom)) {
403 if (event->error_code == BadValue)
404 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
405 mesg, BUFSIZ);
406 else if (event->error_code == BadAtom)
407 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
408 mesg, BUFSIZ);
409 else
410 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
411 mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
413 }
414 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
415 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
417}
418#endif
419
420int
421rxvt_xerror_handler (Display *display, XErrorEvent *event)
422{
423 if (GET_R->allowedxerror == -1)
424 GET_R->allowedxerror = event->error_code;
425 else
426 {
427 //TODO: GET_R is most likely not the terminal which caused the error
428 //TODO: maybe just output the error and continue?
429#if ENABLE_FRILLS
430 print_x_error (display, event);
431#else
432 old_xerror_handler (display, event);
433#endif
434 }
435
436 return 0;
437}
438
439int
440rxvt_xioerror_handler (Display *display)
441{
442 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
443 DisplayString (display));
444 rxvt_emergency_cleanup ();
445 _exit (EXIT_FAILURE);
446}
447
448/*
449 * Catch a fatal signal and tidy up before quitting
450 */
451void
452rxvt_term::sig_term (sig_watcher &w)
453{
454#ifdef DEBUG_CMD
455 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
456#endif
457 rxvt_emergency_cleanup ();
458 signal (w.signum, SIG_DFL);
459 kill (getpid (), w.signum);
460}
461
462/*----------------------------------------------------------------------*/
339/* rxvt_init () */ 463/* rxvt_init () */
340bool 464bool
341rxvt_term::init (int argc, const char *const *argv) 465rxvt_term::init (int argc, const char *const *argv)
342{ 466{
343 SET_R (this); 467 SET_R (this);
344 468
469 set_locale ("");
470
345 if (!init_vars ()) 471 if (!init_vars ())
346 return false; 472 return false;
347 473
348 init_secondary (); 474 init_secondary ();
349 475
350 const char **cmd_argv = init_resources (argc, argv); 476 const char **cmd_argv = init_resources (argc, argv);
351 477
352 set_locale (""); 478#ifdef KEYSYM_RESOURCE
479 keyboard->register_done ();
480#endif
353 481
354#if MENUBAR_MAX 482#if MENUBAR_MAX
355 menubar_read (rs[Rs_menu]); 483 menubar_read (rs[Rs_menu]);
356#endif 484#endif
357#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
… …
359 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
360#endif 488#endif
361 489
362 create_windows (argc, argv); 490 create_windows (argc, argv);
363 491
492 dDisp;
493
364 init_xlocale (); 494 init_xlocale ();
365 495
366 scr_reset (); /* initialize screen */ 496 scr_reset (); /* initialize screen */
367 497
368#if 0 498#if 0
369 XSynchronize (display->display, True); 499 XSynchronize (disp, True);
370#endif 500#endif
371 501
372#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
373 if (options & Opt_scrollBar) 503 if (options & Opt_scrollBar)
374 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
375#endif 505#endif
376#if (MENUBAR_MAX) 506#if (MENUBAR_MAX)
377 if (menubar_visible ()) 507 if (menubar_visible ())
378 XMapWindow (display->display, menuBar.win); 508 XMapWindow (disp, menuBar.win);
379#endif 509#endif
380#ifdef TRANSPARENT 510#ifdef TRANSPARENT
381 if (options & Opt_transparent) 511 if (options & Opt_transparent)
382 { 512 {
383 XSelectInput (display->display, display->root, PropertyChangeMask); 513 XSelectInput (disp, display->root, PropertyChangeMask);
384 check_our_parents (); 514 check_our_parents ();
385 rootwin_ev.start (display, display->root); 515 rootwin_ev.start (display, display->root);
386 } 516 }
387#endif 517#endif
388 518
389 XMapWindow (display->display, TermWin.vt); 519 XMapWindow (disp, TermWin.vt);
390 XMapWindow (display->display, TermWin.parent[0]); 520 XMapWindow (disp, TermWin.parent[0]);
521
522 set_colorfgbg ();
391 523
392 init_command (cmd_argv); 524 init_command (cmd_argv);
393 525
526 free (cmd_argv);
527
394 pty_ev.start (pty.pty, EVENT_READ); 528 pty_ev.start (pty.pty, EVENT_READ);
395 529
396 check_ev.start (); 530 check_ev.start ();
397 531
398 return true; 532 return true;
399} 533}
400 534
401static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
402
403void 535void
404rxvt_init () 536rxvt_init ()
405{ 537{
406 /* install exit handler for cleanup */
407#if 0
408#ifdef HAVE_ATEXIT
409 atexit (rxvt_clean_exit);
410#else
411#endif
412#endif
413 /* 538 /*
414 * Save and then give up any super-user privileges 539 * Save and then give up any super-user privileges
415 * If we need privileges in any area then we must specifically request it. 540 * If we need privileges in any area then we must specifically request it.
416 * We should only need to be root in these cases: 541 * We should only need to be root in these cases:
417 * 1. write utmp entries on some systems 542 * 1. write utmp entries on some systems
418 * 2. chown tty on some systems 543 * 2. chown tty on some systems
419 */ 544 */
420 rxvt_privileges (SAVE); 545 rxvt_privileges (SAVE);
421 rxvt_privileges (IGNORE); 546 rxvt_privileges (IGNORE);
422 547
423 struct sigaction sa; 548 signal (SIGHUP, SIG_IGN);
424 549 signal (SIGPIPE, SIG_IGN);
425 sigfillset (&sa.sa_mask);
426 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
427 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
428 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
429 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
430 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
431 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
432 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
433 550
434 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 551 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
435 /* signal (SIGURG, SIG_DFL); */ 552 /* signal (SIGURG, SIG_DFL); */
436 553
437 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 554 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
555 // TODO: handle this with exceptions and tolerate the memory loss
438 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 556 XSetIOErrorHandler (rxvt_xioerror_handler);
439} 557}
440 558
441/* ------------------------------------------------------------------------- * 559/* ------------------------------------------------------------------------- *
442 * SIGNAL HANDLING & EXIT HANDLER * 560 * SIGNAL HANDLING & EXIT HANDLER *
443 * ------------------------------------------------------------------------- */ 561 * ------------------------------------------------------------------------- */
444/* 562/*
445 * Catch a SIGCHLD signal and exit if the direct child has died 563 * Catch a SIGCHLD signal and exit if the direct child has died
446 */ 564 */
447 565
448void rxvt_term::child_exited (int pid) 566void
567rxvt_term::sig_chld (sig_watcher &w)
449{ 568{
450 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 569 // we are being called for every SIGCHLD, not just ours
451 if (pid == (*t)->cmd_pid) 570 int pid;
452 {
453 (*t)->destroy ();
454 break;
455 }
456}
457
458/* ARGSUSED */
459/* INTPROTO */
460RETSIGTYPE
461rxvt_Child_signal (int sig __attribute__ ((unused)))
462{
463 int pid, save_errno = errno;
464 571
465 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 572 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
466 rxvt_term::child_exited (pid); 573 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
467 574 if (pid == (*t)->cmd_pid)
468 errno = save_errno; 575 {
469} 576 (*t)->destroy ();
470 577 break;
471/* 578 }
472 * Catch a fatal signal and tidy up before quitting
473 */
474/* INTPROTO */
475RETSIGTYPE
476rxvt_Exit_signal (int sig)
477{
478 signal (sig, SIG_DFL);
479#ifdef DEBUG_CMD
480 rxvt_warn ("caught signal %d, exiting.\n", sig);
481#endif
482 rxvt_clean_exit ();
483 kill (getpid (), sig);
484}
485
486/* INTPROTO */
487int
488rxvt_xerror_handler (Display *display, XErrorEvent *event)
489{
490 if (GET_R->allowedxerror == -1)
491 GET_R->allowedxerror = event->error_code;
492 else
493 {
494 old_xerror_handler (display, event);
495 GET_R->destroy ();
496 }
497
498 return 0;
499}
500
501/*----------------------------------------------------------------------*/
502/*
503 * Exit gracefully, clearing the utmp entry and restoring tty attributes
504 * TODO: if debugging, this should free up any known resources if we can
505 */
506/* INTPROTO */
507void
508rxvt_clean_exit ()
509{
510 // TODO: rxvtd should clean up all ressources
511 if (GET_R)
512 GET_R->destroy ();
513} 579}
514 580
515/* ------------------------------------------------------------------------- * 581/* ------------------------------------------------------------------------- *
516 * MEMORY ALLOCATION WRAPPERS * 582 * MEMORY ALLOCATION WRAPPERS *
517 * ------------------------------------------------------------------------- */ 583 * ------------------------------------------------------------------------- */
518/* INTPROTO */ 584void *
519void *
520rxvt_malloc (size_t size) 585rxvt_malloc (size_t size)
521{ 586{
522 void *p;
523
524 p = malloc (size); 587 void *p = malloc (size);
588
525 if (p) 589 if (!p)
526 return p;
527
528 rxvt_fatal ("memory allocation failure. aborting.\n"); 590 rxvt_fatal ("memory allocation failure. aborting.\n");
529 /* NOTREACHED */ 591
592 return p;
530} 593}
531 594
532/* INTPROTO */ 595/* INTPROTO */
533void * 596void *
534rxvt_calloc (size_t number, size_t size) 597rxvt_calloc (size_t number, size_t size)
535{ 598{
536 void *p;
537
538 p = calloc (number, size); 599 void *p = calloc (number, size);
600
539 if (p) 601 if (!p)
540 return p;
541
542 rxvt_fatal ("memory allocation failure. aborting.\n"); 602 rxvt_fatal ("memory allocation failure. aborting.\n");
543 /* NOTREACHED */ 603
604 return p;
544} 605}
545 606
546/* INTPROTO */ 607/* INTPROTO */
547void * 608void *
548rxvt_realloc (void *ptr, size_t size) 609rxvt_realloc (void *ptr, size_t size)
549{ 610{
550 void *p;
551
552 if (ptr)
553 p = realloc (ptr, size); 611 void *p = realloc (ptr, size);
554 else
555 p = malloc (size);
556 612
557 if (p) 613 if (!p)
558 return p;
559
560 rxvt_fatal ("memory allocation failure. aborting.\n"); 614 rxvt_fatal ("memory allocation failure. aborting.\n");
561 /* NOTREACHED */ 615
616 return p;
562} 617}
563 618
564/* ------------------------------------------------------------------------- * 619/* ------------------------------------------------------------------------- *
565 * PRIVILEGED OPERATIONS * 620 * PRIVILEGED OPERATIONS *
566 * ------------------------------------------------------------------------- */ 621 * ------------------------------------------------------------------------- */
… …
641 * if width/height are non-zero then override calculated width/height 696 * if width/height are non-zero then override calculated width/height
642 */ 697 */
643void 698void
644rxvt_term::window_calc (unsigned int width, unsigned int height) 699rxvt_term::window_calc (unsigned int width, unsigned int height)
645{ 700{
646 short recalc_x, recalc_y; 701 short recalc_x, recalc_y;
647 int x, y, sb_w, mb_h, flags; 702 int x, y, sb_w, mb_h, flags;
648 unsigned int w, h; 703 unsigned int w, h;
649 unsigned int max_width, max_height; 704 unsigned int max_width, max_height;
705 dDisp;
650 706
651 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 707 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
652 TermWin.ncol, TermWin.nrow, szHint.width, 708 TermWin.ncol, TermWin.nrow, szHint.width,
653 szHint.height)); 709 szHint.height));
654 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 710 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
… …
660 if (!parsed_geometry) 716 if (!parsed_geometry)
661 { 717 {
662 parsed_geometry = 1; 718 parsed_geometry = 1;
663 if (rs[Rs_geometry]) 719 if (rs[Rs_geometry])
664 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 720 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
721
665 if (flags & WidthValue) 722 if (flags & WidthValue)
666 { 723 {
667 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 724 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
668 szHint.flags |= USSize; 725 szHint.flags |= USSize;
669 } 726 }
727
670 if (flags & HeightValue) 728 if (flags & HeightValue)
671 { 729 {
672 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 730 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
673 szHint.flags |= USSize; 731 szHint.flags |= USSize;
674 } 732 }
733
675 if (flags & XValue) 734 if (flags & XValue)
676 { 735 {
677 szHint.x = x; 736 szHint.x = x;
678 szHint.flags |= USPosition; 737 szHint.flags |= USPosition;
679 if (flags & XNegative) 738 if (flags & XNegative)
680 { 739 {
681 recalc_x = 1; 740 recalc_x = 1;
682 szHint.win_gravity = NorthEastGravity; 741 szHint.win_gravity = NorthEastGravity;
683 } 742 }
684 } 743 }
744
685 if (flags & YValue) 745 if (flags & YValue)
686 { 746 {
687 szHint.y = y; 747 szHint.y = y;
688 szHint.flags |= USPosition; 748 szHint.flags |= USPosition;
689 if (flags & YNegative) 749 if (flags & YNegative)
… …
752 812
753 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 813 if (scrollbar_visible () && (options & Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 814 window_sb_x = szHint.width - sb_w;
755 815
756 if (recalc_x) 816 if (recalc_x)
757 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 817 szHint.x += (DisplayWidth (disp, display->screen)
758 - szHint.width - 2 * TermWin.ext_bwidth); 818 - szHint.width - 2 * TermWin.ext_bwidth);
759 if (recalc_y) 819 if (recalc_y)
760 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 820 szHint.y += (DisplayHeight (disp, display->screen)
761 - szHint.height - 2 * TermWin.ext_bwidth); 821 - szHint.height - 2 * TermWin.ext_bwidth);
762 822
763 TermWin.ncol = TermWin.width / TermWin.fwidth; 823 TermWin.ncol = TermWin.width / TermWin.fwidth;
764 TermWin.nrow = TermWin.height / TermWin.fheight; 824 TermWin.nrow = TermWin.height / TermWin.fheight;
765 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 825 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
793 kill (cmd_pid, SIGWINCH); 853 kill (cmd_pid, SIGWINCH);
794#endif 854#endif
795} 855}
796 856
797/*----------------------------------------------------------------------*/ 857/*----------------------------------------------------------------------*/
798/* rxvt_change_font () - Switch to a new font */ 858/* set_fonts () - load and set the various fonts
799/* 859/*
800 * init = 1 - initialize 860 * init = 1 - initialize
801 * 861 *
802 * fontname == FONT_UP - switch to bigger font 862 * fontname == FONT_UP - switch to bigger font
803 * fontname == FONT_DN - switch to smaller font 863 * fontname == FONT_DN - switch to smaller font
804 */ 864 */
805bool 865bool
806rxvt_term::change_font (const char *fontname) 866rxvt_term::set_fonts ()
807{ 867{
808 if (fontname == FONT_UP)
809 {
810 // TODO
811 }
812 else if (fontname == FONT_DN)
813 {
814 // TODO
815 }
816 else
817 {
818 rxvt_fontset *fs = new rxvt_fontset (this); 868 rxvt_fontset *fs = new rxvt_fontset (this);
869 rxvt_fontprop prop;
819 870
820 if (fs && fs->populate (fontname ? fontname : "fixed")) 871 if (!fs
872 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
873 || !fs->realize_font (1))
874 {
875 delete fs;
876 return false;
877 }
878
879#if ENABLE_STYLES
880 for (int i = RS_styleCount; --i; )
881 if (TermWin.fontset[i] != TermWin.fontset[0])
882 delete TermWin.fontset[i];
883#endif
884
885 delete TermWin.fontset[0];
886 TermWin.fontset[0] = fs;
887
888 prop = (*fs)[1]->properties ();
889 prop.height += TermWin.lineSpace;
890 fs->set_prop (prop);
891
892 TermWin.fwidth = prop.width;
893 TermWin.fheight = prop.height;
894 TermWin.fweight = prop.weight;
895 TermWin.fslant = prop.slant;
896 TermWin.fbase = (*fs)[1]->ascent;
897
898 for (int style = 1; style < 4; style++)
899 {
900#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style];
902
903 if (res && !*res)
904 TermWin.fontset[style] = TermWin.fontset[0];
905 else
821 { 906 {
822 delete TermWin.fontset; 907 TermWin.fontset[style] = fs = new rxvt_fontset (this);
823 TermWin.fontset = fs; 908 rxvt_fontprop prop2 = prop;
824 TermWin.fwidth = fs->base_font ()->width;
825 TermWin.fheight = fs->base_font ()->height;
826 TermWin.fbase = fs->base_font ()->ascent;
827 909
828 if (TermWin.parent[0]) 910 if (res)
911 prop2.weight = prop2.slant = rxvt_fontprop::unset;
912 else
829 { 913 {
830 resize_all_windows (0, 0, 0); 914 res = TermWin.fontset[0]->fontdesc;
831 scr_remap_chars (); 915
832 scr_touch (true); 916 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
917 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
833 } 918 }
834 919
835 for (unicode_t ch = 0x20; ch <= 0x7f; ch++) 920 fs->populate (res);
836 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch); 921 fs->set_prop (prop2);
837
838 return true;
839 } 922 }
923#else
924 TermWin.fontset[style] = TermWin.fontset[0];
925#endif
926 }
927
928 if (TermWin.parent[0])
840 } 929 {
930 resize_all_windows (0, 0, 0);
931 scr_remap_chars ();
932 scr_touch (true);
933 }
841 934
842 return false; 935 return true;
843} 936}
844 937
845bool 938void rxvt_term::set_string_property (Atom prop, const char *str, int len)
846rxvt_term::font_up_down (int n, int direction)
847{ 939{
848 return false; 940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, TermWin.parent[0],
942 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944}
945
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws);
951
952 XChangeProperty (display->display, TermWin.parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
954 (const unsigned char *)s, strlen (s));
955
956 free (s);
957 free (ws);
849} 958}
850 959
851/*----------------------------------------------------------------------*/ 960/*----------------------------------------------------------------------*/
852/*----------------------------------------------------------------------*/ 961/*----------------------------------------------------------------------*/
853/* xterm sequences - title, iconName, color (exptl) */ 962/* xterm sequences - title, iconName, color (exptl) */
854void 963void
855rxvt_term::set_title (const char *str) 964rxvt_term::set_title (const char *str)
856{ 965{
857#ifdef SMART_WINDOW_TITLE 966 set_string_property (XA_WM_NAME, str);
858 char *name; 967#if ENABLE_FRILLS
859 968 set_utf8_property (xa[XA_NET_WM_NAME], str);
860 if (!XFetchName (display->display, TermWin.parent[0], &name))
861 name = NULL;
862
863 if (name == NULL || strcmp (name, str))
864#endif
865 XStoreName (display->display, TermWin.parent[0], str);
866
867#ifdef SMART_WINDOW_TITLE
868 if (name)
869 XFree (name);
870#endif 969#endif
871} 970}
872 971
873void 972void
874rxvt_term::set_icon_name (const char *str) 973rxvt_term::set_icon_name (const char *str)
875{ 974{
876#ifdef SMART_WINDOW_TITLE 975 set_string_property (XA_WM_ICON_NAME, str);
877 char *name; 976#if ENABLE_FRILLS
878 977 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
879 if (!XGetIconName (display->display, TermWin.parent[0], &name))
880 name = NULL;
881
882 if (name == NULL || strcmp (name, str))
883#endif
884 XSetIconName (display->display, TermWin.parent[0], str);
885
886#ifdef SMART_WINDOW_TITLE
887 if (name)
888 XFree (name);
889#endif 978#endif
890} 979}
891 980
892#ifdef XTERM_COLOR_CHANGE 981#ifdef XTERM_COLOR_CHANGE
893void 982void
… …
901 990
902 /* handle color aliases */ 991 /* handle color aliases */
903 if (isdigit (*color)) 992 if (isdigit (*color))
904 { 993 {
905 i = atoi (color); 994 i = atoi (color);
995
906 if (i >= 8 && i <= 15) 996 if (i >= 8 && i <= 15)
907 { /* bright colors */ 997 { /* bright colors */
908 i -= 8; 998 i -= 8;
909# ifndef NO_BRIGHTCOLOR 999# ifndef NO_BRIGHTCOLOR
910 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
911 SET_PIXCOLOR (idx); 1001 SET_PIXCOLOR (idx);
912 goto Done; 1002 goto Done;
913# endif 1003# endif
914
915 } 1004 }
1005
916 if (i >= 0 && i <= 7) 1006 if (i >= 0 && i <= 7)
917 { /* normal colors */ 1007 { /* normal colors */
918 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
919 SET_PIXCOLOR (idx); 1009 SET_PIXCOLOR (idx);
920 goto Done; 1010 goto Done;
921 } 1011 }
922 } 1012 }
923 1013
924 if (!rXParseAllocColor (& xcol, color)) 1014 if (!rXParseAllocColor (&xcol, color))
925 return; 1015 return;
926 1016
927 /* XStoreColor (display->display, display->cmap, XColor*); */ 1017 /* XStoreColor (display->display, display->cmap, XColor*); */
928 1018
929 /* 1019 /*
… …
947 1037
948 /* XSetWindowAttributes attr; */ 1038 /* XSetWindowAttributes attr; */
949 /* Cursor cursor; */ 1039 /* Cursor cursor; */
950Done: 1040Done:
951#ifdef OFF_FOCUS_FADING 1041#ifdef OFF_FOCUS_FADING
1042 if (rs[Rs_fade])
952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1043 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
953#endif 1044#endif
954 if (idx == Color_bg && ! (options & Opt_transparent))
955 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
956 1045
957 /* handle Color_BD, scrollbar background, etc. */ 1046 /*TODO: handle Color_BD, scrollbar background, etc. */
958 1047
959 set_colorfgbg ();
960 recolour_cursor (); 1048 recolour_cursor ();
961 scr_touch (true); 1049 scr_recolour ();
962} 1050}
963 1051
964#else 1052#else
965# define set_window_color (idx,color) ((void)0) 1053# define set_window_color (idx,color) ((void)0)
966#endif /* XTERM_COLOR_CHANGE */ 1054#endif /* XTERM_COLOR_CHANGE */
… …
968void 1056void
969rxvt_term::recolour_cursor () 1057rxvt_term::recolour_cursor ()
970{ 1058{
971 XColor xcol[2]; 1059 XColor xcol[2];
972 1060
973 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? pix_colors_focused[Color_pointer_fg] : pix_colors_focused[Color_fg]; 1061 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
974 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? pix_colors_focused[Color_pointer_bg] : pix_colors_focused[Color_bg]; 1062 ? pix_colors_focused[Color_pointer_fg]
1063 : pix_colors_focused[Color_fg];
1064 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1065 ? pix_colors_focused[Color_pointer_bg]
1066 : pix_colors_focused[Color_bg];
1067
975 XQueryColors (display->display, display->cmap, xcol, 2); 1068 XQueryColors (display->display, display->cmap, xcol, 2);
976 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 1069 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
977} 1070}
978 1071
979/*----------------------------------------------------------------------*/ 1072/*----------------------------------------------------------------------*/
… …
981 * find if fg/bg matches any of the normal (low-intensity) colors 1074 * find if fg/bg matches any of the normal (low-intensity) colors
982 */ 1075 */
983void 1076void
984rxvt_term::set_colorfgbg () 1077rxvt_term::set_colorfgbg ()
985{ 1078{
986 unsigned int i; 1079 unsigned int i;
987 const char *xpmb = "\0"; 1080 const char *xpmb = "\0";
988 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1081 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
989 1082
990 env_colorfgbg =
991 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1083 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 1084 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 1085 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 1086 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 1087 if (pix_colors[Color_fg] == pix_colors[i])
996 { 1088 {
997 sprintf (fstr, "%d", (i - Color_Black)); 1089 sprintf (fstr, "%d", (i - Color_Black));
998 break; 1090 break;
999 } 1091 }
1092
1000 for (i = Color_Black; i <= Color_White; i++) 1093 for (i = Color_Black; i <= Color_White; i++)
1001 if (pix_colors[Color_bg] == pix_colors[i]) 1094 if (pix_colors[Color_bg] == pix_colors[i])
1002 { 1095 {
1003 sprintf (bstr, "%d", (i - Color_Black)); 1096 sprintf (bstr, "%d", (i - Color_Black));
1004#ifdef XPM_BACKGROUND 1097#ifdef XPM_BACKGROUND
… …
1006#endif 1099#endif
1007 break; 1100 break;
1008 } 1101 }
1009 1102
1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1103 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1011
1012#ifndef NO_BRIGHTCOLOR
1013 colorfgbg = DEFAULT_RSTYLE;
1014 for (i = minCOLOR; i <= maxCOLOR; i++)
1015 {
1016 if (pix_colors[Color_fg] == pix_colors[i])
1017 colorfgbg = SET_FGCOLOR (colorfgbg, i);
1018 if (pix_colors[Color_bg] == pix_colors[i])
1019 colorfgbg = SET_BGCOLOR (colorfgbg, i);
1020 }
1021#endif
1022} 1104}
1023 1105
1024/*----------------------------------------------------------------------*/ 1106/*----------------------------------------------------------------------*/
1025/*
1026 * Colour determination for low colour displays, routine from
1027 * Hans de Goede <hans@highrise.nl>
1028 */
1029 1107
1030int 1108int
1031rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1109rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1032{ 1110{
1033 if (!screen_in_out->set (display, colour)) 1111 if (!screen_in_out->set (display, colour))
… …
1044 * -------------------------------------------------------------------- */ 1122 * -------------------------------------------------------------------- */
1045void 1123void
1046rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1124rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
1047{ 1125{
1048 int fix_screen; 1126 int fix_screen;
1049
1050#ifdef SMART_RESIZE 1127#ifdef SMART_RESIZE
1051 int old_width = szHint.width, old_height = szHint.height; 1128 int old_width = szHint.width, old_height = szHint.height;
1052#endif 1129#endif
1130 dDisp;
1053 1131
1054 window_calc (width, height); 1132 window_calc (width, height);
1055 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1133 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1056 1134
1057 if (!ignoreparent) 1135 if (!ignoreparent)
1058 { 1136 {
1059#ifdef SMART_RESIZE 1137#ifdef SMART_RESIZE
1060 /* 1138 /*
… …
1064 int x, y, x1, y1; 1142 int x, y, x1, y1;
1065 int dx, dy; 1143 int dx, dy;
1066 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1144 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1067 Window unused_cr; 1145 Window unused_cr;
1068 1146
1069 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1147 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1070 0, 0, &x, &y, &unused_cr); 1148 0, 0, &x, &y, &unused_cr);
1071 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1149 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
1072 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1150 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1073 /* 1151 /*
1074 * if display->root isn't the parent window, a WM will probably have offset 1152 * if display->root isn't the parent window, a WM will probably have offset
1075 * our position for handles and decorations. Counter it 1153 * our position for handles and decorations. Counter it
1076 */ 1154 */
… …
1078 { 1156 {
1079 x -= x1; 1157 x -= x1;
1080 y -= y1; 1158 y -= y1;
1081 } 1159 }
1082 1160
1083 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1161 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1084 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1162 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1085 dx = old_width - szHint.width; 1163 dx = old_width - szHint.width;
1086 dy = old_height - szHint.height; 1164 dy = old_height - szHint.height;
1087 1165
1088 /* Check position of the center of the window */ 1166 /* Check position of the center of the window */
1089 if (x < x1) /* left half */ 1167 if (x < x1) /* left half */
… …
1093 if (y < y1) /* top half */ 1171 if (y < y1) /* top half */
1094 dy = 0; 1172 dy = 0;
1095 else if (y == y1) /* exact center */ 1173 else if (y == y1) /* exact center */
1096 dy /= 2; 1174 dy /= 2;
1097 1175
1098 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1176 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
1099 szHint.width, szHint.height); 1177 szHint.width, szHint.height);
1100#else 1178#else
1101 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1179 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
1102#endif 1180#endif
1103 } 1181 }
1104 1182
1105 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1183 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1106 1184
1107 if (fix_screen || width != old_width || height != old_height) 1185 if (fix_screen || width != old_width || height != old_height)
1108 { 1186 {
1109 if (scrollbar_visible ()) 1187 if (scrollbar_visible ())
1110 { 1188 {
1111 XMoveResizeWindow (display->display, scrollBar.win, 1189 XMoveResizeWindow (disp, scrollBar.win,
1112 window_sb_x, 0, 1190 window_sb_x, 0,
1113 scrollbar_TotalWidth (), szHint.height); 1191 scrollbar_TotalWidth (), szHint.height);
1114 resize_scrollbar (); 1192 resize_scrollbar ();
1115 } 1193 }
1116 1194
1117 if (menubar_visible ()) 1195 if (menubar_visible ())
1118 XMoveResizeWindow (display->display, menuBar.win, 1196 XMoveResizeWindow (disp, menuBar.win,
1119 window_vt_x, 0, 1197 window_vt_x, 0,
1120 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1198 TermWin_TotalWidth (), menuBar_TotalHeight ());
1121 1199
1122 XMoveResizeWindow (display->display, TermWin.vt, 1200 XMoveResizeWindow (disp, TermWin.vt,
1123 window_vt_x, window_vt_y, 1201 window_vt_x, window_vt_y,
1124 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1202 TermWin_TotalWidth (), TermWin_TotalHeight ());
1203
1125 scr_clear (); 1204 scr_clear ();
1126#ifdef XPM_BACKGROUND 1205#ifdef XPM_BACKGROUND
1127 resize_pixmap (); 1206 resize_pixmap ();
1128#endif 1207#endif
1129 } 1208 }
… …
1152 } 1231 }
1153 1232
1154 old_width = szHint.width; 1233 old_width = szHint.width;
1155 old_height = szHint.height; 1234 old_height = szHint.height;
1156 1235
1236#ifdef XPM_BACKGROUND
1237 if (TermWin.pixmap)
1238 scr_touch (false);
1239#endif
1240
1157#ifdef USE_XIM 1241#ifdef USE_XIM
1158 IMSetStatusPosition (); 1242 IMSetStatusPosition ();
1159#endif 1243#endif
1160} 1244}
1161 1245
… …
1252} 1336}
1253 1337
1254void 1338void
1255rxvt_term::IMSendSpot () 1339rxvt_term::IMSendSpot ()
1256{ 1340{
1257 XPoint spot; 1341 XPoint nspot;
1258 XVaNestedList preedit_attr; 1342 XVaNestedList preedit_attr;
1259 1343
1260 if (!Input_Context 1344 if (!Input_Context
1261 || !TermWin.focus 1345 || !TermWin.focus
1262 || !(input_style & XIMPreeditPosition) 1346 || !(input_style & XIMPreeditPosition))
1263#if 0
1264 || !(event_type == KeyPress
1265 || event_type == Expose
1266 || event_type == NoExpose
1267 || event_type == SelectionNotify
1268 || event_type == ButtonRelease || event_type == FocusIn)
1269#endif
1270 || !IMisRunning ())
1271 return; 1347 return;
1272 1348
1273 im_set_position (spot); 1349 im_set_position (nspot);
1350
1351 if (nspot.x == spot.x && nspot.y == spot.y)
1352 return;
1353
1354 spot = nspot;
1274 1355
1275 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1356 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1276 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1357 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1277 XFree (preedit_attr); 1358 XFree (preedit_attr);
1278} 1359}
1279 1360
1280void 1361void
1281rxvt_term::im_destroy () 1362rxvt_term::im_destroy ()
1282{ 1363{
1283 if (Input_Context)
1284 {
1285 XDestroyIC (Input_Context);
1286 Input_Context = 0;
1287 }
1288
1289 if (input_method) 1364 if (input_method)
1290 { 1365 {
1366 if (Input_Context && input_method->xim)
1367 XDestroyIC (Input_Context);
1368
1291 display->put_xim (input_method); 1369 display->put_xim (input_method);
1292 input_method = 0; 1370 input_method = 0;
1293 } 1371 }
1372
1373 Input_Context = 0;
1294} 1374}
1295 1375
1296/* 1376/*
1297 * Try to open a XIM with the current modifiers, then see if we can 1377 * Try to open a XIM with the current modifiers, then see if we can
1298 * open a suitable preedit type 1378 * open a suitable preedit type
… …
1316 input_method = display->get_xim (locale, modifiers); 1396 input_method = display->get_xim (locale, modifiers);
1317 if (input_method == NULL) 1397 if (input_method == NULL)
1318 return false; 1398 return false;
1319 1399
1320 xim = input_method->xim; 1400 xim = input_method->xim;
1401 spot.x = spot.y = -1;
1321 1402
1322 xim_styles = NULL; 1403 xim_styles = NULL;
1323 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1404 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1324 || !xim_styles || !xim_styles->count_styles) 1405 || !xim_styles || !xim_styles->count_styles)
1325 { 1406 {
1326 im_destroy (); 1407 im_destroy ();
1327 return false; 1408 return false;
1328 } 1409 }
1329 1410
1330 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1411 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1412
1413 for (int pi = 0; pi < 2; pi++)
1414 {
1415 p = pet[pi];
1416
1417 if (!p)
1418 continue;
1419
1331 s = rxvt_splitcommastring (p); 1420 s = rxvt_splitcommastring (p);
1332 1421
1333 for (i = found = 0; !found && s[i]; i++) 1422 for (i = found = 0; !found && s[i]; i++)
1334 { 1423 {
1335 if (!strcmp (s[i], "OverTheSpot")) 1424 if (!strcmp (s[i], "OverTheSpot"))
1336 input_style = (XIMPreeditPosition | XIMStatusNothing); 1425 input_style = (XIMPreeditPosition | XIMStatusNothing);
1337 else if (!strcmp (s[i], "OffTheSpot")) 1426 else if (!strcmp (s[i], "OffTheSpot"))
1338 input_style = (XIMPreeditArea | XIMStatusArea); 1427 input_style = (XIMPreeditArea | XIMStatusArea);
1339 else if (!strcmp (s[i], "Root")) 1428 else if (!strcmp (s[i], "Root"))
1340 input_style = (XIMPreeditNothing | XIMStatusNothing); 1429 input_style = (XIMPreeditNothing | XIMStatusNothing);
1430 else if (!strcmp (s[i], "None"))
1431 input_style = (XIMPreeditNone | XIMStatusNone);
1341 1432
1342 for (j = 0; j < xim_styles->count_styles; j++) 1433 for (j = 0; j < xim_styles->count_styles; j++)
1343 if (input_style == xim_styles->supported_styles[j]) 1434 if (input_style == xim_styles->supported_styles[j])
1344 { 1435 {
1436 rxvt_freecommastring (s);
1437
1345 found = 1; 1438 found = 1;
1346 break; 1439 goto foundpet;
1440 }
1441
1347 } 1442 }
1348 }
1349 1443
1350 for (i = 0; s[i]; i++) 1444 rxvt_freecommastring (s);
1351 free (s[i]); 1445 }
1352 1446
1353 free (s); 1447foundpet:
1448
1354 XFree (xim_styles); 1449 XFree (xim_styles);
1355 1450
1356 if (!found) 1451 if (!found)
1357 { 1452 {
1358 im_destroy (); 1453 im_destroy ();
… …
1379 "*", 1474 "*",
1380 TermWin.fheight, 1475 TermWin.fheight,
1381 TermWin.fheight + 1, TermWin.fheight - 1, 1476 TermWin.fheight + 1, TermWin.fheight - 1,
1382 TermWin.fheight - 2, TermWin.fheight + 2); 1477 TermWin.fheight - 2, TermWin.fheight + 2);
1383 1478
1384 fs = XCreateFontSet (display->display, pat, 1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1385 &missing_charset_list, &missing_charset_count, &def_string); 1480 &missing_charset_list, &missing_charset_count, &def_string);
1386 1481
1387 if (missing_charset_list) 1482 if (missing_charset_list)
1388 XFreeStringList (missing_charset_list); 1483 XFreeStringList (missing_charset_list);
1389 1484
… …
1466 int i, found, had_im; 1561 int i, found, had_im;
1467 const char *p; 1562 const char *p;
1468 char **s; 1563 char **s;
1469 char buf[IMBUFSIZ]; 1564 char buf[IMBUFSIZ];
1470 1565
1566 SET_R (this);
1567
1471 im_destroy (); 1568 im_destroy ();
1472 1569
1473 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1474 if (Input_Context) 1571 if (Input_Context)
1475 return; 1572 return;
… …
1483 if (p && *p) 1580 if (p && *p)
1484 { 1581 {
1485 bool found = false; 1582 bool found = false;
1486 1583
1487 s = rxvt_splitcommastring (p); 1584 s = rxvt_splitcommastring (p);
1585
1488 for (i = 0; s[i]; i++) 1586 for (i = 0; s[i]; i++)
1489 { 1587 {
1490 if (*s[i]) 1588 if (*s[i])
1491 { 1589 {
1492 strcpy (buf, "@im="); 1590 strcpy (buf, "@im=");
… …
1496 found = true; 1594 found = true;
1497 break; 1595 break;
1498 } 1596 }
1499 } 1597 }
1500 } 1598 }
1501 for (i = 0; s[i]; i++) 1599
1502 free (s[i]); 1600 rxvt_freecommastring (s);
1503 free (s);
1504 1601
1505 if (found) 1602 if (found)
1506 goto done; 1603 goto done;
1507 } 1604 }
1508 1605

Diff Legend

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