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.139 by root, Wed Feb 16 21:37:10 2005 UTC

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

Diff Legend

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