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.138 by root, Wed Feb 16 20:32:05 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 */ 590
591 return p;
530} 592}
531 593
532/* INTPROTO */ 594/* INTPROTO */
533void * 595void *
534rxvt_calloc (size_t number, size_t size) 596rxvt_calloc (size_t number, size_t size)
535{ 597{
536 void *p;
537
538 p = calloc (number, size); 598 void *p = calloc (number, size);
599
539 if (p) 600 if (!p)
540 return p;
541
542 rxvt_fatal ("memory allocation failure. aborting.\n"); 601 rxvt_fatal ("memory allocation failure. aborting.\n");
543 /* NOTREACHED */ 602
603 return p;
544} 604}
545 605
546/* INTPROTO */ 606/* INTPROTO */
547void * 607void *
548rxvt_realloc (void *ptr, size_t size) 608rxvt_realloc (void *ptr, size_t size)
549{ 609{
550 void *p;
551
552 if (ptr)
553 p = realloc (ptr, size); 610 void *p = realloc (ptr, size);
554 else
555 p = malloc (size);
556 611
557 if (p) 612 if (!p)
558 return p;
559
560 rxvt_fatal ("memory allocation failure. aborting.\n"); 613 rxvt_fatal ("memory allocation failure. aborting.\n");
561 /* NOTREACHED */ 614
615 return p;
562} 616}
563 617
564/* ------------------------------------------------------------------------- * 618/* ------------------------------------------------------------------------- *
565 * PRIVILEGED OPERATIONS * 619 * PRIVILEGED OPERATIONS *
566 * ------------------------------------------------------------------------- */ 620 * ------------------------------------------------------------------------- */
… …
641 * if width/height are non-zero then override calculated width/height 695 * if width/height are non-zero then override calculated width/height
642 */ 696 */
643void 697void
644rxvt_term::window_calc (unsigned int width, unsigned int height) 698rxvt_term::window_calc (unsigned int width, unsigned int height)
645{ 699{
646 short recalc_x, recalc_y; 700 short recalc_x, recalc_y;
647 int x, y, sb_w, mb_h, flags; 701 int x, y, sb_w, mb_h, flags;
648 unsigned int w, h; 702 unsigned int w, h;
649 unsigned int max_width, max_height; 703 unsigned int max_width, max_height;
704 dDisp;
650 705
651 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 706 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
652 TermWin.ncol, TermWin.nrow, szHint.width, 707 TermWin.ncol, TermWin.nrow, szHint.width,
653 szHint.height)); 708 szHint.height));
654 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 709 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
… …
660 if (!parsed_geometry) 715 if (!parsed_geometry)
661 { 716 {
662 parsed_geometry = 1; 717 parsed_geometry = 1;
663 if (rs[Rs_geometry]) 718 if (rs[Rs_geometry])
664 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720
665 if (flags & WidthValue) 721 if (flags & WidthValue)
666 { 722 {
667 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 723 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
668 szHint.flags |= USSize; 724 szHint.flags |= USSize;
669 } 725 }
726
670 if (flags & HeightValue) 727 if (flags & HeightValue)
671 { 728 {
672 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 729 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
673 szHint.flags |= USSize; 730 szHint.flags |= USSize;
674 } 731 }
732
675 if (flags & XValue) 733 if (flags & XValue)
676 { 734 {
677 szHint.x = x; 735 szHint.x = x;
678 szHint.flags |= USPosition; 736 szHint.flags |= USPosition;
679 if (flags & XNegative) 737 if (flags & XNegative)
680 { 738 {
681 recalc_x = 1; 739 recalc_x = 1;
682 szHint.win_gravity = NorthEastGravity; 740 szHint.win_gravity = NorthEastGravity;
683 } 741 }
684 } 742 }
743
685 if (flags & YValue) 744 if (flags & YValue)
686 { 745 {
687 szHint.y = y; 746 szHint.y = y;
688 szHint.flags |= USPosition; 747 szHint.flags |= USPosition;
689 if (flags & YNegative) 748 if (flags & YNegative)
… …
752 811
753 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 812 if (scrollbar_visible () && (options & Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 813 window_sb_x = szHint.width - sb_w;
755 814
756 if (recalc_x) 815 if (recalc_x)
757 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 816 szHint.x += (DisplayWidth (disp, display->screen)
758 - szHint.width - 2 * TermWin.ext_bwidth); 817 - szHint.width - 2 * TermWin.ext_bwidth);
759 if (recalc_y) 818 if (recalc_y)
760 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 819 szHint.y += (DisplayHeight (disp, display->screen)
761 - szHint.height - 2 * TermWin.ext_bwidth); 820 - szHint.height - 2 * TermWin.ext_bwidth);
762 821
763 TermWin.ncol = TermWin.width / TermWin.fwidth; 822 TermWin.ncol = TermWin.width / TermWin.fwidth;
764 TermWin.nrow = TermWin.height / TermWin.fheight; 823 TermWin.nrow = TermWin.height / TermWin.fheight;
765 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 824 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
793 kill (cmd_pid, SIGWINCH); 852 kill (cmd_pid, SIGWINCH);
794#endif 853#endif
795} 854}
796 855
797/*----------------------------------------------------------------------*/ 856/*----------------------------------------------------------------------*/
798/* rxvt_change_font () - Switch to a new font */ 857/* set_fonts () - load and set the various fonts
799/* 858/*
800 * init = 1 - initialize 859 * init = 1 - initialize
801 * 860 *
802 * fontname == FONT_UP - switch to bigger font 861 * fontname == FONT_UP - switch to bigger font
803 * fontname == FONT_DN - switch to smaller font 862 * fontname == FONT_DN - switch to smaller font
804 */ 863 */
805bool 864bool
806rxvt_term::change_font (const char *fontname) 865rxvt_term::set_fonts ()
807{ 866{
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); 867 rxvt_fontset *fs = new rxvt_fontset (this);
868 rxvt_fontprop prop;
819 869
820 if (fs && fs->populate (fontname ? fontname : "fixed")) 870 if (!fs
871 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
872 || !fs->realize_font (1))
873 {
874 delete fs;
875 return false;
876 }
877
878#if ENABLE_STYLES
879 for (int i = RS_styleCount; --i; )
880 if (TermWin.fontset[i] != TermWin.fontset[0])
881 delete TermWin.fontset[i];
882#endif
883
884 delete TermWin.fontset[0];
885 TermWin.fontset[0] = fs;
886
887 prop = (*fs)[1]->properties ();
888 prop.height += TermWin.lineSpace;
889 fs->set_prop (prop);
890
891 TermWin.fwidth = prop.width;
892 TermWin.fheight = prop.height;
893 TermWin.fweight = prop.weight;
894 TermWin.fslant = prop.slant;
895 TermWin.fbase = (*fs)[1]->ascent;
896
897 for (int style = 1; style < 4; style++)
898 {
899#if ENABLE_STYLES
900 const char *res = rs[Rs_font + style];
901
902 if (res && !*res)
903 TermWin.fontset[style] = TermWin.fontset[0];
904 else
821 { 905 {
822 delete TermWin.fontset; 906 TermWin.fontset[style] = fs = new rxvt_fontset (this);
823 TermWin.fontset = fs; 907 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 908
828 if (TermWin.parent[0]) 909 if (res)
910 prop2.weight = prop2.slant = rxvt_fontprop::unset;
911 else
829 { 912 {
830 resize_all_windows (0, 0, 0); 913 res = TermWin.fontset[0]->fontdesc;
831 scr_remap_chars (); 914
832 scr_touch (true); 915 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
916 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
833 } 917 }
834 918
835 for (unicode_t ch = 0x20; ch <= 0x7f; ch++) 919 fs->populate (res);
836 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch); 920 fs->set_prop (prop2);
837
838 return true;
839 } 921 }
922#else
923 TermWin.fontset[style] = TermWin.fontset[0];
924#endif
925 }
926
927 if (TermWin.parent[0])
840 } 928 {
929 resize_all_windows (0, 0, 0);
930 scr_remap_chars ();
931 scr_touch (true);
932 }
841 933
842 return false; 934 return true;
843} 935}
844 936
845bool 937void rxvt_term::set_string_property (Atom prop, const char *str, int len)
846rxvt_term::font_up_down (int n, int direction)
847{ 938{
848 return false; 939 // TODO: SMART_WINDOW_TITLE
940 XChangeProperty (display->display, TermWin.parent[0],
941 prop, XA_STRING, 8, PropModeReplace,
942 (const unsigned char *)str, len >= 0 ? len : strlen (str));
943}
944
945void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
946{
947 // TODO: SMART_WINDOW_TITLE
948 wchar_t *ws = rxvt_mbstowcs (str, len);
949 char *s = rxvt_wcstoutf8 (ws);
950
951 XChangeProperty (display->display, TermWin.parent[0],
952 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
953 (const unsigned char *)s, strlen (s));
954
955 free (s);
956 free (ws);
849} 957}
850 958
851/*----------------------------------------------------------------------*/ 959/*----------------------------------------------------------------------*/
852/*----------------------------------------------------------------------*/ 960/*----------------------------------------------------------------------*/
853/* xterm sequences - title, iconName, color (exptl) */ 961/* xterm sequences - title, iconName, color (exptl) */
854void 962void
855rxvt_term::set_title (const char *str) 963rxvt_term::set_title (const char *str)
856{ 964{
857#ifdef SMART_WINDOW_TITLE 965 set_string_property (XA_WM_NAME, str);
858 char *name; 966#if ENABLE_FRILLS
859 967 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 968#endif
871} 969}
872 970
873void 971void
874rxvt_term::set_icon_name (const char *str) 972rxvt_term::set_icon_name (const char *str)
875{ 973{
876#ifdef SMART_WINDOW_TITLE 974 set_string_property (XA_WM_ICON_NAME, str);
877 char *name; 975#if ENABLE_FRILLS
878 976 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 977#endif
890} 978}
891 979
892#ifdef XTERM_COLOR_CHANGE 980#ifdef XTERM_COLOR_CHANGE
893void 981void
… …
901 989
902 /* handle color aliases */ 990 /* handle color aliases */
903 if (isdigit (*color)) 991 if (isdigit (*color))
904 { 992 {
905 i = atoi (color); 993 i = atoi (color);
994
906 if (i >= 8 && i <= 15) 995 if (i >= 8 && i <= 15)
907 { /* bright colors */ 996 { /* bright colors */
908 i -= 8; 997 i -= 8;
909# ifndef NO_BRIGHTCOLOR 998# ifndef NO_BRIGHTCOLOR
910 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 999 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
911 SET_PIXCOLOR (idx); 1000 SET_PIXCOLOR (idx);
912 goto Done; 1001 goto Done;
913# endif 1002# endif
914
915 } 1003 }
1004
916 if (i >= 0 && i <= 7) 1005 if (i >= 0 && i <= 7)
917 { /* normal colors */ 1006 { /* normal colors */
918 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1007 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
919 SET_PIXCOLOR (idx); 1008 SET_PIXCOLOR (idx);
920 goto Done; 1009 goto Done;
921 } 1010 }
922 } 1011 }
923 1012
924 if (!rXParseAllocColor (& xcol, color)) 1013 if (!rXParseAllocColor (&xcol, color))
925 return; 1014 return;
926 1015
927 /* XStoreColor (display->display, display->cmap, XColor*); */ 1016 /* XStoreColor (display->display, display->cmap, XColor*); */
928 1017
929 /* 1018 /*
… …
947 1036
948 /* XSetWindowAttributes attr; */ 1037 /* XSetWindowAttributes attr; */
949 /* Cursor cursor; */ 1038 /* Cursor cursor; */
950Done: 1039Done:
951#ifdef OFF_FOCUS_FADING 1040#ifdef OFF_FOCUS_FADING
1041 if (rs[Rs_fade])
952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1042 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
953#endif 1043#endif
954 if (idx == Color_bg && ! (options & Opt_transparent))
955 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
956 1044
957 /* handle Color_BD, scrollbar background, etc. */ 1045 /*TODO: handle Color_BD, scrollbar background, etc. */
958 1046
959 set_colorfgbg ();
960 recolour_cursor (); 1047 recolour_cursor ();
961 scr_touch (true); 1048 scr_recolour ();
962} 1049}
963 1050
964#else 1051#else
965# define set_window_color (idx,color) ((void)0) 1052# define set_window_color (idx,color) ((void)0)
966#endif /* XTERM_COLOR_CHANGE */ 1053#endif /* XTERM_COLOR_CHANGE */
… …
968void 1055void
969rxvt_term::recolour_cursor () 1056rxvt_term::recolour_cursor ()
970{ 1057{
971 XColor xcol[2]; 1058 XColor xcol[2];
972 1059
973 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? pix_colors_focused[Color_pointer_fg] : pix_colors_focused[Color_fg]; 1060 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]; 1061 ? pix_colors_focused[Color_pointer_fg]
1062 : pix_colors_focused[Color_fg];
1063 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1064 ? pix_colors_focused[Color_pointer_bg]
1065 : pix_colors_focused[Color_bg];
1066
975 XQueryColors (display->display, display->cmap, xcol, 2); 1067 XQueryColors (display->display, display->cmap, xcol, 2);
976 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 1068 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
977} 1069}
978 1070
979/*----------------------------------------------------------------------*/ 1071/*----------------------------------------------------------------------*/
… …
981 * find if fg/bg matches any of the normal (low-intensity) colors 1073 * find if fg/bg matches any of the normal (low-intensity) colors
982 */ 1074 */
983void 1075void
984rxvt_term::set_colorfgbg () 1076rxvt_term::set_colorfgbg ()
985{ 1077{
986 unsigned int i; 1078 unsigned int i;
987 const char *xpmb = "\0"; 1079 const char *xpmb = "\0";
988 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1080 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
989 1081
990 env_colorfgbg =
991 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1082 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 1083 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 1084 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 1085 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 1086 if (pix_colors[Color_fg] == pix_colors[i])
996 { 1087 {
997 sprintf (fstr, "%d", (i - Color_Black)); 1088 sprintf (fstr, "%d", (i - Color_Black));
998 break; 1089 break;
999 } 1090 }
1091
1000 for (i = Color_Black; i <= Color_White; i++) 1092 for (i = Color_Black; i <= Color_White; i++)
1001 if (pix_colors[Color_bg] == pix_colors[i]) 1093 if (pix_colors[Color_bg] == pix_colors[i])
1002 { 1094 {
1003 sprintf (bstr, "%d", (i - Color_Black)); 1095 sprintf (bstr, "%d", (i - Color_Black));
1004#ifdef XPM_BACKGROUND 1096#ifdef XPM_BACKGROUND
… …
1006#endif 1098#endif
1007 break; 1099 break;
1008 } 1100 }
1009 1101
1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1102 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} 1103}
1023 1104
1024/*----------------------------------------------------------------------*/ 1105/*----------------------------------------------------------------------*/
1025/*
1026 * Colour determination for low colour displays, routine from
1027 * Hans de Goede <hans@highrise.nl>
1028 */
1029 1106
1030int 1107int
1031rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1108rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1032{ 1109{
1033 if (!screen_in_out->set (display, colour)) 1110 if (!screen_in_out->set (display, colour))
… …
1044 * -------------------------------------------------------------------- */ 1121 * -------------------------------------------------------------------- */
1045void 1122void
1046rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1123rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
1047{ 1124{
1048 int fix_screen; 1125 int fix_screen;
1049
1050#ifdef SMART_RESIZE 1126#ifdef SMART_RESIZE
1051 int old_width = szHint.width, old_height = szHint.height; 1127 int old_width = szHint.width, old_height = szHint.height;
1052#endif 1128#endif
1129 dDisp;
1053 1130
1054 window_calc (width, height); 1131 window_calc (width, height);
1055 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1132 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1056 1133
1057 if (!ignoreparent) 1134 if (!ignoreparent)
1058 { 1135 {
1059#ifdef SMART_RESIZE 1136#ifdef SMART_RESIZE
1060 /* 1137 /*
… …
1064 int x, y, x1, y1; 1141 int x, y, x1, y1;
1065 int dx, dy; 1142 int dx, dy;
1066 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1067 Window unused_cr; 1144 Window unused_cr;
1068 1145
1069 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1146 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1070 0, 0, &x, &y, &unused_cr); 1147 0, 0, &x, &y, &unused_cr);
1071 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1148 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
1072 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1073 /* 1150 /*
1074 * if display->root isn't the parent window, a WM will probably have offset 1151 * if display->root isn't the parent window, a WM will probably have offset
1075 * our position for handles and decorations. Counter it 1152 * our position for handles and decorations. Counter it
1076 */ 1153 */
… …
1078 { 1155 {
1079 x -= x1; 1156 x -= x1;
1080 y -= y1; 1157 y -= y1;
1081 } 1158 }
1082 1159
1083 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1160 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1084 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1161 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1085 dx = old_width - szHint.width; 1162 dx = old_width - szHint.width;
1086 dy = old_height - szHint.height; 1163 dy = old_height - szHint.height;
1087 1164
1088 /* Check position of the center of the window */ 1165 /* Check position of the center of the window */
1089 if (x < x1) /* left half */ 1166 if (x < x1) /* left half */
… …
1093 if (y < y1) /* top half */ 1170 if (y < y1) /* top half */
1094 dy = 0; 1171 dy = 0;
1095 else if (y == y1) /* exact center */ 1172 else if (y == y1) /* exact center */
1096 dy /= 2; 1173 dy /= 2;
1097 1174
1098 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1175 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
1099 szHint.width, szHint.height); 1176 szHint.width, szHint.height);
1100#else 1177#else
1101 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1178 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
1102#endif 1179#endif
1103 } 1180 }
1104 1181
1105 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1182 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1106 1183
1107 if (fix_screen || width != old_width || height != old_height) 1184 if (fix_screen || width != old_width || height != old_height)
1108 { 1185 {
1109 if (scrollbar_visible ()) 1186 if (scrollbar_visible ())
1110 { 1187 {
1111 XMoveResizeWindow (display->display, scrollBar.win, 1188 XMoveResizeWindow (disp, scrollBar.win,
1112 window_sb_x, 0, 1189 window_sb_x, 0,
1113 scrollbar_TotalWidth (), szHint.height); 1190 scrollbar_TotalWidth (), szHint.height);
1114 resize_scrollbar (); 1191 resize_scrollbar ();
1115 } 1192 }
1116 1193
1117 if (menubar_visible ()) 1194 if (menubar_visible ())
1118 XMoveResizeWindow (display->display, menuBar.win, 1195 XMoveResizeWindow (disp, menuBar.win,
1119 window_vt_x, 0, 1196 window_vt_x, 0,
1120 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1121 1198
1122 XMoveResizeWindow (display->display, TermWin.vt, 1199 XMoveResizeWindow (disp, TermWin.vt,
1123 window_vt_x, window_vt_y, 1200 window_vt_x, window_vt_y,
1124 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1201 TermWin_TotalWidth (), TermWin_TotalHeight ());
1202
1125 scr_clear (); 1203 scr_clear ();
1126#ifdef XPM_BACKGROUND 1204#ifdef XPM_BACKGROUND
1127 resize_pixmap (); 1205 resize_pixmap ();
1128#endif 1206#endif
1129 } 1207 }
… …
1152 } 1230 }
1153 1231
1154 old_width = szHint.width; 1232 old_width = szHint.width;
1155 old_height = szHint.height; 1233 old_height = szHint.height;
1156 1234
1235#ifdef XPM_BACKGROUND
1236 if (TermWin.pixmap)
1237 scr_touch (false);
1238#endif
1239
1157#ifdef USE_XIM 1240#ifdef USE_XIM
1158 IMSetStatusPosition (); 1241 IMSetStatusPosition ();
1159#endif 1242#endif
1160} 1243}
1161 1244
… …
1252} 1335}
1253 1336
1254void 1337void
1255rxvt_term::IMSendSpot () 1338rxvt_term::IMSendSpot ()
1256{ 1339{
1257 XPoint spot; 1340 XPoint nspot;
1258 XVaNestedList preedit_attr; 1341 XVaNestedList preedit_attr;
1259 1342
1260 if (!Input_Context 1343 if (!Input_Context
1261 || !TermWin.focus 1344 || !TermWin.focus
1262 || !(input_style & XIMPreeditPosition) 1345 || !(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; 1346 return;
1272 1347
1273 im_set_position (spot); 1348 im_set_position (nspot);
1349
1350 if (nspot.x == spot.x && nspot.y == spot.y)
1351 return;
1352
1353 spot = nspot;
1274 1354
1275 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1355 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1276 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1356 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1277 XFree (preedit_attr); 1357 XFree (preedit_attr);
1278} 1358}
1279 1359
1280void 1360void
1281rxvt_term::im_destroy () 1361rxvt_term::im_destroy ()
1282{ 1362{
1283 if (Input_Context)
1284 {
1285 XDestroyIC (Input_Context);
1286 Input_Context = 0;
1287 }
1288
1289 if (input_method) 1363 if (input_method)
1290 { 1364 {
1365 if (Input_Context && input_method->xim)
1366 XDestroyIC (Input_Context);
1367
1291 display->put_xim (input_method); 1368 display->put_xim (input_method);
1292 input_method = 0; 1369 input_method = 0;
1293 } 1370 }
1371
1372 Input_Context = 0;
1294} 1373}
1295 1374
1296/* 1375/*
1297 * Try to open a XIM with the current modifiers, then see if we can 1376 * Try to open a XIM with the current modifiers, then see if we can
1298 * open a suitable preedit type 1377 * open a suitable preedit type
… …
1316 input_method = display->get_xim (locale, modifiers); 1395 input_method = display->get_xim (locale, modifiers);
1317 if (input_method == NULL) 1396 if (input_method == NULL)
1318 return false; 1397 return false;
1319 1398
1320 xim = input_method->xim; 1399 xim = input_method->xim;
1400 spot.x = spot.y = -1;
1321 1401
1322 xim_styles = NULL; 1402 xim_styles = NULL;
1323 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1403 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1324 || !xim_styles || !xim_styles->count_styles) 1404 || !xim_styles || !xim_styles->count_styles)
1325 { 1405 {
1326 im_destroy (); 1406 im_destroy ();
1327 return false; 1407 return false;
1328 } 1408 }
1329 1409
1330 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1410 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1411
1412 for (int pi = 0; pi < 2; pi++)
1413 {
1414 p = pet[pi];
1415
1416 if (!p)
1417 continue;
1418
1331 s = rxvt_splitcommastring (p); 1419 s = rxvt_splitcommastring (p);
1332 1420
1333 for (i = found = 0; !found && s[i]; i++) 1421 for (i = found = 0; !found && s[i]; i++)
1334 { 1422 {
1335 if (!strcmp (s[i], "OverTheSpot")) 1423 if (!strcmp (s[i], "OverTheSpot"))
1336 input_style = (XIMPreeditPosition | XIMStatusNothing); 1424 input_style = (XIMPreeditPosition | XIMStatusNothing);
1337 else if (!strcmp (s[i], "OffTheSpot")) 1425 else if (!strcmp (s[i], "OffTheSpot"))
1338 input_style = (XIMPreeditArea | XIMStatusArea); 1426 input_style = (XIMPreeditArea | XIMStatusArea);
1339 else if (!strcmp (s[i], "Root")) 1427 else if (!strcmp (s[i], "Root"))
1340 input_style = (XIMPreeditNothing | XIMStatusNothing); 1428 input_style = (XIMPreeditNothing | XIMStatusNothing);
1429 else if (!strcmp (s[i], "None"))
1430 input_style = (XIMPreeditNone | XIMStatusNone);
1341 1431
1342 for (j = 0; j < xim_styles->count_styles; j++) 1432 for (j = 0; j < xim_styles->count_styles; j++)
1343 if (input_style == xim_styles->supported_styles[j]) 1433 if (input_style == xim_styles->supported_styles[j])
1344 { 1434 {
1435 rxvt_freecommastring (s);
1436
1345 found = 1; 1437 found = 1;
1346 break; 1438 goto foundpet;
1439 }
1440
1347 } 1441 }
1348 }
1349 1442
1350 for (i = 0; s[i]; i++) 1443 rxvt_freecommastring (s);
1351 free (s[i]); 1444 }
1352 1445
1353 free (s); 1446foundpet:
1447
1354 XFree (xim_styles); 1448 XFree (xim_styles);
1355 1449
1356 if (!found) 1450 if (!found)
1357 { 1451 {
1358 im_destroy (); 1452 im_destroy ();
… …
1379 "*", 1473 "*",
1380 TermWin.fheight, 1474 TermWin.fheight,
1381 TermWin.fheight + 1, TermWin.fheight - 1, 1475 TermWin.fheight + 1, TermWin.fheight - 1,
1382 TermWin.fheight - 2, TermWin.fheight + 2); 1476 TermWin.fheight - 2, TermWin.fheight + 2);
1383 1477
1384 fs = XCreateFontSet (display->display, pat, 1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1385 &missing_charset_list, &missing_charset_count, &def_string); 1479 &missing_charset_list, &missing_charset_count, &def_string);
1386 1480
1387 if (missing_charset_list) 1481 if (missing_charset_list)
1388 XFreeStringList (missing_charset_list); 1482 XFreeStringList (missing_charset_list);
1389 1483
… …
1466 int i, found, had_im; 1560 int i, found, had_im;
1467 const char *p; 1561 const char *p;
1468 char **s; 1562 char **s;
1469 char buf[IMBUFSIZ]; 1563 char buf[IMBUFSIZ];
1470 1564
1565 SET_R (this);
1566
1471 im_destroy (); 1567 im_destroy ();
1472 1568
1473 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1569 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1474 if (Input_Context) 1570 if (Input_Context)
1475 return; 1571 return;
… …
1483 if (p && *p) 1579 if (p && *p)
1484 { 1580 {
1485 bool found = false; 1581 bool found = false;
1486 1582
1487 s = rxvt_splitcommastring (p); 1583 s = rxvt_splitcommastring (p);
1584
1488 for (i = 0; s[i]; i++) 1585 for (i = 0; s[i]; i++)
1489 { 1586 {
1490 if (*s[i]) 1587 if (*s[i])
1491 { 1588 {
1492 strcpy (buf, "@im="); 1589 strcpy (buf, "@im=");
… …
1496 found = true; 1593 found = true;
1497 break; 1594 break;
1498 } 1595 }
1499 } 1596 }
1500 } 1597 }
1501 for (i = 0; s[i]; i++) 1598
1502 free (s[i]); 1599 rxvt_freecommastring (s);
1503 free (s);
1504 1600
1505 if (found) 1601 if (found)
1506 goto done; 1602 goto done;
1507 } 1603 }
1508 1604

Diff Legend

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