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.438 by root, Thu Feb 4 21:55:12 2010 UTC vs.
Revision 1.470 by sf-exg, Sun Jan 9 23:48:37 2011 UTC

… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
282} 288}
283 289
284static int 290static int
285hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
415 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
416 */ 422 */
417 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
420
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426 426
427 kbuf[0] = 0; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
430 if (Input_Context) 430 if (Input_Context)
… …
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1; 650 unsigned int newlen = 1;
651 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
652 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
653 { 658 {
654#ifndef NO_BACKSPACE_KEY 659#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace: 660 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace) 661 if (priv_modes & PrivMode_HaveBackSpace)
657 { 662 {
… …
884 commit_iso14755 (); 889 commit_iso14755 ();
885 890
886 return; 891 return;
887 } 892 }
888 893
889 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
890 if (i[0] == keysym) 895 if (i[0] == keysym)
891 { 896 {
892 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
893 commit_iso14755 (); 898 commit_iso14755 ();
894 899
… …
970rxvt_term::flush () 975rxvt_term::flush ()
971{ 976{
972 flush_ev.stop (); 977 flush_ev.stop ();
973 978
974#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
975 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
976 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
977// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
978 scr_touch (false); 984 scr_touch (false);
979 } 985 }
980#endif 986#endif
981 987
… …
1027 } 1033 }
1028 1034
1029 display->flush (); 1035 display->flush ();
1030} 1036}
1031 1037
1032/* checks wether a refresh is requested and starts the refresh timer */ 1038/* checks whether a refresh is requested and starts the refresh timer */
1033void 1039void
1034rxvt_term::refresh_check () 1040rxvt_term::refresh_check ()
1035{ 1041{
1036 if (want_refresh && !flush_ev.is_active ()) 1042 if (want_refresh && !flush_ev.is_active ())
1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1131 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1132 // that giving a process calling sched_yield () less cpu time than 1138 // that giving a process calling sched_yield () less cpu time than
1133 // ones with high nice levels is a useful thing to do. It surely is is 1139 // ones with high nice levels is a useful thing to do. It surely is is
1134 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1135 // since the linux guys additionally thought that breaking the only 1141 // since the linux guys additionally thought that breaking the only
1136 // known workaroudn against their unusable sched_yield hack is cool, 1142 // known workaround against their unusable sched_yield hack is cool,
1137 // we just nanosleep a bit and hope for the best. 1143 // we just nanosleep a bit and hope for the best.
1138 1144
1139 struct timespec ts = { 0, 1000 }; 1145 struct timespec ts = { 0, 1000 };
1140 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1141 1147
… …
1246{ 1252{
1247 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1248 int x, y; 1254 int x, y;
1249 int code = 32; 1255 int code = 32;
1250 1256
1251 x = Pixel2Col (ev.x); 1257 x = Pixel2Col (ev.x) + 1;
1252 y = Pixel2Row (ev.y); 1258 y = Pixel2Row (ev.y) + 1;
1259
1253 if (ev.type == MotionNotify) 1260 if (ev.type == MotionNotify)
1254 { 1261 {
1255 if (x == mouse_row && y == mouse_col) 1262 if (x == mouse_row && y == mouse_col)
1256 return; 1263 return;
1264
1257 mouse_row = x; 1265 mouse_row = x;
1258 mouse_col = y; 1266 mouse_col = y;
1259 code += 32; 1267 code += 32;
1260 } 1268 }
1261 1269
… …
1264 else 1272 else
1265 { 1273 {
1266 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1267 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1268 if (button_number >= 3) 1276 if (button_number >= 3)
1269 button_number += (64 - 3); 1277 button_number += 64 - 3;
1270 } 1278 }
1271 1279
1272 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1273 { 1281 {
1274 /* 1282 /*
… …
1306 fputc ('A', stderr); 1314 fputc ('A', stderr);
1307 if (key_state & 32) 1315 if (key_state & 32)
1308 fputc ('2', stderr); 1316 fputc ('2', stderr);
1309 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1310 button_number, 1318 button_number,
1311 x + 1, 1319 x,
1312 y + 1); 1320 y);
1313#endif 1321#endif
1314 1322
1323#if ENABLE_FRILLS
1324 if (priv_modes & PrivMode_ExtMouseRight)
1325 tt_printf ("\033[%d;%d;%dM",
1326 code + button_number + key_state,
1327 x,
1328 y);
1329 else if (priv_modes & PrivMode_ExtModeMouse)
1330 tt_printf ("\033[M%c%lc%lc",
1331 code + button_number + key_state,
1332 wint_t (32 + x),
1333 wint_t (32 + y));
1334 else
1335#endif
1315 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1316 (code + button_number + key_state), 1337 code + button_number + key_state,
1317 (32 + x + 1), 1338 32 + x,
1318 (32 + y + 1)); 1339 32 + y);
1319} 1340}
1320 1341
1321/*{{{ process an X event */ 1342/*{{{ process an X event */
1322void 1343void
1323rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
… …
1425 && ev.xfocus.mode != NotifyGrab) 1446 && ev.xfocus.mode != NotifyGrab)
1426 focus_out (); 1447 focus_out ();
1427 break; 1448 break;
1428 1449
1429 case ConfigureNotify: 1450 case ConfigureNotify:
1430 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1431 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1432 szHint.width, szHint.height);*/
1433 if (ev.xconfigure.window == parent[0]) 1451 if (ev.xconfigure.window == parent[0])
1434 { 1452 {
1435 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1436 ; 1454 ;
1455
1456#ifdef HAVE_BG_PIXMAP
1457 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 int x, y;
1461 if (ev.xconfigure.send_event)
1462 {
1463 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y;
1465 }
1466 else
1467 get_window_origin (x, y);
1468
1469 if (bgPixmap.set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1471 moved = true;
1472 }
1473#endif
1437 1474
1438 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1439 { 1476 {
1440 seen_resize = 1; 1477 seen_resize = 1;
1441 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1442 } 1479 }
1443 else 1480 else
1444 { 1481 {
1445#ifdef HAVE_BG_PIXMAP 1482#ifdef HAVE_BG_PIXMAP
1446 if (bgPixmap.window_position_sensitive ()) 1483 if (moved)
1447 { 1484 {
1448 if (mapped) 1485 if (mapped)
1449 update_background (); 1486 update_background ();
1450 else 1487 else
1451 bgPixmap.invalidate (); 1488 bgPixmap.invalidate ();
… …
1478 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1479 break; 1516 break;
1480 1517
1481 case MapNotify: 1518 case MapNotify:
1482#ifdef HAVE_BG_PIXMAP 1519#ifdef HAVE_BG_PIXMAP
1483 /* This is needed spcifically to fix the case of no window manager or a 1520 /* This is needed specifically to fix the case of no window manager or a
1484 * non-reparenting window manager. In those cases we never get first 1521 * non-reparenting window manager. In those cases we never get first
1485 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1522 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1486 * care of multiplicity of ConfigureNotify events arriwing while WM does 1523 * care of multiplicity of ConfigureNotify events arriving while WM does
1487 * reparenting. 1524 * reparenting.
1488 * We should not render background immidiately, as there could be several 1525 * We should not render background immediately, as there could be several
1489 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1526 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1490 * by scheduling background redraw as soon as we can, but giving a short 1527 * by scheduling background redraw as soon as we can, but giving a short
1491 * bit of time for ConfigureNotifies to arrive. 1528 * bit of time for ConfigureNotifies to arrive.
1492 * We should render background PRIOR to drawing any text, but AFTER all 1529 * We should render background PRIOR to drawing any text, but AFTER all
1493 * of ConfigureNotifys for the best results. 1530 * of ConfigureNotifys for the best results.
… …
1864 /* save the xbutton state (for ButtonRelease) */ 1901 /* save the xbutton state (for ButtonRelease) */
1865 MEvent.state = ev.state; 1902 MEvent.state = ev.state;
1866#ifdef MOUSE_REPORT_DOUBLECLICK 1903#ifdef MOUSE_REPORT_DOUBLECLICK
1867 if (ev.button == MEvent.button && clickintime) 1904 if (ev.button == MEvent.button && clickintime)
1868 { 1905 {
1869 /* same button, within alloted time */ 1906 /* same button, within allowed time */
1870 MEvent.clicks++; 1907 MEvent.clicks++;
1871 1908
1872 if (MEvent.clicks > 1) 1909 if (MEvent.clicks > 1)
1873 { 1910 {
1874 /* only report double clicks */ 1911 /* only report double clicks */
… …
2145 selection_make (ev.time); 2182 selection_make (ev.time);
2146 break; 2183 break;
2147 2184
2148 case Button2: 2185 case Button2:
2149 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2150 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2151 break; 2188 break;
2152 2189
2153#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2154 case Button4: 2191 case Button4:
2155 case Button5: 2192 case Button5:
… …
2658 2695
2659 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
2660 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
2661 { 2698 {
2662 wchar_t nlcr[] = { C0_LF, C0_CR }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
2663 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2700 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2664 } 2701 }
2665 break; 2702 break;
2666 2703
2667 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
2668 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
… …
2737 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2738 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2775 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2739 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2740}; 2777};
2741 2778
2742#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2779#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2743 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2744 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2745#define get_byte_array_bit(array, bit) \ 2782#define get_byte_array_bit(array, bit) \
2746 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2783 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2747 2784
2748const unsigned char csi_defaults[] = 2785static const unsigned char csi_defaults[] =
2749 { 2786 {
2750 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2751 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2752 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2753 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2842 { 2879 {
2843 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2844 scr_soft_reset (); 2881 scr_soft_reset ();
2845 2882
2846 static const int pm_h[] = { 7, 25 }; 2883 static const int pm_h[] = { 7, 25 };
2847 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2848 2885
2849 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2886 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2850 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2887 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2851 } 2888 }
2852 break; 2889 break;
2853 } 2890 }
2854 2891
2855 return; 2892 return;
… …
3226 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3227 */ 3264 */
3228void 3265void
3229rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3230{ 3267{
3231 char *s;
3232 unicode_t eh;
3233
3234 /* 3268 /*
3235 * Not handled yet 3269 * Not handled yet
3236 */ 3270 */
3271
3272 unicode_t eh;
3237 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3238 if (s) 3274 if (s)
3239 free (s); 3275 free (s);
3240 3276
3241 return; 3277 return;
3242} 3278}
… …
3246 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3247 */ 3283 */
3248void 3284void
3249rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3250{ 3286{
3251 unicode_t ch, eh;
3252 int arg; 3287 int arg;
3253 3288
3254 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3255 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3256 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3257 3292
3258 if (ch == ';') 3293 if (ch == ';')
3259 { 3294 {
3295 unicode_t eh;
3260 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3261 3297
3262 if (s) 3298 if (s)
3263 { 3299 {
3264 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
… …
3389 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3390 break; 3426 break;
3391 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3392 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3393 break; 3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3394#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3395 case XTerm_Color_RV:
3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3401 break; 3441 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3405 break; 3444 break;
3406 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3407 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
… …
3416 { 3455 {
3417 bool changed = false; 3456 bool changed = false;
3418 3457
3419 if (ISSET_PIXCOLOR (Color_tint)) 3458 if (ISSET_PIXCOLOR (Color_tint))
3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3421 else
3422 changed = bgPixmap.unset_tint ();
3423 3460
3424 if (changed) 3461 if (changed)
3425 update_background (); 3462 update_background ();
3426 } 3463 }
3427 3464
… …
3443 { 3480 {
3444 int changed = 0; 3481 int changed = 0;
3445 3482
3446 if (*str != ';') 3483 if (*str != ';')
3447 { 3484 {
3448 /* reset to default scaling :*/
3449 bgPixmap.unset_geometry ();
3450 if (bgPixmap.set_file (str)) /* change pixmap */ 3485 if (bgPixmap.set_file (str)) /* change pixmap */
3486 {
3451 changed++; 3487 changed++;
3452 str = strchr (str, ';'); 3488 str = strchr (str, ';');
3453 if (str == NULL) 3489 if (str == NULL)
3454 bgPixmap.set_defaultGeometry (); 3490 bgPixmap.set_defaultGeometry ();
3491 else
3492 bgPixmap.set_geometry (str+1);
3493 }
3455 } 3494 }
3456 3495 else
3457 while (str)
3458 { 3496 {
3459 str++; 3497 str++;
3460 if (bgPixmap.set_geometry (str)) 3498 if (bgPixmap.set_geometry (str, true))
3461 changed++; 3499 changed++;
3462 str = strchr (str, ';');
3463 } 3500 }
3464 3501
3465 if (changed) 3502 if (changed)
3503 {
3504 if (bgPixmap.window_position_sensitive ())
3505 {
3506 int x, y;
3507 get_window_origin (x, y);
3508 bgPixmap.set_position (x, y);
3509 }
3466 update_background (); 3510 update_background ();
3511 }
3467 } 3512 }
3468 break; 3513 break;
3469#endif 3514#endif
3470 3515
3471 case XTerm_logfile: 3516 case XTerm_logfile:
… …
3574 { 3619 {
3575 if (mode == 'r') 3620 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3621 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3622 else
3578 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3623 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3624
3579 set_privmode (bit, state); 3625 set_privmode (bit, state);
3580 } 3626 }
3581 3627
3582 return state; 3628 return state;
3583} 3629}
… …
3602 { 6, PrivMode_relOrigin }, // DECOM 3648 { 6, PrivMode_relOrigin }, // DECOM
3603 { 7, PrivMode_Autowrap }, // DECAWM 3649 { 7, PrivMode_Autowrap }, // DECAWM
3604 // 8, auto-repeat keys // DECARM 3650 // 8, auto-repeat keys // DECARM
3605 { 9, PrivMode_MouseX10 }, 3651 { 9, PrivMode_MouseX10 },
3606 // 18 end FF to printer after print screen 3652 // 18 end FF to printer after print screen
3607 // 19 Print screen prints full screen/scorll region 3653 // 19 Print screen prints full screen/scroll region
3608 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3654 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3655#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3656 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3657#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3658 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3621 { 67, PrivMode_BackSpace }, // DECBKM 3667 { 67, PrivMode_BackSpace }, // DECBKM
3622#endif 3668#endif
3623 { 1000, PrivMode_MouseX11 }, 3669 { 1000, PrivMode_MouseX11 },
3624 { 1002, PrivMode_MouseBtnEvent }, 3670 { 1002, PrivMode_MouseBtnEvent },
3625 { 1003, PrivMode_MouseAnyEvent }, 3671 { 1003, PrivMode_MouseAnyEvent },
3672#if ENABLE_FRILLS
3673 { 1005, PrivMode_ExtModeMouse },
3674#endif
3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3675 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627 { 1011, PrivMode_Keypress }, // rxvt extension 3676 { 1011, PrivMode_Keypress }, // rxvt extension
3677#if ENABLE_FRILLS
3678 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3679#endif
3628 // 1035 enable modifiers for alt, numlock NYI 3680 // 1035 enable modifiers for alt, numlock NYI
3629 // 1036 send ESC for meta keys NYI 3681 // 1036 send ESC for meta keys NYI
3630 // 1037 send DEL for keypad delete NYI 3682 // 1037 send DEL for keypad delete NYI
3631 { 1047, PrivMode_Screen }, 3683 { 1047, PrivMode_Screen },
3632 // 1048 save and restore cursor 3684 // 1048 save and restore cursor, implemented in code
3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3685 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3686 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste }, 3687 { 2004, PrivMode_BracketPaste },
3636 }; 3688 };
3637 3689
… …
3647 for (i = 0; i < nargs; i++) 3699 for (i = 0; i < nargs; i++)
3648 { 3700 {
3649 state = -1; 3701 state = -1;
3650 3702
3651 /* basic handling */ 3703 /* basic handling */
3652 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3704 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3653 if (argtopriv[j].argval == arg[i]) 3705 if (argtopriv[j].argval == arg[i])
3654 { 3706 {
3655 state = privcases (mode, argtopriv[j].bit); 3707 state = privcases (mode, argtopriv[j].bit);
3656 break; 3708 break;
3657 } 3709 }
… …
3735 case 1003: 3787 case 1003:
3736 if (state) 3788 if (state)
3737 { 3789 {
3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3790 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3739 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3791 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3792 mouse_row = mouse_col = 0;
3740 vt_emask_mouse = PointerMotionMask; 3793 vt_emask_mouse = PointerMotionMask;
3741 } 3794 }
3742 else 3795 else
3743 vt_emask_mouse = NoEventMask; 3796 vt_emask_mouse = NoEventMask;
3744 3797
… …
3970 4023
3971/* ---------------------------------------------------------------------- */ 4024/* ---------------------------------------------------------------------- */
3972/* Write data to the pty as typed by the user, pasted with the mouse, 4025/* Write data to the pty as typed by the user, pasted with the mouse,
3973 * or generated by us in response to a query ESC sequence. 4026 * or generated by us in response to a query ESC sequence.
3974 */ 4027 */
3975const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4028static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3976 4029
3977void 4030void
3978rxvt_term::tt_write (const char *data, unsigned int len) 4031rxvt_term::tt_write (const char *data, unsigned int len)
3979{ 4032{
3980 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4033 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3992 4045
3993 data += written; 4046 data += written;
3994 len -= written; 4047 len -= written;
3995 } 4048 }
3996 4049
3997 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4050 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3998 4051
3999 memcpy (v_buffer + v_buflen, data, len); 4052 memcpy (v_buffer + v_buflen, data, len);
4000 v_buflen += len; 4053 v_buflen += len;
4001 4054
4002 pty_ev.set (ev::READ | ev::WRITE); 4055 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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