… | |
… | |
198 | r & RS_Uline ? " uline" : "", |
198 | r & RS_Uline ? " uline" : "", |
199 | r & RS_Careful ? " careful" : ""); |
199 | r & RS_Careful ? " careful" : ""); |
200 | |
200 | |
201 | int width = wcswidth (fname, wcslen (fname)); |
201 | int width = wcswidth (fname, wcslen (fname)); |
202 | |
202 | |
203 | max_it (width, 8+5); // for char + hey |
203 | max_it (width, 8+5); // for char + hex |
204 | max_it (width, strlen (attr)); |
204 | max_it (width, strlen (attr)); |
205 | |
205 | |
206 | if (y >= 0) |
206 | if (y >= 0) |
207 | { |
207 | { |
208 | y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; |
208 | y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; |
… | |
… | |
1041 | } |
1041 | } |
1042 | |
1042 | |
1043 | display->flush (); |
1043 | display->flush (); |
1044 | } |
1044 | } |
1045 | |
1045 | |
|
|
1046 | /* checks wether a refresh is requested and starts the refresh timer */ |
1046 | void |
1047 | void |
1047 | rxvt_term::prepare_cb (ev::prepare &w, int revents) |
1048 | rxvt_term::refresh_check () |
1048 | { |
1049 | { |
1049 | make_current (); |
|
|
1050 | |
|
|
1051 | display->flush (); |
|
|
1052 | |
|
|
1053 | if (want_refresh && !flush_ev.is_active ()) |
1050 | if (want_refresh && !flush_ev.is_active ()) |
1054 | flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally |
1051 | flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally |
|
|
1052 | |
|
|
1053 | display->flush (); |
1055 | } |
1054 | } |
1056 | |
1055 | |
1057 | void |
1056 | void |
1058 | rxvt_term::flush_cb (ev::timer &w, int revents) |
1057 | rxvt_term::flush_cb (ev::timer &w, int revents) |
1059 | { |
1058 | { |
… | |
… | |
1067 | void |
1066 | void |
1068 | rxvt_term::cursor_blink_cb (ev::timer &w, int revents) |
1067 | rxvt_term::cursor_blink_cb (ev::timer &w, int revents) |
1069 | { |
1068 | { |
1070 | hidden_cursor = !hidden_cursor; |
1069 | hidden_cursor = !hidden_cursor; |
1071 | want_refresh = 1; |
1070 | want_refresh = 1; |
|
|
1071 | refresh_check (); |
1072 | } |
1072 | } |
1073 | #endif |
1073 | #endif |
1074 | |
1074 | |
1075 | #ifdef TEXT_BLINK |
1075 | #ifdef TEXT_BLINK |
1076 | void |
1076 | void |
… | |
… | |
1078 | { |
1078 | { |
1079 | if (scr_refresh_rend (RS_Blink, RS_Blink)) |
1079 | if (scr_refresh_rend (RS_Blink, RS_Blink)) |
1080 | { |
1080 | { |
1081 | hidden_text = !hidden_text; |
1081 | hidden_text = !hidden_text; |
1082 | want_refresh = 1; |
1082 | want_refresh = 1; |
|
|
1083 | refresh_check (); |
1083 | } |
1084 | } |
1084 | else |
1085 | else |
1085 | w.stop (); |
1086 | w.stop (); |
1086 | } |
1087 | } |
1087 | #endif |
1088 | #endif |
1088 | |
1089 | |
1089 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1090 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1090 | void |
1091 | void |
1091 | rxvt_term::cont_scroll_cb (ev::timer &w, int revents) |
1092 | rxvt_term::cont_scroll_cb (ev::timer &w, int revents) |
1092 | { |
1093 | { |
1093 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1094 | if ((scrollbar_isUp () || scrollbar_isDn ()) |
1094 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1095 | && scr_page (scrollbar_isUp () ? UP : DN, 1)) |
|
|
1096 | { |
1095 | want_refresh = 1; |
1097 | want_refresh = 1; |
|
|
1098 | refresh_check (); |
|
|
1099 | } |
1096 | else |
1100 | else |
1097 | w.stop (); |
1101 | w.stop (); |
1098 | } |
1102 | } |
1099 | #endif |
1103 | #endif |
1100 | |
1104 | |
… | |
… | |
1104 | { |
1108 | { |
1105 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1109 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1106 | { |
1110 | { |
1107 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1111 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1108 | want_refresh = 1; |
1112 | want_refresh = 1; |
|
|
1113 | refresh_check (); |
1109 | } |
1114 | } |
1110 | else |
1115 | else |
1111 | w.stop (); |
1116 | w.stop (); |
1112 | } |
1117 | } |
1113 | #endif |
1118 | #endif |
1114 | |
1119 | |
1115 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1120 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1116 | void |
1121 | void |
1117 | rxvt_term::slip_wheel_cb (ev::timer &w, int revents) |
1122 | rxvt_term::slip_wheel_cb (ev::timer &w, int revents) |
1118 | { |
1123 | { |
1119 | if (scr_page (mouse_slip_wheel_speed < 0 ? DN : UP, abs (mouse_slip_wheel_speed))) |
1124 | if (scr_changeview (view_start - mouse_slip_wheel_speed)) |
|
|
1125 | { |
1120 | want_refresh = 1; |
1126 | want_refresh = 1; |
|
|
1127 | refresh_check (); |
|
|
1128 | } |
1121 | |
1129 | |
1122 | if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0) |
1130 | if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0) |
1123 | { |
1131 | { |
1124 | mouse_slip_wheel_speed = 0; |
1132 | mouse_slip_wheel_speed = 0; |
1125 | w.stop (); |
1133 | w.stop (); |
… | |
… | |
1203 | if (cmd_parse ()) |
1211 | if (cmd_parse ()) |
1204 | break; |
1212 | break; |
1205 | |
1213 | |
1206 | if (revents & ev::WRITE) |
1214 | if (revents & ev::WRITE) |
1207 | pty_write (); |
1215 | pty_write (); |
|
|
1216 | |
|
|
1217 | refresh_check (); |
1208 | } |
1218 | } |
1209 | |
1219 | |
1210 | void |
1220 | void |
1211 | rxvt_term::pointer_unblank () |
1221 | rxvt_term::pointer_unblank () |
1212 | { |
1222 | { |
… | |
… | |
1447 | #ifdef HAVE_BG_PIXMAP |
1457 | #ifdef HAVE_BG_PIXMAP |
1448 | if (bgPixmap.window_position_sensitive ()) |
1458 | if (bgPixmap.window_position_sensitive ()) |
1449 | update_background (); |
1459 | update_background (); |
1450 | #endif |
1460 | #endif |
1451 | } |
1461 | } |
|
|
1462 | |
1452 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1463 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1453 | } |
1464 | } |
1454 | break; |
1465 | break; |
1455 | |
1466 | |
1456 | case PropertyNotify: |
1467 | case PropertyNotify: |
… | |
… | |
1506 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) |
1517 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) |
1507 | { |
1518 | { |
1508 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1519 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1509 | ev.xexpose.width, ev.xexpose.height, False); |
1520 | ev.xexpose.width, ev.xexpose.height, False); |
1510 | } |
1521 | } |
|
|
1522 | |
1511 | want_refresh = 1; |
1523 | want_refresh = 1; |
1512 | } |
1524 | } |
1513 | else |
1525 | else |
1514 | { |
1526 | { |
1515 | XEvent unused_event; |
1527 | XEvent unused_event; |
… | |
… | |
1662 | |
1674 | |
1663 | if (ev.type == KeyPress && hidden_pointer == 0) |
1675 | if (ev.type == KeyPress && hidden_pointer == 0) |
1664 | pointer_blank (); |
1676 | pointer_blank (); |
1665 | } |
1677 | } |
1666 | #endif |
1678 | #endif |
|
|
1679 | |
|
|
1680 | refresh_check (); |
1667 | } |
1681 | } |
1668 | |
1682 | |
1669 | void |
1683 | void |
1670 | rxvt_term::focus_in () |
1684 | rxvt_term::focus_in () |
1671 | { |
1685 | { |
… | |
… | |
1781 | || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) |
1795 | || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) |
1782 | { |
1796 | { |
1783 | bgPixmap.set_root_pixmap (); |
1797 | bgPixmap.set_root_pixmap (); |
1784 | update_background (); |
1798 | update_background (); |
1785 | } |
1799 | } |
|
|
1800 | |
1786 | break; |
1801 | break; |
1787 | } |
1802 | } |
1788 | # endif |
1803 | # endif |
|
|
1804 | |
|
|
1805 | refresh_check (); |
1789 | } |
1806 | } |
1790 | #endif |
1807 | #endif |
1791 | |
1808 | |
1792 | void |
1809 | void |
1793 | rxvt_term::button_press (XButtonEvent &ev) |
1810 | rxvt_term::button_press (XButtonEvent &ev) |
… | |
… | |
3374 | #if ENABLE_TRANSPARENCY |
3391 | #if ENABLE_TRANSPARENCY |
3375 | case URxvt_Color_tint: |
3392 | case URxvt_Color_tint: |
3376 | process_color_seq (op, Color_tint, str, resp); |
3393 | process_color_seq (op, Color_tint, str, resp); |
3377 | { |
3394 | { |
3378 | bool changed = false; |
3395 | bool changed = false; |
|
|
3396 | |
3379 | if (ISSET_PIXCOLOR (Color_tint)) |
3397 | if (ISSET_PIXCOLOR (Color_tint)) |
3380 | changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
3398 | changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
3381 | else |
3399 | else |
3382 | changed = bgPixmap.unset_tint (); |
3400 | changed = bgPixmap.unset_tint (); |
|
|
3401 | |
3383 | if (changed) |
3402 | if (changed) |
3384 | update_background (); |
3403 | update_background (); |
3385 | } |
3404 | } |
3386 | |
3405 | |
3387 | break; |
3406 | break; |
… | |
… | |
3410 | changed++; |
3429 | changed++; |
3411 | str = strchr (str, ';'); |
3430 | str = strchr (str, ';'); |
3412 | if (str == NULL) |
3431 | if (str == NULL) |
3413 | bgPixmap.set_defaultGeometry (); |
3432 | bgPixmap.set_defaultGeometry (); |
3414 | } |
3433 | } |
|
|
3434 | |
3415 | while (str) |
3435 | while (str) |
3416 | { |
3436 | { |
3417 | str++; |
3437 | str++; |
3418 | if (bgPixmap.set_geometry (str)) |
3438 | if (bgPixmap.set_geometry (str)) |
3419 | changed++; |
3439 | changed++; |
3420 | str = strchr (str, ';'); |
3440 | str = strchr (str, ';'); |
3421 | } |
3441 | } |
|
|
3442 | |
3422 | if (changed) |
3443 | if (changed) |
3423 | update_background (); |
3444 | update_background (); |
3424 | } |
3445 | } |
3425 | break; |
3446 | break; |
3426 | #endif |
3447 | #endif |
3427 | |
3448 | |
3428 | case Rxvt_restoreFG: |
3449 | case Rxvt_restoreFG: |