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.306 by ayin, Mon Feb 18 09:58:04 2008 UTC vs.
Revision 1.355 by sf-exg, Thu Apr 7 12:19:40 2011 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
… …
49# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <clocale>
51# endif 53# endif
52#endif 54#endif
53 55
56struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
55 58
56// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
58 61
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 97{
95 compose_char *cc; 98 compose_char *cc;
96 99
97 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 102 cc = (*this)[c1];
100 while (cc) 103 while (cc)
101 { 104 {
102 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
104 } 107 }
105 108
106 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
111 }
112 113
113 // allocate a new combination 114 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 116 {
116 static int seen; 117 static int seen;
117 118
118 if (!seen++) 119 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 121
121 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
122 } 123 }
123 124
124 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
186#endif 187#endif
187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 194
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 196
… …
225 delete fontset[i]; 225 delete fontset[i];
226#endif 226#endif
227 delete fontset[0]; 227 delete fontset[0];
228 228
229#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 230 bg_destroy ();
231#endif 231#endif
232 232
233 if (display) 233 if (display)
234 { 234 {
235 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
236 237
237#ifdef USE_XIM 238#ifdef USE_XIM
238 im_destroy (); 239 im_destroy ();
239#endif 240#endif
240#ifdef XTERM_SCROLLBAR 241 scrollBar.destroy ();
241 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
242 if (ShadowGC) XFreeGC (dpy, ShadowGC);
243#endif
244#ifdef PLAIN_SCROLLBAR
245 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
246#endif
247#ifdef NEXT_SCROLLBAR
248 if (blackGC) XFreeGC (dpy, blackGC);
249 if (whiteGC) XFreeGC (dpy, whiteGC);
250 if (grayGC) XFreeGC (dpy, grayGC);
251 if (darkGC) XFreeGC (dpy, darkGC);
252 if (stippleGC) XFreeGC (dpy, stippleGC);
253 if (dimple) XFreePixmap (dpy, dimple);
254 if (upArrow) XFreePixmap (dpy, upArrow);
255 if (downArrow) XFreePixmap (dpy, downArrow);
256 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
257 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
258#endif
259#ifdef RXVT_SCROLLBAR
260 if (topShadowGC) XFreeGC (dpy, topShadowGC);
261 if (botShadowGC) XFreeGC (dpy, botShadowGC);
262 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
263#endif
264 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
265 243
266 delete drawable; 244 delete drawable;
267 // destroy all windows 245 // destroy all windows
268 if (parent[0]) 246 if (parent)
269 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
270 248
271 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
272 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
273 { 251 {
274 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
288 /* clear all resources */ 266 /* clear all resources */
289 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
290 free (allocated [i]); 268 free (allocated [i]);
291 269
292 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text);
293 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
294 free (env_display); 273 free (env_display);
295 free (env_term); 274 free (env_term);
296 free (locale); 275 free (locale);
297 free (v_buffer); 276 free (v_buffer);
298 free (incr_buf); 277
278 delete selection_req;
299 279
300 delete envv; 280 delete envv;
301 delete argv; 281 delete argv;
302 282
303#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
… …
339#endif 319#endif
340 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
341#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
342 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
343#endif 323#endif
344 incr_ev.stop ();
345 termwin_ev.stop (display); 324 termwin_ev.stop (display);
346 vt_ev.stop (display); 325 vt_ev.stop (display);
347 } 326 }
348 327
349 flush_ev.stop (); 328 flush_ev.stop ();
… …
371rxvt_term::destroy_cb (ev::idle &w, int revents) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
372{ 351{
373 make_current (); 352 make_current ();
374 353
375 delete this; 354 delete this;
355}
356
357void
358rxvt_term::set_option (uint8_t opt, bool set)
359{
360 if (!opt)
361 return;
362
363 uint8_t mask = 1 << (opt & 7);
364 uint8_t &val = options [opt >> 3];
365
366 val = val & ~mask | (set ? mask : 0);
376} 367}
377 368
378/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
379/* 370/*
380 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
394print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
395{ 386{
396 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
397 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
398 char number[32]; 389 char number[32];
399 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 393 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
406 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
408 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("(which is %s)\n", buffer);
409 if (event->request_code >= 128) { 400 if (event->request_code >= 128) {
410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
411 mesg, BUFSIZ); 402 mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413 } 404 }
414 if ((event->error_code == BadWindow) || 405 if ((event->error_code == BadWindow) ||
415 (event->error_code == BadPixmap) || 406 (event->error_code == BadPixmap) ||
416 (event->error_code == BadCursor) || 407 (event->error_code == BadCursor) ||
417 (event->error_code == BadFont) || 408 (event->error_code == BadFont) ||
418 (event->error_code == BadDrawable) || 409 (event->error_code == BadDrawable) ||
419 (event->error_code == BadColor) || 410 (event->error_code == BadColor) ||
420 (event->error_code == BadGC) || 411 (event->error_code == BadGC) ||
421 (event->error_code == BadIDChoice) || 412 (event->error_code == BadIDChoice) ||
422 (event->error_code == BadValue) || 413 (event->error_code == BadValue) ||
423 (event->error_code == BadAtom)) { 414 (event->error_code == BadAtom)) {
424 if (event->error_code == BadValue) 415 if (event->error_code == BadValue)
425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
426 mesg, BUFSIZ); 417 mesg, BUFSIZ);
427 else if (event->error_code == BadAtom) 418 else if (event->error_code == BadAtom)
428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
429 mesg, BUFSIZ); 420 mesg, BUFSIZ);
430 else 421 else
431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
432 mesg, BUFSIZ); 423 mesg, BUFSIZ);
433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434 } 425 }
435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436 mesg, BUFSIZ); 427 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438} 429}
439#endif 430#endif
440 431
441int 432int
… …
488 rxvt_emergency_cleanup (); 479 rxvt_emergency_cleanup ();
489 w.stop (); 480 w.stop ();
490 kill (getpid (), w.signum); 481 kill (getpid (), w.signum);
491} 482}
492 483
484static void
485rxvt_get_ttymode (struct termios *tio)
486{
487 if (tcgetattr (STDIN_FILENO, tio) < 0)
488 memset (tio, 0, sizeof (struct termios));
489
490 for (int i = 0; i < NCCS; i++)
491 tio->c_cc[i] = VDISABLE;
492
493 tio->c_cc[VINTR] = CINTR;
494 tio->c_cc[VQUIT] = CQUIT;
495 tio->c_cc[VERASE] = CERASE;
496#ifdef VERASE2
497 tio->c_cc[VERASE2] = CERASE2;
498#endif
499 tio->c_cc[VKILL] = CKILL;
500 tio->c_cc[VEOF] = CEOF;
501 tio->c_cc[VSTART] = CSTART;
502 tio->c_cc[VSTOP] = CSTOP;
503 tio->c_cc[VSUSP] = CSUSP;
504# ifdef VDSUSP
505 tio->c_cc[VDSUSP] = CDSUSP;
506# endif
507# ifdef VREPRINT
508 tio->c_cc[VREPRINT] = CRPRNT;
509# endif
510# ifdef VDISCRD
511 tio->c_cc[VDISCRD] = CFLUSH;
512# endif
513# ifdef VWERSE
514 tio->c_cc[VWERSE] = CWERASE;
515# endif
516# ifdef VLNEXT
517 tio->c_cc[VLNEXT] = CLNEXT;
518# endif
519# ifdef VSTATUS
520 tio->c_cc[VSTATUS] = CSTATUS;
521# endif
522
523# if VMIN != VEOF
524 tio->c_cc[VMIN] = 1;
525# endif
526# if VTIME != VEOL
527 tio->c_cc[VTIME] = 0;
528# endif
529
530 /* input modes */
531 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
532# ifdef IMAXBEL
533 | IMAXBEL
534# endif
535 | IXON);
536
537 /* output modes */
538 tio->c_oflag = (OPOST | ONLCR);
539
540 /* control modes */
541 tio->c_cflag = (CS8 | CREAD);
542
543 /* local modes */
544 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
545# if defined (ECHOCTL) && defined (ECHOKE)
546 | ECHOCTL | ECHOKE
547# endif
548 | ECHOE | ECHOK);
549}
550
493char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
494 552
495void 553void
496rxvt_init () 554rxvt_init ()
497{ 555{
498 ptytty::init (); 556 assert (("fontMask must not overlap other RS masks",
557 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
499 558
559 rxvt_get_ttymode (&rxvt_term::def_tio);
560
561 // get rid of stdin/stdout as we don't need them, to free resources
562 dup2 (STDERR_FILENO, STDIN_FILENO);
563 dup2 (STDERR_FILENO, STDOUT_FILENO);
564
500 if (!ev_default_loop (0)) 565 if (!ev_default_loop ())
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502 567
503 rxvt_environ = environ; 568 rxvt_environ = environ;
504 569
505 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
506 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
507 572
508 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
509 sig_handlers.sw_int.start (SIGINT); ev_unref (); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
510
511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
512 /* signal (SIGURG, SIG_DFL); */
513 575
514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
515 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
516 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
517 579
… …
545 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
546 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547 609
548 if (flags & WidthValue) 610 if (flags & WidthValue)
549 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
550 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
551 szHint.flags |= USSize; 616 szHint.flags |= USSize;
552 } 617 }
553 618
554 if (flags & HeightValue) 619 if (flags & HeightValue)
555 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
556 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
557 szHint.flags |= USSize; 625 szHint.flags |= USSize;
558 } 626 }
559 627
560 if (flags & XValue) 628 if (flags & XValue)
561 { 629 {
… …
636 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
637 705
638 if (recalc_y) 706 if (recalc_y)
639 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
640 708
641 ncol = width / fwidth; 709 ncol = width / fwidth;
642 nrow = height / fheight; 710 nrow = height / fheight;
643} 711}
644 712
645/*----------------------------------------------------------------------*/ 713/*----------------------------------------------------------------------*/
646/* 714/*
… …
657 725
658 ws.ws_col = ncol; 726 ws.ws_col = ncol;
659 ws.ws_row = nrow; 727 ws.ws_row = nrow;
660 ws.ws_xpixel = width; 728 ws.ws_xpixel = width;
661 ws.ws_ypixel = height; 729 ws.ws_ypixel = height;
662 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 730 ioctl (pty->pty, TIOCSWINSZ, &ws);
663 731
664#if 0 732#if 0
665 // TIOCSWINSZ is supposed to do this automatically and correctly 733 // TIOCSWINSZ is supposed to do this automatically and correctly
666 if (cmd_pid) /* force through to the command */ 734 if (cmd_pid) /* force through to the command */
667 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
… …
697#endif 765#endif
698 766
699 delete fontset[0]; 767 delete fontset[0];
700 fontset[0] = fs; 768 fontset[0] = fs;
701 769
702 prop = (*fs)[1]->properties (); 770 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
703 prop.height += lineSpace; 771 prop.height += lineSpace;
772 prop.width += letterSpace;
704 773
705 fs->set_prop (prop, false); 774 fs->set_prop (prop, false);
706 775
707 fwidth = prop.width; 776 fwidth = prop.width;
708 fheight = prop.height; 777 fheight = prop.height;
… …
739#else 808#else
740 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
741#endif 810#endif
742 } 811 }
743 812
744 if (parent[0]) 813 if (parent)
745 { 814 {
746 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
747 scr_remap_chars (); 816 scr_remap_chars ();
748 scr_touch (true); 817 scr_touch (true);
749 } 818 }
… …
752} 821}
753 822
754void 823void
755rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
756{ 825{
757 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
758 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
759 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
760} 829}
761 830
762void 831void
832rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
833{
834 XTextProperty ct;
835
836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
837 {
838 XSetTextProperty (dpy, parent, &ct, prop);
839 XFree (ct.value);
840 }
841}
842
843void
763rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
764{ 845{
765 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
766 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
767 848
768 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
769 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
770 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
771 852
772 free (s); 853 free (s);
773 free (ws); 854 free (ws);
… …
777/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
778/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
779void 860void
780rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
781{ 862{
782 set_string_property (XA_WM_NAME, str); 863 set_mbstring_property (XA_WM_NAME, str);
783#if ENABLE_EWMH 864#if ENABLE_EWMH
784 set_utf8_property (xa[XA_NET_WM_NAME], str); 865 set_utf8_property (xa[XA_NET_WM_NAME], str);
785#endif 866#endif
786} 867}
787 868
788void 869void
789rxvt_term::set_icon_name (const char *str) 870rxvt_term::set_icon_name (const char *str)
790{ 871{
791 set_string_property (XA_WM_ICON_NAME, str); 872 set_mbstring_property (XA_WM_ICON_NAME, str);
792#if ENABLE_EWMH 873#if ENABLE_EWMH
793 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
794#endif 875#endif
795} 876}
796 877
… …
868void 949void
869rxvt_term::set_colorfgbg () 950rxvt_term::set_colorfgbg ()
870{ 951{
871 unsigned int i; 952 unsigned int i;
872 const char *xpmb = ""; 953 const char *xpmb = "";
873 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
874 956
875 strcpy (fstr, "default");
876 strcpy (bstr, "default");
877 for (i = Color_Black; i <= Color_White; i++) 957 for (i = Color_Black; i <= Color_White; i++)
878 if (pix_colors[Color_fg] == pix_colors[i]) 958 if (pix_colors[Color_fg] == pix_colors[i])
879 { 959 {
880 sprintf (fstr, "%d", (i - Color_Black)); 960 sprintf (fstr, "%d", i - Color_Black);
881 break; 961 break;
882 } 962 }
883 963
884 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
885 if (pix_colors[Color_bg] == pix_colors[i]) 965 if (pix_colors[Color_bg] == pix_colors[i])
886 { 966 {
887 sprintf (bstr, "%d", (i - Color_Black)); 967 sprintf (bstr, "%d", i - Color_Black);
888#ifdef BG_IMAGE_FROM_FILE 968#ifdef BG_IMAGE_FROM_FILE
889 xpmb = "default;"; 969 xpmb = "default;";
890#endif 970#endif
891 break; 971 break;
892 } 972 }
… …
922 int old_width = szHint.width; 1002 int old_width = szHint.width;
923 int old_height = szHint.height; 1003 int old_height = szHint.height;
924 1004
925 window_calc (newwidth, newheight); 1005 window_calc (newwidth, newheight);
926 1006
927 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1007 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1008
1009 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1010 if (set_hint)
1011 {
1012 szHint.flags &= ~(PBaseSize | PResizeInc);
928 XSetWMNormalHints (dpy, parent[0], &szHint); 1013 XSetWMNormalHints (dpy, parent, &szHint);
1014 szHint.flags |= PBaseSize | PResizeInc;
1015 }
929 1016
930 if (!ignoreparent) 1017 if (!ignoreparent)
931 { 1018 {
932#ifdef SMART_RESIZE 1019#ifdef SMART_RESIZE
933 /* 1020 /*
… …
937 int x, y, x1, y1; 1024 int x, y, x1, y1;
938 int dx, dy; 1025 int dx, dy;
939 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1026 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
940 Window unused_cr; 1027 Window unused_cr;
941 1028
942 XTranslateCoordinates (dpy, parent[0], display->root, 1029 XTranslateCoordinates (dpy, parent, display->root,
943 0, 0, &x, &y, &unused_cr); 1030 0, 0, &x, &y, &unused_cr);
944 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1031 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
945 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1032 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
946 /* 1033 /*
947 * if display->root isn't the parent window, a WM will probably have offset 1034 * if display->root isn't the parent window, a WM will probably have offset
948 * our position for handles and decorations. Counter it 1035 * our position for handles and decorations. Counter it
949 */ 1036 */
… …
966 if (y < y1) /* top half */ 1053 if (y < y1) /* top half */
967 dy = 0; 1054 dy = 0;
968 else if (y == y1) /* exact center */ 1055 else if (y == y1) /* exact center */
969 dy /= 2; 1056 dy /= 2;
970 1057
971 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1058 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
972 szHint.width, szHint.height); 1059 szHint.width, szHint.height);
973#else 1060#else
974 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1061 XResizeWindow (dpy, parent, szHint.width, szHint.height);
975#endif 1062#endif
976 } 1063 }
1064
1065 if (set_hint)
1066 XSetWMNormalHints (dpy, parent, &szHint);
977 1067
978 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
979 1069
980 if (fix_screen || newwidth != old_width || newheight != old_height) 1070 if (fix_screen || newwidth != old_width || newheight != old_height)
981 { 1071 {
982 if (scrollBar.state) 1072 if (scrollBar.state)
983 resize_scrollbar (); 1073 scrollBar.resize ();
984 1074
985 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
986 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
987 width, height); 1077 width, height);
988 1078
989#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
991 update_background (); 1081 update_background ();
992#endif 1082#endif
993
994 scr_clear ();
995 } 1083 }
996 1084
997 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
998 scr_reset (); 1086 scr_reset ();
999
1000 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1001 //scr_touch (false);
1002
1003#ifdef HAVE_BG_PIXMAP
1004// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1005// if (bgPixmap.pixmap)
1006// scr_touch (false);
1007#endif
1008 1087
1009#ifdef USE_XIM 1088#ifdef USE_XIM
1010 IMSetPosition (); 1089 IMSetPosition ();
1011#endif 1090#endif
1012} 1091}
… …
1078 1157
1079/* Checking whether input method is running. */ 1158/* Checking whether input method is running. */
1080bool 1159bool
1081rxvt_term::IMisRunning () 1160rxvt_term::IMisRunning ()
1082{ 1161{
1083 char *p;
1084 Atom atom; 1162 Atom atom;
1085 Window win; 1163 Window win;
1086 char server[IMBUFSIZ]; 1164 char server[IMBUFSIZ];
1087 1165
1088 /* get current locale modifier */ 1166 /* get current locale modifier */
1089 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1167 if (char *p = XSetLocaleModifiers (0))
1090 { 1168 {
1091 strcpy (server, "@server="); 1169 strcpy (server, "@server=");
1092 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1170 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1093 1171
1094 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1172 if (p = strchr (server + 1, '@')) /* first one only */
1095 *p = '\0'; 1173 *p = '\0';
1096 1174
1097 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1098 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1099 1177
1100 if (win != None) 1178 if (win != None)
1101 return True; 1179 return true;
1102 } 1180 }
1103 1181
1104 return False; 1182 return false;
1105} 1183}
1106 1184
1107void 1185void
1108rxvt_term::IMSendSpot () 1186rxvt_term::IMSendSpot ()
1109{ 1187{
… …
1166 1244
1167 term->make_current (); 1245 term->make_current ();
1168 1246
1169 if (text) 1247 if (text)
1170 { 1248 {
1171 void *str; 1249 wchar_t *str;
1172 1250
1173 if (!text->encoding_is_wchar && text->string.multi_byte) 1251 if (!text->encoding_is_wchar && text->string.multi_byte)
1174 { 1252 {
1175 // of course, X makes it ugly again 1253 // of course, X makes it ugly again
1176 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1177 SET_LOCALE (term->rs[Rs_imLocale]); 1255 SET_LOCALE (term->rs[Rs_imLocale]);
1178 1256
1179 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1257 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1180 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1258 mbstowcs (str, text->string.multi_byte, text->length + 1);
1181 1259
1182 if (term->rs[Rs_imLocale]) 1260 if (term->rs[Rs_imLocale])
1183 SET_LOCALE (term->locale); 1261 SET_LOCALE (term->locale);
1184 } 1262 }
1185 else 1263 else
1186 str = (void *)text->string.wide_char; 1264 str = text->string.wide_char;
1187 1265
1188 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1266 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1189 DT_INT, call_data->caret, 1267 DT_INT, call_data->caret,
1190 DT_INT, call_data->chg_first, 1268 DT_INT, call_data->chg_first,
1191 DT_INT, call_data->chg_length, 1269 DT_INT, call_data->chg_length,
… …
1262 p = pet[pi]; 1340 p = pet[pi];
1263 1341
1264 if (!p) 1342 if (!p)
1265 continue; 1343 continue;
1266 1344
1267 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1268 1346
1269 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1270 { 1348 {
1271 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1272 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1284 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1285 1363
1286 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1287 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1288 { 1366 {
1289 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1290 1368
1291 found = 1; 1369 found = 1;
1292 goto foundpet; 1370 goto foundpet;
1293 } 1371 }
1294 1372
1295 } 1373 }
1296 1374
1297 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1298 } 1376 }
1299 1377
1300foundpet: 1378foundpet:
1301 1379
1302 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1405#endif 1483#endif
1406 1484
1407 Input_Context = XCreateIC (xim, 1485 Input_Context = XCreateIC (xim,
1408 XNInputStyle, input_style, 1486 XNInputStyle, input_style,
1409 XNClientWindow, vt, 1487 XNClientWindow, vt,
1410 XNFocusWindow, parent[0], 1488 XNFocusWindow, parent,
1411 preedit_attr ? XNPreeditAttributes : NULL, 1489 preedit_attr ? XNPreeditAttributes : NULL,
1412 preedit_attr, 1490 preedit_attr,
1413 status_attr ? XNStatusAttributes : NULL, 1491 status_attr ? XNStatusAttributes : NULL,
1414 status_attr, NULL); 1492 status_attr, NULL);
1415 1493
… …
1458 p = rs[Rs_inputMethod]; 1536 p = rs[Rs_inputMethod];
1459 if (p && *p) 1537 if (p && *p)
1460 { 1538 {
1461 bool found = false; 1539 bool found = false;
1462 1540
1463 s = rxvt_splitcommastring (p); 1541 s = rxvt_strsplit (',', p);
1464 1542
1465 for (i = 0; s[i]; i++) 1543 for (i = 0; s[i]; i++)
1466 { 1544 {
1467 if (*s[i]) 1545 if (*s[i])
1468 { 1546 {
… …
1474 break; 1552 break;
1475 } 1553 }
1476 } 1554 }
1477 } 1555 }
1478 1556
1479 rxvt_freecommastring (s); 1557 rxvt_free_strsplit (s);
1480 1558
1481 if (found) 1559 if (found)
1482 goto done; 1560 goto done;
1483 } 1561 }
1484 1562
… …
1544 1622
1545void 1623void
1546rxvt_term::get_window_origin (int &x, int &y) 1624rxvt_term::get_window_origin (int &x, int &y)
1547{ 1625{
1548 Window cr; 1626 Window cr;
1549 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1627 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1550/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1551} 1628}
1552 1629
1553Pixmap 1630Pixmap
1554rxvt_term::get_pixmap_property (int prop_id) 1631rxvt_term::get_pixmap_property (Atom property)
1555{ 1632{
1556 if (prop_id > 0 && prop_id < NUM_XA) 1633 Pixmap pixmap = None;
1557 if (xa[prop_id]) 1634
1558 {
1559 int aformat; 1635 int aformat;
1560 unsigned long nitems, bytes_after; 1636 unsigned long nitems, bytes_after;
1561 Atom atype; 1637 Atom atype;
1562 unsigned char *prop = NULL; 1638 unsigned char *prop;
1563 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1639 int result = XGetWindowProperty (dpy, display->root, property,
1564 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1640 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1565 &nitems, &bytes_after, &prop); 1641 &nitems, &bytes_after, &prop);
1566 if (result == Success && prop && atype == XA_PIXMAP) 1642 if (result == Success)
1643 {
1644 if (atype == XA_PIXMAP)
1567 return *(Pixmap *)prop; 1645 pixmap = *(Pixmap *)prop;
1646 XFree (prop);
1568 } 1647 }
1569 1648
1570 return None; 1649 return pixmap;
1571} 1650}
1572 1651
1573#ifdef HAVE_BG_PIXMAP 1652#ifdef HAVE_BG_PIXMAP
1574# if TRACE_PIXMAPS
1575# undef update_background
1576void
1577rxvt_term::trace_update_background (const char *file, int line)
1578{
1579 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1580 update_background ();
1581}
1582# endif
1583 1653
1584void 1654void
1585rxvt_term::update_background () 1655rxvt_term::update_background ()
1586{ 1656{
1587 if (update_background_ev.is_active ()) 1657 if (update_background_ev.is_active ())
1588 return; 1658 return;
1589 1659
1590 bgPixmap.invalidate (); 1660 bg_invalidate ();
1591 1661
1592 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1593 1663
1594 if (to_wait <= 0.) 1664 if (to_wait <= 0.)
1595 bgPixmap.render (); 1665 bg_render ();
1596 else 1666 else
1597 update_background_ev.start (to_wait); 1667 update_background_ev.start (to_wait);
1598} 1668}
1599 1669
1600void 1670void
1601rxvt_term::update_background_cb (ev::timer &w, int revents) 1671rxvt_term::update_background_cb (ev::timer &w, int revents)
1602{ 1672{
1603 make_current (); 1673 make_current ();
1604 1674
1605 update_background_ev.stop (); 1675 update_background_ev.stop ();
1606 bgPixmap.render (); 1676 bg_render ();
1607 refresh_check (); 1677 refresh_check ();
1608} 1678}
1609 1679
1610#endif /* HAVE_BG_PIXMAP */ 1680#endif /* HAVE_BG_PIXMAP */
1611 1681

Diff Legend

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