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.310 by root, Wed Feb 27 01:05:55 2008 UTC vs.
Revision 1.328 by sf-exg, Mon Jul 19 16:43:21 2010 UTC

… …
35#include "keyboard.h" 35#include "keyboard.h"
36#include "rxvtperl.h" 36#include "rxvtperl.h"
37 37
38#include <limits> 38#include <limits>
39 39
40#include <cassert>
40#include <csignal> 41#include <csignal>
41#include <cstring> 42#include <cstring>
42 43
43#include <termios.h> 44#include <termios.h>
44 45
… …
101 { 102 {
102 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
104 } 105 }
105 106
106 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.end (); cc-- > v.begin (); )
108 { 109 {
109 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
111 } 112 }
… …
227 delete fontset[0]; 228 delete fontset[0];
228 229
229#ifdef HAVE_BG_PIXMAP 230#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 231 bgPixmap.destroy ();
231#endif 232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif
232 239
233 if (display) 240 if (display)
234 { 241 {
235 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
236 244
237#ifdef USE_XIM 245#ifdef USE_XIM
238 im_destroy (); 246 im_destroy ();
239#endif 247#endif
240 scrollBar.destroy (); 248 scrollBar.destroy ();
… …
265 /* clear all resources */ 273 /* clear all resources */
266 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
267 free (allocated [i]); 275 free (allocated [i]);
268 276
269 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
270 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
271 free (env_display); 280 free (env_display);
272 free (env_term); 281 free (env_term);
273 free (locale); 282 free (locale);
274 free (v_buffer); 283 free (v_buffer);
… …
382 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
383 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
384 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
385 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
386 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
387 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
388 mesg, BUFSIZ); 397 mesg, BUFSIZ);
389 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
390 } 399 }
391 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
392 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
393 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
394 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
395 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
396 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
397 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
398 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
399 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
400 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
401 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
402 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
403 mesg, BUFSIZ); 412 mesg, BUFSIZ);
404 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
405 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
406 mesg, BUFSIZ); 415 mesg, BUFSIZ);
407 else 416 else
408 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
409 mesg, BUFSIZ); 418 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
411 } 420 }
412 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
413 mesg, BUFSIZ); 422 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
415} 424}
416#endif 425#endif
417 426
418int 427int
… …
470char **rxvt_environ; // startup environment 479char **rxvt_environ; // startup environment
471 480
472void 481void
473rxvt_init () 482rxvt_init ()
474{ 483{
484 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486
475 ptytty::init (); 487 ptytty::init ();
476 488
477 if (!ev_default_loop (0)) 489 if (!ev_default_loop (0))
478 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
479 491
… …
619 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 631 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
620 632
621 if (recalc_y) 633 if (recalc_y)
622 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 634 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
623 635
624 ncol = width / fwidth; 636 ncol = width / fwidth;
625 nrow = height / fheight; 637 nrow = height / fheight;
626} 638}
627 639
628/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
629/* 641/*
… …
640 652
641 ws.ws_col = ncol; 653 ws.ws_col = ncol;
642 ws.ws_row = nrow; 654 ws.ws_row = nrow;
643 ws.ws_xpixel = width; 655 ws.ws_xpixel = width;
644 ws.ws_ypixel = height; 656 ws.ws_ypixel = height;
645 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 657 ioctl (pty->pty, TIOCSWINSZ, &ws);
646 658
647#if 0 659#if 0
648 // TIOCSWINSZ is supposed to do this automatically and correctly 660 // TIOCSWINSZ is supposed to do this automatically and correctly
649 if (cmd_pid) /* force through to the command */ 661 if (cmd_pid) /* force through to the command */
650 kill (-cmd_pid, SIGWINCH); 662 kill (-cmd_pid, SIGWINCH);
… …
680#endif 692#endif
681 693
682 delete fontset[0]; 694 delete fontset[0];
683 fontset[0] = fs; 695 fontset[0] = fs;
684 696
685 prop = (*fs)[1]->properties (); 697 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
686 prop.height += lineSpace; 698 prop.height += lineSpace;
699 prop.width += letterSpace;
687 700
688 fs->set_prop (prop, false); 701 fs->set_prop (prop, false);
689 702
690 fwidth = prop.width; 703 fwidth = prop.width;
691 fheight = prop.height; 704 fheight = prop.height;
… …
741 prop, XA_STRING, 8, PropModeReplace, 754 prop, XA_STRING, 8, PropModeReplace,
742 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 755 (const unsigned char *)str, len >= 0 ? len : strlen (str));
743} 756}
744 757
745void 758void
759rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
760{
761 XTextProperty ct;
762
763 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
764 {
765 XSetTextProperty (dpy, parent[0], &ct, prop);
766 XFree (ct.value);
767 }
768}
769
770void
746rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 771rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
747{ 772{
748 wchar_t *ws = rxvt_mbstowcs (str, len); 773 wchar_t *ws = rxvt_mbstowcs (str, len);
749 char *s = rxvt_wcstoutf8 (ws); 774 char *s = rxvt_wcstoutf8 (ws);
750 775
… …
760/*----------------------------------------------------------------------*/ 785/*----------------------------------------------------------------------*/
761/* xterm sequences - title, iconName, color (exptl) */ 786/* xterm sequences - title, iconName, color (exptl) */
762void 787void
763rxvt_term::set_title (const char *str) 788rxvt_term::set_title (const char *str)
764{ 789{
765 set_string_property (XA_WM_NAME, str); 790 set_mbstring_property (XA_WM_NAME, str);
766#if ENABLE_EWMH 791#if ENABLE_EWMH
767 set_utf8_property (xa[XA_NET_WM_NAME], str); 792 set_utf8_property (xa[XA_NET_WM_NAME], str);
768#endif 793#endif
769} 794}
770 795
771void 796void
772rxvt_term::set_icon_name (const char *str) 797rxvt_term::set_icon_name (const char *str)
773{ 798{
774 set_string_property (XA_WM_ICON_NAME, str); 799 set_mbstring_property (XA_WM_ICON_NAME, str);
775#if ENABLE_EWMH 800#if ENABLE_EWMH
776 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 801 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
777#endif 802#endif
778} 803}
779 804
… …
905 int old_width = szHint.width; 930 int old_width = szHint.width;
906 int old_height = szHint.height; 931 int old_height = szHint.height;
907 932
908 window_calc (newwidth, newheight); 933 window_calc (newwidth, newheight);
909 934
910 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 935 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
936
937 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
938 if (set_hint)
939 {
940 szHint.flags &= ~(PBaseSize | PResizeInc);
911 XSetWMNormalHints (dpy, parent[0], &szHint); 941 XSetWMNormalHints (dpy, parent[0], &szHint);
942 szHint.flags |= PBaseSize | PResizeInc;
943 }
912 944
913 if (!ignoreparent) 945 if (!ignoreparent)
914 { 946 {
915#ifdef SMART_RESIZE 947#ifdef SMART_RESIZE
916 /* 948 /*
… …
956#else 988#else
957 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 989 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
958#endif 990#endif
959 } 991 }
960 992
993 if (set_hint)
994 XSetWMNormalHints (dpy, parent[0], &szHint);
995
961 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 996 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
962 997
963 if (fix_screen || newwidth != old_width || newheight != old_height) 998 if (fix_screen || newwidth != old_width || newheight != old_height)
964 { 999 {
965 if (scrollBar.state) 1000 if (scrollBar.state)
… …
971 1006
972#ifdef HAVE_BG_PIXMAP 1007#ifdef HAVE_BG_PIXMAP
973 if (bgPixmap.window_size_sensitive ()) 1008 if (bgPixmap.window_size_sensitive ())
974 update_background (); 1009 update_background ();
975#endif 1010#endif
976
977 scr_clear ();
978 } 1011 }
979 1012
980 if (fix_screen || old_height == 0) 1013 if (fix_screen || old_height == 0)
981 scr_reset (); 1014 scr_reset ();
982
983 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
984 //scr_touch (false);
985 1015
986#ifdef HAVE_BG_PIXMAP 1016#ifdef HAVE_BG_PIXMAP
987// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1017// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
988// if (bgPixmap.pixmap) 1018// if (bgPixmap.pixmap)
989// scr_touch (false); 1019// scr_touch (false);
… …
1061 1091
1062/* Checking whether input method is running. */ 1092/* Checking whether input method is running. */
1063bool 1093bool
1064rxvt_term::IMisRunning () 1094rxvt_term::IMisRunning ()
1065{ 1095{
1066 char *p;
1067 Atom atom; 1096 Atom atom;
1068 Window win; 1097 Window win;
1069 char server[IMBUFSIZ]; 1098 char server[IMBUFSIZ];
1070 1099
1071 /* get current locale modifier */ 1100 /* get current locale modifier */
1072 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1101 if (char *p = XSetLocaleModifiers (0))
1073 { 1102 {
1074 strcpy (server, "@server="); 1103 strcpy (server, "@server=");
1075 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1104 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1076 1105
1077 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1106 if (p = strchr (server + 1, '@')) /* first one only */
1078 *p = '\0'; 1107 *p = '\0';
1079 1108
1080 atom = XInternAtom (dpy, server, False); 1109 atom = XInternAtom (dpy, server, False);
1081 win = XGetSelectionOwner (dpy, atom); 1110 win = XGetSelectionOwner (dpy, atom);
1082 1111
… …
1149 1178
1150 term->make_current (); 1179 term->make_current ();
1151 1180
1152 if (text) 1181 if (text)
1153 { 1182 {
1154 void *str; 1183 wchar_t *str;
1155 1184
1156 if (!text->encoding_is_wchar && text->string.multi_byte) 1185 if (!text->encoding_is_wchar && text->string.multi_byte)
1157 { 1186 {
1158 // of course, X makes it ugly again 1187 // of course, X makes it ugly again
1159 if (term->rs[Rs_imLocale]) 1188 if (term->rs[Rs_imLocale])
1160 SET_LOCALE (term->rs[Rs_imLocale]); 1189 SET_LOCALE (term->rs[Rs_imLocale]);
1161 1190
1162 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1191 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1163 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1192 mbstowcs (str, text->string.multi_byte, text->length + 1);
1164 1193
1165 if (term->rs[Rs_imLocale]) 1194 if (term->rs[Rs_imLocale])
1166 SET_LOCALE (term->locale); 1195 SET_LOCALE (term->locale);
1167 } 1196 }
1168 else 1197 else
1169 str = (void *)text->string.wide_char; 1198 str = text->string.wide_char;
1170 1199
1171 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1200 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1172 DT_INT, call_data->caret, 1201 DT_INT, call_data->caret,
1173 DT_INT, call_data->chg_first, 1202 DT_INT, call_data->chg_first,
1174 DT_INT, call_data->chg_length, 1203 DT_INT, call_data->chg_length,

Diff Legend

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