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.574 by root, Thu Jun 30 14:07:43 2016 UTC vs.
Revision 1.587 by sf-exg, Sat May 8 06:16:21 2021 UTC

… …
1277#endif 1277#endif
1278 1278
1279void 1279void
1280rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1281{ 1281{
1282 int button_number, key_state = 0; 1282 int button_number, state = 0;
1283 int x, y; 1283 int x, y;
1284 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1285 1285
1286 x = Pixel2Col (ev.x) + 1; 1286 x = Pixel2Col (ev.x) + 1;
1287 y = Pixel2Row (ev.y) + 1; 1287 y = Pixel2Row (ev.y) + 1;
1288 1288
1289 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
… …
1291 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1292 return; 1292 return;
1293 1293
1294 mouse_row = x; 1294 mouse_row = x;
1295 mouse_col = y; 1295 mouse_col = y;
1296 code += 32; 1296 state += 32;
1297 }
1298
1299 if (MEvent.button == AnyButton)
1300 button_number = 3;
1301 else
1302 { 1297 }
1298
1303 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1304 /* add 0x3D for wheel events, like xterm does */ 1300 /* add 0x3D for wheel events, like xterm does */
1305 if (button_number >= 3) 1301 if (button_number >= 3)
1306 button_number += 64 - 3; 1302 button_number += 64 - 3;
1307 }
1308 1303
1309 if (priv_modes & PrivMode_MouseX10) 1304 if (priv_modes & PrivMode_MouseX10)
1310 { 1305 {
1311 /* 1306 /*
1312 * do not report ButtonRelease 1307 * do not report ButtonRelease
1313 * no state info allowed 1308 * no state info allowed
1314 */ 1309 */
1315 key_state = 0; 1310 if (release)
1316 if (button_number == 3)
1317 return; 1311 return;
1318 } 1312 }
1319 else 1313 else
1320 { 1314 {
1321 /* XTerm mouse reporting needs these values: 1315 /* XTerm mouse reporting needs these values:
… …
1323 * 8 = Meta 1317 * 8 = Meta
1324 * 16 = Control 1318 * 16 = Control
1325 * plus will add in our own Double-Click reporting 1319 * plus will add in our own Double-Click reporting
1326 * 32 = Double Click 1320 * 32 = Double Click
1327 */ 1321 */
1328 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1322 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1329 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1323 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1330 + ((MEvent.state & ControlMask) ? 16 : 0); 1324 + ((MEvent.state & ControlMask) ? 16 : 0);
1331#ifdef MOUSE_REPORT_DOUBLECLICK 1325#ifdef MOUSE_REPORT_DOUBLECLICK
1332 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1326 state += ((MEvent.clicks > 1) ? 32 : 0);
1333#endif 1327#endif
1334 } 1328 }
1329
1330 int code = 32 + (release ? 3 : button_number) + state;
1335 1331
1336#if DEBUG_MOUSEREPORT 1332#if DEBUG_MOUSEREPORT
1337 fprintf (stderr, "Mouse ["); 1333 fprintf (stderr, "Mouse [");
1338 if (key_state & 16) 1334 if (state & 16)
1339 fputc ('C', stderr); 1335 fputc ('C', stderr);
1340 if (key_state & 4) 1336 if (state & 4)
1341 fputc ('S', stderr); 1337 fputc ('S', stderr);
1342 if (key_state & 8) 1338 if (state & 8)
1343 fputc ('A', stderr); 1339 fputc ('A', stderr);
1344 if (key_state & 32) 1340 if (state & 32)
1345 fputc ('2', stderr); 1341 fputc ('2', stderr);
1346 fprintf (stderr, "]: <%d>, %d/%d\n", 1342 fprintf (stderr, "]: <%d>, %d/%d\n",
1347 button_number, 1343 button_number,
1348 x, 1344 x,
1349 y); 1345 y);
1350#endif 1346#endif
1351 1347
1352#if ENABLE_FRILLS 1348#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight) 1349 if (priv_modes & PrivMode_ExtMouseSGR)
1350 tt_printf ("\033[<%d;%d;%d%c",
1351 button_number + state,
1352 x,
1353 y,
1354 release ? 'm' : 'M');
1355 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1354 tt_printf ("\033[%d;%d;%dM", 1356 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state, 1357 code,
1356 x, 1358 x,
1357 y); 1359 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse) 1360 else if (priv_modes & PrivMode_ExtMouseUTF8)
1359 tt_printf ("\033[M%c%lc%lc", 1361 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state, 1362 code,
1361 wint_t (32 + x), 1363 wint_t (32 + x),
1362 wint_t (32 + y)); 1364 wint_t (32 + y));
1363 else 1365 else
1364#endif 1366#endif
1365 tt_printf ("\033[M%c%c%c", 1367 tt_printf ("\033[M%c%c%c",
1366 code + button_number + key_state, 1368 code,
1367 32 + x, 1369 32 + x,
1368 32 + y); 1370 32 + y);
1369} 1371}
1370 1372
1371/*{{{ process an X event */ 1373/*{{{ process an X event */
… …
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1485 ;
1484 1486
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1487 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486 1488
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change) 1489 if (want_position_change)
1498 { 1490 {
1499 int x, y; 1491 int x, y;
1500 1492
1501 if (ev.xconfigure.send_event) 1493 if (ev.xconfigure.send_event)
… …
1509 if (x != parent_x || y != parent_y) 1501 if (x != parent_x || y != parent_y)
1510 { 1502 {
1511 parent_x = x; 1503 parent_x = x;
1512 parent_y = y; 1504 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 } 1506 }
1516 } 1507 }
1517 1508
1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1509 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1519 { 1510 {
1520 seen_resize = 1; 1511 seen_resize = 1;
1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1512 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1522 } 1513 }
1523 else
1524 {
1525#ifdef HAVE_BG_PIXMAP
1526 if (moved)
1527 update_background ();
1528#endif
1529 }
1530 1514
1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 } 1516 }
1533 break; 1517 break;
1534 1518
… …
1543 case SelectionRequest: 1527 case SelectionRequest:
1544 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1545 break; 1529 break;
1546 1530
1547 case MapNotify: 1531 case MapNotify:
1548#ifdef HAVE_BG_PIXMAP
1549 // This is needed at startup for the case of no window manager
1550 // or a non-reparenting window manager and also because we
1551 // defer bg image updates if the window is not mapped. The
1552 // short delay is to optimize for multiple ConfigureNotify
1553 // events at startup when the window manager reparents the
1554 // window, so as to perform the computation after we have
1555 // received all of them.
1556 if (bg_img == 0)
1557 update_background_ev.start (0.025);
1558#endif
1559 mapped = 1; 1532 mapped = 1;
1560#ifdef TEXT_BLINK 1533#ifdef TEXT_BLINK
1561 text_blink_ev.start (); 1534 text_blink_ev.start ();
1562#endif 1535#endif
1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1859 } 1832 }
1860#endif 1833#endif
1861} 1834}
1862 1835
1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1836#if ENABLE_PERL
1864void ecb_hot 1837void ecb_hot
1865rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1866{ 1839{
1867 make_current (); 1840 make_current ();
1868 1841
… …
1878 * use the property to determine the pixmap. We use it later on. 1851 * use the property to determine the pixmap. We use it later on.
1879 */ 1852 */
1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1882 { 1855 {
1883#if BG_IMAGE_FROM_ROOT
1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1856 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1891 } 1857 }
1892 1858
1893 break; 1859 break;
1894 } 1860 }
… …
2185 && (ev.button != MEvent.button 2151 && (ev.button != MEvent.button
2186 || (ev.time - MEvent.time 2152 || (ev.time - MEvent.time
2187 > multiClickTime / 2))) 2153 > multiClickTime / 2)))
2188 { 2154 {
2189 MEvent.clicks = 0; 2155 MEvent.clicks = 0;
2190 MEvent.button = AnyButton; 2156 MEvent.button = ev.button;
2191 mouse_report (ev); 2157 mouse_report (ev);
2192 } 2158 }
2193#else /* MOUSE_REPORT_DOUBLECLICK */ 2159#else /* MOUSE_REPORT_DOUBLECLICK */
2194 MEvent.button = AnyButton; 2160 MEvent.button = ev.button;
2195 mouse_report (ev); 2161 mouse_report (ev);
2196#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
2197 return; 2163 return;
2198 } 2164 }
2199 2165
… …
2390wchar_t ecb_hot 2356wchar_t ecb_hot
2391rxvt_term::next_char () NOTHROW 2357rxvt_term::next_char () NOTHROW
2392{ 2358{
2393 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2394 { 2360 {
2395 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2397 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2398 2364
2399 wchar_t wc; 2365 wchar_t wc;
2400 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2366 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2401 2367
… …
2726 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2728 } 2694 }
2729 break; 2695 break;
2730 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
2731 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
2732 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
2733 // used by original rxvt for rob nations own graphics mode 2700 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q') 2701 if (cmd_getc () == 'Q' && option (Opt_insecure))
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2702 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2736 break; 2703 break;
2704#endif
2737 2705
2738 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
2739 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
2740 scr_set_tab (1); 2708 scr_set_tab (1);
2741 break; 2709 break;
… …
2908 { 2876 {
2909 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2877 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2910 scr_soft_reset (); 2878 scr_soft_reset ();
2911 2879
2912 static const int pm_h[] = { 7, 25 }; 2880 static const int pm_h[] = { 7, 25 };
2913 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2881 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2914 2882
2915 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2883 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2916 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); 2884 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2917 } 2885 }
2918 break; 2886 break;
… …
2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2916 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2949 scr_gotorc (arg[0], 0, RELATIVE); 2917 scr_gotorc (arg[0], 0, RELATIVE);
2950 break; 2918 break;
2951 2919
2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2920 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2921 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2954#ifdef ISO6429 2922#ifdef ISO6429
2955 arg[0] = -arg[0]; 2923 arg[0] = -arg[0];
2956#else /* emulate common DEC VTs */ 2924#else /* emulate common DEC VTs */
2957 arg[0] = arg[0] ? -arg[0] : -1; 2925 arg[0] = arg[0] ? -arg[0] : -1;
2958#endif 2926#endif
… …
3350 idx_b; 3318 idx_b;
3351} 3319}
3352 3320
3353/* 3321/*
3354 * Find the nearest color slot in the hidden color cube, 3322 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 24bit RGB color. 3323 * adapt its value to the 32bit RGBA color.
3356 */ 3324 */
3357unsigned int 3325unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b) 3326rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3359{ 3327{
3360 r &= 0xff; 3328 r &= 0xff;
3361 g &= 0xff; 3329 g &= 0xff;
3362 b &= 0xff; 3330 b &= 0xff;
3331 a &= 0xff;
3363 3332
3364 unsigned int color = (r << 16) | (g << 8) | b; 3333 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3334
3365 unsigned int idx_r = r / (0xff / (Red_levels - 1)); 3335 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3366 unsigned int idx_g = g / (0xff / (Green_levels - 1)); 3336 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3367 unsigned int idx_b = b / (0xff / (Blue_levels - 1)); 3337 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3368 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b); 3338 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3369
3370 if (rgb24_color[idx] == color)
3371 return idx + minTermCOLOR24;
3372 3339
3373 /* we allow one of the 6 directly neighbouring colours */ 3340 /* we allow one of the 6 directly neighbouring colours */
3374 /* to replace the current color, if they not used recently */ 3341 /* to replace the current color, if they not used recently */
3375 static const signed char dxyz[][3] = { 3342 static const signed char dxyz[][3] = {
3376 0, 0, 0, 3343 0, 0, 0,
3344 0, 0, +1,
3377 0, 0, -1, 3345 0, 0, -1,
3378 0, 0, +1, 3346 0, +1, 0,
3379 0, -1, 0, 3347 0, -1, 0,
3380 0, +1, 0, 3348 +1, 0, 0,
3381 -1, 0, 0, 3349 -1, 0, 0,
3382 +1, 0, 0,
3383 }; 3350 };
3384 3351
3385 for (int n = 0; n < ecb_array_length (dxyz); ++n) 3352 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3386 { 3353 {
3387 int r = idx_r + dxyz[n][0]; 3354 int r = idx_r + dxyz[n][0];
3388 int g = idx_r + dxyz[n][1]; 3355 int g = idx_g + dxyz[n][1];
3389 int b = idx_r + dxyz[n][2]; 3356 int b = idx_b + dxyz[n][2];
3390 3357
3391 if (!IN_RANGE_EXC (r, 0, Red_levels)) 3358 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3392 continue;
3393
3394 if (!IN_RANGE_EXC (g, 0, Green_levels)) 3359 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3395 continue;
3396
3397 if (!IN_RANGE_EXC (b, 0, Blue_levels)) 3360 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3398 continue;
3399 3361
3400 unsigned int index = colorcube_index (r, g, b); 3362 unsigned int index = colorcube_index (r, g, b);
3363
3364 if (rgb24_color[index] == color)
3365 {
3366 rgb24_seqno[index] = ++rgb24_sequence;
3367 return index + minTermCOLOR24;
3368 }
3401 3369
3402 // minor issue: could update index 0 few more times 3370 // minor issue: could update index 0 few more times
3403 if ((rgb24_seqno[index] | rgb24_color[index]) == 0) 3371 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3404 { 3372 {
3405 idx = index; 3373 idx = index;
3406 goto update; 3374 goto update;
3407 } 3375 }
3408
3409 if (rgb24_color[index] == color)
3410 return index + minTermCOLOR24;
3411 3376
3412 // like (rgb24_seqno[idx] > rgb24_seqno[index]) 3377 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3413 // but also handles wrap around values good enough 3378 // but also handles wrap around values good enough
3414 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff) 3379 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3415 idx = index; 3380 idx = index;
… …
3419 rgb24_color[idx] = color; 3384 rgb24_color[idx] = color;
3420 rgb24_seqno[idx] = ++rgb24_sequence; 3385 rgb24_seqno[idx] = ++rgb24_sequence;
3421 3386
3422 idx += minTermCOLOR24; 3387 idx += minTermCOLOR24;
3423 pix_colors_focused [idx].free (this); 3388 pix_colors_focused [idx].free (this);
3424 pix_colors_focused [idx].set (this, rgba (r * 0x0101, 3389 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3425 g * 0x0101,
3426 b * 0x0101));
3427 update_fade_color (idx, false); 3390 update_fade_color (idx, false);
3428 3391
3429 return idx; 3392 return idx;
3430} 3393}
3431 3394
… …
3573 break; 3536 break;
3574#endif 3537#endif
3575 case URxvt_Color_border: 3538 case URxvt_Color_border:
3576 process_color_seq (op, Color_border, str, resp); 3539 process_color_seq (op, Color_border, str, resp);
3577 break; 3540 break;
3578
3579#if BG_IMAGE_FROM_ROOT
3580 case URxvt_Color_tint:
3581 process_color_seq (op, Color_tint, str, resp);
3582 {
3583 bool changed = false;
3584
3585 if (ISSET_PIXCOLOR (Color_tint))
3586 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3587
3588 if (changed)
3589 update_background ();
3590 }
3591
3592 break;
3593#endif
3594
3595#if BG_IMAGE_FROM_FILE
3596 case Rxvt_Pixmap:
3597 if (!strcmp (str, "?"))
3598 {
3599 char str[256];
3600 int h_scale = fimage.h_scale;
3601 int v_scale = fimage.v_scale;
3602 int h_align = fimage.h_align;
3603 int v_align = fimage.v_align;
3604
3605 sprintf (str, "[%dx%d+%d+%d]",
3606 h_scale, v_scale,
3607 h_align, v_align);
3608 process_xterm_seq (XTerm_title, str, CHAR_ST);
3609 }
3610 else
3611 {
3612 bool changed = false;
3613
3614 if (*str != ';')
3615 {
3616 try
3617 {
3618 fimage.set_file_geometry (this, str);
3619 changed = true;
3620 }
3621 catch (const class rxvt_failure_exception &e)
3622 {
3623 }
3624 }
3625 else
3626 {
3627 str++;
3628 if (fimage.set_geometry (str, true))
3629 changed = true;
3630 }
3631
3632 if (changed)
3633 {
3634 if (bg_window_position_sensitive ())
3635 {
3636 int x, y;
3637 get_window_origin (x, y);
3638 parent_x = x;
3639 parent_y = y;
3640 }
3641 update_background ();
3642 }
3643 }
3644 break;
3645#endif
3646 3541
3647 case XTerm_logfile: 3542 case XTerm_logfile:
3648 // TODO, when secure mode? 3543 // TODO, when secure mode?
3649 break; 3544 break;
3650 3545
… …
3807 { 1000, PrivMode_MouseX11 }, 3702 { 1000, PrivMode_MouseX11 },
3808 { 1002, PrivMode_MouseBtnEvent }, 3703 { 1002, PrivMode_MouseBtnEvent },
3809 { 1003, PrivMode_MouseAnyEvent }, 3704 { 1003, PrivMode_MouseAnyEvent },
3810#if ENABLE_FRILLS 3705#if ENABLE_FRILLS
3811 { 1004, PrivMode_FocusEvent }, 3706 { 1004, PrivMode_FocusEvent },
3812 { 1005, PrivMode_ExtModeMouse }, 3707 { 1005, PrivMode_ExtMouseUTF8 },
3708 { 1006, PrivMode_ExtMouseSGR },
3813#endif 3709#endif
3814 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3710 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3815 { 1011, PrivMode_Keypress }, // rxvt extension 3711 { 1011, PrivMode_Keypress }, // rxvt extension
3816#if ENABLE_FRILLS 3712#if ENABLE_FRILLS
3817 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3713 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3818#endif 3714#endif
3819 // 1035 enable modifiers for alt, numlock NYI 3715 // 1035 enable modifiers for alt, numlock NYI
3820 // 1036 send ESC for meta keys NYI 3716 // 1036 send ESC for meta keys NYI
3821 // 1037 send DEL for keypad delete NYI 3717 // 1037 send DEL for keypad delete NYI
3822 { 1047, PrivMode_Screen }, 3718 { 1047, PrivMode_Screen },
… …
4063 case 35: 3959 case 35:
4064 case 36: 3960 case 36:
4065 case 37: 3961 case 37:
4066 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3962 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4067 break; 3963 break;
4068 case 38: // set fg color, ISO 8613-6
4069 if (nargs > i + 2 && arg[i + 1] == 5)
4070 {
4071 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4072 i += 2;
4073 }
4074 else if (nargs > i + 4 && arg[i + 1] == 2)
4075 {
4076 unsigned int r = arg[i + 2];
4077 unsigned int g = arg[i + 3];
4078 unsigned int b = arg[i + 4];
4079 unsigned int idx = map_rgb24_color (r, g, b);
4080 scr_color (idx, Color_fg);
4081 i += 4;
4082 }
4083 break;
4084 case 39: /* default fg */ 3964 case 39: /* default fg */
4085 scr_color (Color_fg, Color_fg); 3965 scr_color (Color_fg, Color_fg);
4086 break; 3966 break;
4087 3967
4088 case 40: 3968 case 40:
… …
4093 case 45: 3973 case 45:
4094 case 46: 3974 case 46:
4095 case 47: 3975 case 47:
4096 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3976 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4097 break; 3977 break;
4098 case 48: // set bg color, ISO 8613-6
4099 if (nargs > i + 2 && arg[i + 1] == 5)
4100 {
4101 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4102 i += 2;
4103 }
4104 else if (nargs > i + 4 && arg[i + 1] == 2)
4105 {
4106 unsigned int r = arg[i + 2];
4107 unsigned int g = arg[i + 3];
4108 unsigned int b = arg[i + 4];
4109 unsigned int idx = map_rgb24_color (r, g, b);
4110 scr_color (idx, Color_bg);
4111 i += 4;
4112 }
4113 break;
4114 case 49: /* default bg */ 3978 case 49: /* default bg */
4115 scr_color (Color_bg, Color_bg); 3979 scr_color (Color_bg, Color_bg);
3980 break;
3981
3982 case 38: // set fg color, ISO 8613-6
3983 case 48: // set bg color, ISO 8613-6
3984 {
3985 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
3986 unsigned int idx;
3987
3988 if (nargs > i + 2 && arg[i + 1] == 5)
3989 {
3990 idx = minCOLOR + arg[i + 2];
3991 i += 2;
3992
3993 scr_color (idx, fgbg);
3994 }
3995 else if (nargs > i + 4 && arg[i + 1] == 2)
3996 {
3997 unsigned int r = arg[i + 2];
3998 unsigned int g = arg[i + 3];
3999 unsigned int b = arg[i + 4];
4000 unsigned int a = 0xff;
4001
4002 idx = map_rgb24_color (r, g, b, a);
4003
4004 i += 4;
4005
4006 scr_color (idx, fgbg);
4007 }
4008 }
4116 break; 4009 break;
4117 4010
4118 //case 50: // not variable spacing 4011 //case 50: // not variable spacing
4119 4012
4120#if !ENABLE_MINIMAL 4013#if !ENABLE_MINIMAL

Diff Legend

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