ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.213 by root, Thu Dec 22 16:44:10 2005 UTC vs.
Revision 1.221 by root, Sat Dec 31 18:27:57 2005 UTC

… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 141 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 142 return;
143 143
144 for (;;) 144 for (;;)
145 { 145 {
146 const line_t &l = ROW(-view_start); 146 const line_t &l = ROW(y - view_start);
147 147
148 text_t t = l.t[x]; 148 text_t t = l.t[x];
149 149
150 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
151 { 151 {
152 iso14755_51 (l.t[x], l.r[x]); 152 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 153 iso14755buf = ISO_14755_54;
154 break; 154 break;
155 } 155 }
156 156
157 x--; 157 x--;
158 } 158 }
159} 159}
160#endif
161 160
162#if ENABLE_OVERLAY
163void 161void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 162rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 163{
166 rxvt_fontset *fs = FONTSET (r); 164 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 165 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 166 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 167 int len;
170 168
171 fname = rxvt_utf8towcs (f->name); 169 fname = rxvt_utf8towcs (f->name);
172 170
173#if ENABLE_COMBINING 171# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 172 if (IS_COMPOSE (ch))
175 { 173 {
176 len = rxvt_composite.expand (ch, 0); 174 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 175 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 176 rxvt_composite.expand (ch, chr);
179 } 177 }
180 else 178 else
181#endif 179# endif
182 { 180 {
183 ch2 = ch; 181 ch2 = ch;
184 182
185 alloc = 0; 183 alloc = 0;
186 chr = &ch2; 184 chr = &ch2;
187 len = 1; 185 len = 1;
188 } 186 }
189 187
188 char attr[80]; // plenty
189
190 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
191 (int)r,
192 fgcolor_of (r), bgcolor_of (r),
193 r & RS_Bold ? " bold" : "",
194 r & RS_Italic ? " italic" : "",
195 r & RS_Blink ? " blink" : "",
196 r & RS_RVid ? " rvid" : "",
197 r & RS_Uline ? " uline" : "",
198 r & RS_Careful ? " careful" : "");
199
190 int width = wcswidth (fname, wcslen (fname)); 200 int width = wcswidth (fname, wcslen (fname));
191 201
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 202 max_it (width, 8+5); // for char + hey
203 max_it (width, strlen (attr));
204
205 if (y >= 0)
206 {
207 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
208 x = 0;
209 }
210
211 scr_overlay_new (x, y, width, len + 2);
193 212
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 213 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 214
196 for (int y = 0; y < len; y++) 215 for (int y = 0; y < len; y++)
197 { 216 {
… …
200 ch = *chr++; 219 ch = *chr++;
201 220
202 sprintf (buf, "%8x", ch); 221 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 222 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 223 scr_overlay_set (9, y, '=');
205#if !UNICODE3 224# if !UNICODE3
206 if (ch >= 0x10000) 225 if (ch >= 0x10000)
207 ch = 0xfffd; 226 ch = 0xfffd;
208#endif 227# endif
209 scr_overlay_set (11, y, ch, r); 228 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
211 } 230 }
212 231
232 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 233 scr_overlay_set (0, len + 1, fname);
214 234
215 free (fname); 235 free (fname);
216 236
217#if ENABLE_COMBINING 237# if ENABLE_COMBINING
218 if (alloc) 238 if (alloc)
219 delete [] alloc; 239 delete [] alloc;
220#endif 240# endif
221} 241}
222#endif 242#endif
223 243
224void 244void
225rxvt_term::commit_iso14755 () 245rxvt_term::commit_iso14755 ()
… …
844 } 864 }
845 865
846 if (len <= 0) 866 if (len <= 0)
847 return; /* not mapped */ 867 return; /* not mapped */
848 868
849 if (options & Opt_scrollTtyKeypress) 869 if (OPTION (Opt_scrollTtyKeypress))
850 if (view_start) 870 if (view_start)
851 { 871 {
852 view_start = 0; 872 view_start = 0;
853 want_refresh = 1; 873 want_refresh = 1;
854 } 874 }
… …
1067 if (n > 0) 1087 if (n > 0)
1068 { 1088 {
1069 cmdbuf_endp += n; 1089 cmdbuf_endp += n;
1070 return true; 1090 return true;
1071 } 1091 }
1072 else if (n < 0 && errno != EAGAIN && errno != EINTR) 1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1093 {
1073 pty_ev.stop (); 1094 pty_ev.stop ();
1095
1096 if (!OPTION (Opt_hold))
1097 destroy ();
1098 }
1074 1099
1075 return false; 1100 return false;
1076} 1101}
1077 1102
1078void 1103void
… …
1098 recolour_cursor (); 1123 recolour_cursor ();
1099 1124
1100#ifdef POINTER_BLANK 1125#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1126 hidden_pointer = 0;
1102 1127
1103 if (options & Opt_pointerBlank) 1128 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1129 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1130#endif
1106} 1131}
1107 1132
1108#ifdef POINTER_BLANK 1133#ifdef POINTER_BLANK
1109void 1134void
1110rxvt_term::pointer_blank () 1135rxvt_term::pointer_blank ()
1111{ 1136{
1112 if (! (options & Opt_pointerBlank)) 1137 if (! OPTION (Opt_pointerBlank))
1113 return; 1138 return;
1114 1139
1115 XDefineCursor (display->display, vt, display->blank_cursor); 1140 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1141 XFlush (display->display);
1117 1142
… …
1215 1240
1216 SET_R (this); 1241 SET_R (this);
1217 SET_LOCALE (locale); 1242 SET_LOCALE (locale);
1218 1243
1219#if defined(CURSOR_BLINK) 1244#if defined(CURSOR_BLINK)
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1221 { 1246 {
1222 if (hidden_cursor) 1247 if (hidden_cursor)
1223 { 1248 {
1224 hidden_cursor = 0; 1249 hidden_cursor = 0;
1225 want_refresh = 1; 1250 want_refresh = 1;
… …
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1229 } 1254 }
1230#endif 1255#endif
1231 1256
1232#if defined(POINTER_BLANK) 1257#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1234 { 1259 {
1235 if (ev.type == MotionNotify 1260 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress 1261 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease) 1262 || ev.type == ButtonRelease)
1238 if (hidden_pointer) 1263 if (hidden_pointer)
… …
1434 seen_resize = 1; 1459 seen_resize = 1;
1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1460 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1436 } 1461 }
1437 1462
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1463#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1439 if (options & Opt_transparent) 1464 if (OPTION (Opt_transparent))
1440 check_our_parents (); 1465 check_our_parents ();
1441#endif 1466#endif
1442 } 1467 }
1443 break; 1468 break;
1444 1469
… …
1653 IMSetStatusPosition (); 1678 IMSetStatusPosition ();
1654 XSetICFocus (Input_Context); 1679 XSetICFocus (Input_Context);
1655 } 1680 }
1656#endif 1681#endif
1657#if CURSOR_BLINK 1682#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink) 1683 if (OPTION (Opt_cursorBlink))
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1684 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1660#endif 1685#endif
1661#if OFF_FOCUS_FADING 1686#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade]) 1687 if (rs[Rs_fade])
1663 { 1688 {
… …
1685#if USE_XIM 1710#if USE_XIM
1686 if (Input_Context != NULL) 1711 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context); 1712 XUnsetICFocus (Input_Context);
1688#endif 1713#endif
1689#if CURSOR_BLINK 1714#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink) 1715 if (OPTION (Opt_cursorBlink))
1691 cursor_blink_ev.stop (); 1716 cursor_blink_ev.stop ();
1692 hidden_cursor = 0; 1717 hidden_cursor = 0;
1693#endif 1718#endif
1694#if OFF_FOCUS_FADING 1719#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade]) 1720 if (rs[Rs_fade])
… …
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1744 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1720 return; 1745 return;
1721 1746
1722 /* FALLTHROUGH */ 1747 /* FALLTHROUGH */
1723 case ReparentNotify: 1748 case ReparentNotify:
1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1749 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1725 want_refresh = want_full_refresh = 1; 1750 want_refresh = want_full_refresh = 1;
1726 break; 1751 break;
1727 } 1752 }
1728} 1753}
1729#endif 1754#endif
… …
2071 2096
2072 v = ev.button == Button4 ? UP : DN; 2097 v = ev.button == Button4 ? UP : DN;
2073 2098
2074 if (ev.state & ShiftMask) 2099 if (ev.state & ShiftMask)
2075 i = 1; 2100 i = 1;
2076 else if (options & Opt_mouseWheelScrollPage) 2101 else if (OPTION (Opt_mouseWheelScrollPage))
2077 i = nrow - 1; 2102 i = nrow - 1;
2078 else 2103 else
2079 i = 5; 2104 i = 5;
2080 2105
2081# ifdef MOUSE_SLIP_WHEELING 2106# ifdef MOUSE_SLIP_WHEELING
… …
2367 XWindowAttributes wattr, wrootattr; 2392 XWindowAttributes wattr, wrootattr;
2368 dDisp; 2393 dDisp;
2369 2394
2370 pchanged = 0; 2395 pchanged = 0;
2371 2396
2372 if (!(options & Opt_transparent)) 2397 if (!OPTION (Opt_transparent))
2373 return pchanged; /* Don't try any more */ 2398 return pchanged; /* Don't try any more */
2374 2399
2375 XGetWindowAttributes (disp, display->root, &wrootattr); 2400 XGetWindowAttributes (disp, display->root, &wrootattr);
2376 rootdepth = wrootattr.depth; 2401 rootdepth = wrootattr.depth;
2377 2402
… …
2655 if (ch == C0_LF) 2680 if (ch == C0_LF)
2656 nlines++; 2681 nlines++;
2657 2682
2658 refresh_count++; 2683 refresh_count++;
2659 2684
2660 if (!(options & Opt_jumpScroll) 2685 if (!OPTION (Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (nrow - 1))) 2686 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2687 {
2663 refreshnow = true; 2688 refreshnow = true;
2664 ch = NOCHAR; 2689 ch = NOCHAR;
2665 break; 2690 break;
… …
2699 * the number of pages between refreshes is refresh_limit, which 2724 * the number of pages between refreshes is refresh_limit, which
2700 * is incremented here because we must be doing flat-out scrolling. 2725 * is incremented here because we must be doing flat-out scrolling.
2701 */ 2726 */
2702 if (refreshnow) 2727 if (refreshnow)
2703 { 2728 {
2704 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2729 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2705 refresh_limit++; 2730 refresh_limit++;
2706 else 2731 else
2707 { 2732 {
2708 flag = true; 2733 flag = true;
2709 scr_refresh (refresh_type); 2734 scr_refresh (refresh_type);
… …
3373 break; 3398 break;
3374 case 6: /* CPR requested */ 3399 case 6: /* CPR requested */
3375 scr_report_position (); 3400 scr_report_position ();
3376 break; 3401 break;
3377 case 7: /* unofficial extension */ 3402 case 7: /* unofficial extension */
3378 if (options & Opt_insecure) 3403 if (OPTION (Opt_insecure))
3379 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3404 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3380 break; 3405 break;
3381 case 8: /* unofficial extension */ 3406 case 8: /* unofficial extension */
3382 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3407 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3383 break; 3408 break;
… …
3547 break; 3572 break;
3548 case 20: /* report icon label */ 3573 case 20: /* report icon label */
3549 { 3574 {
3550 char *s; 3575 char *s;
3551 XGetIconName (disp, parent[0], &s); 3576 XGetIconName (disp, parent[0], &s);
3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3577 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3553 XFree (s); 3578 XFree (s);
3554 } 3579 }
3555 break; 3580 break;
3556 case 21: /* report window title */ 3581 case 21: /* report window title */
3557 { 3582 {
3558 char *s; 3583 char *s;
3559 XFetchName (disp, parent[0], &s); 3584 XFetchName (disp, parent[0], &s);
3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3585 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3561 XFree (s); 3586 XFree (s);
3562 } 3587 }
3563 break; 3588 break;
3564 } 3589 }
3565} 3590}
… …
3841 // TODO, when secure mode? 3866 // TODO, when secure mode?
3842 break; 3867 break;
3843 3868
3844#ifdef MENUBAR 3869#ifdef MENUBAR
3845 case URxvt_Menu: 3870 case URxvt_Menu:
3846 if (options & Opt_insecure) 3871 if (OPTION (Opt_insecure))
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3872 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3848 break; 3873 break;
3849#endif 3874#endif
3850#if 0 3875#if 0
3851 case XTerm_dumpscreen: /* no error notices */ 3876 case XTerm_dumpscreen: /* no error notices */
… …
3867 case URxvt_italicFont: 3892 case URxvt_italicFont:
3868 case URxvt_boldItalicFont: 3893 case URxvt_boldItalicFont:
3869#endif 3894#endif
3870 if (query) 3895 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop, 3896 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3897 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "", 3898 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp); 3899 resp);
3875 else 3900 else
3876 { 3901 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3902 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3883 break; 3908 break;
3884 3909
3885#if ENABLE_FRILLS 3910#if ENABLE_FRILLS
3886 case URxvt_locale: 3911 case URxvt_locale:
3887 if (query) 3912 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3913 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3889 else 3914 else
3890 { 3915 {
3891 set_locale (str); 3916 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8); 3917 pty.set_utf8_mode (enc_utf8);
3893 init_xlocale (); 3918 init_xlocale ();
… …
4021 } 4046 }
4022 4047
4023 /* extra handling for values with state unkept */ 4048 /* extra handling for values with state unkept */
4024 switch (arg[i]) 4049 switch (arg[i])
4025 { 4050 {
4051#if ENABLE_STYLES
4052 case 1021:
4053 if (mode)
4054 SET_OPTION (Opt_intensityStyles);
4055 else
4056 CLR_OPTION (Opt_intensityStyles);
4057#endif
4026 case 1048: /* alternative cursor save */ 4058 case 1048: /* alternative cursor save */
4027 case 1049: 4059 case 1049:
4028 if (options & Opt_secondaryScreen) 4060 if (OPTION (Opt_secondaryScreen))
4029 if (mode == 0) 4061 if (mode == 0)
4030 scr_cursor (RESTORE); 4062 scr_cursor (RESTORE);
4031 else if (mode == 1) 4063 else if (mode == 1)
4032 scr_cursor (SAVE); 4064 scr_cursor (SAVE);
4033 break; 4065 break;
… …
4048 case 3: /* 80/132 */ 4080 case 3: /* 80/132 */
4049 if (priv_modes & PrivMode_132OK) 4081 if (priv_modes & PrivMode_132OK)
4050 set_widthheight (((state ? 132 : 80) * fwidth), height); 4082 set_widthheight (((state ? 132 : 80) * fwidth), height);
4051 break; 4083 break;
4052 case 4: /* smooth scrolling */ 4084 case 4: /* smooth scrolling */
4053 if (state) 4085 if (!state)
4054 options &= ~Opt_jumpScroll; 4086 SET_OPTION (Opt_jumpScroll);
4055 else 4087 else
4056 options |= Opt_jumpScroll; 4088 CLR_OPTION (Opt_jumpScroll);
4057 break; 4089 break;
4058 case 5: /* reverse video */ 4090 case 5: /* reverse video */
4059 scr_rvideo_mode (state); 4091 scr_rvideo_mode (state);
4060 break; 4092 break;
4061 case 6: /* relative/absolute origins */ 4093 case 6: /* relative/absolute origins */
… …
4102#if 0 4134#if 0
4103 case 1001: 4135 case 1001:
4104 break; /* X11 mouse highlighting */ 4136 break; /* X11 mouse highlighting */
4105#endif 4137#endif
4106 case 1010: /* scroll to bottom on TTY output inhibit */ 4138 case 1010: /* scroll to bottom on TTY output inhibit */
4107 if (state) 4139 if (!state)
4108 options &= ~Opt_scrollTtyOutput; 4140 SET_OPTION (Opt_scrollTtyOutput);
4109 else 4141 else
4110 options |= Opt_scrollTtyOutput; 4142 CLR_OPTION (Opt_scrollTtyOutput);
4111 break; 4143 break;
4112 case 1011: /* scroll to bottom on key press */ 4144 case 1011: /* scroll to bottom on key press */
4113 if (state) 4145 if (state)
4114 options |= Opt_scrollTtyKeypress; 4146 SET_OPTION (Opt_scrollTtyKeypress);
4115 else 4147 else
4116 options &= ~Opt_scrollTtyKeypress; 4148 CLR_OPTION (Opt_scrollTtyKeypress);
4117 break; 4149 break;
4118 case 1047: /* secondary screen w/ clearing last */ 4150 case 1047: /* secondary screen w/ clearing last */
4119 if (options & Opt_secondaryScreen) 4151 if (OPTION (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 4152 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 4153 scr_erase_screen (2);
4122 scr_change_screen (state); 4154 scr_change_screen (state);
4123 break; 4155 break;
4124 case 1049: /* secondary screen w/ clearing first */ 4156 case 1049: /* secondary screen w/ clearing first */
4125 scr_change_screen (state); 4157 scr_change_screen (state);
4126 if (options & Opt_secondaryScreen) 4158 if (OPTION (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 4159 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 4160 scr_erase_screen (2);
4129 break; 4161 break;
4130 default: 4162 default:
4131 break; 4163 break;
… …
4281 case 106: 4313 case 106:
4282 case 107: 4314 case 107:
4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4315 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4284 break; 4316 break;
4285#endif 4317#endif
4286
4287 } 4318 }
4288 } 4319 }
4289} 4320}
4290/*}}} */ 4321/*}}} */
4291 4322

Diff Legend

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