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.457 by sf-exg, Fri Oct 22 18:03:10 2010 UTC vs.
Revision 1.461 by root, Tue Nov 23 22:58:08 2010 UTC

… …
1252{ 1252{
1253 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1254 int x, y; 1254 int x, y;
1255 int code = 32; 1255 int code = 32;
1256 1256
1257 x = Pixel2Col (ev.x); 1257 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1258 y = Pixel2Row (ev.y) + 1;
1259
1259 if (ev.type == MotionNotify) 1260 if (ev.type == MotionNotify)
1260 { 1261 {
1261 if (x == mouse_row && y == mouse_col) 1262 if (x == mouse_row && y == mouse_col)
1262 return; 1263 return;
1264
1263 mouse_row = x; 1265 mouse_row = x;
1264 mouse_col = y; 1266 mouse_col = y;
1265 code += 32; 1267 code += 32;
1266 } 1268 }
1267 1269
… …
1270 else 1272 else
1271 { 1273 {
1272 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1276 if (button_number >= 3)
1275 button_number += (64 - 3); 1277 button_number += 64 - 3;
1276 } 1278 }
1277 1279
1278 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1279 { 1281 {
1280 /* 1282 /*
… …
1312 fputc ('A', stderr); 1314 fputc ('A', stderr);
1313 if (key_state & 32) 1315 if (key_state & 32)
1314 fputc ('2', stderr); 1316 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1318 button_number,
1317 x + 1, 1319 x,
1318 y + 1); 1320 y);
1319#endif 1321#endif
1320 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
1321 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1337 code + button_number + key_state,
1323 (32 + x + 1), 1338 32 + x,
1324 (32 + y + 1)); 1339 32 + y);
1325} 1340}
1326 1341
1327/*{{{ process an X event */ 1342/*{{{ process an X event */
1328void 1343void
1329rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
… …
1436 if (ev.xconfigure.window == parent[0]) 1451 if (ev.xconfigure.window == parent[0])
1437 { 1452 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1454 ;
1440 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
1474
1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1442 { 1476 {
1443 seen_resize = 1; 1477 seen_resize = 1;
1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1445 } 1479 }
1446 else 1480 else
1447 { 1481 {
1448#ifdef HAVE_BG_PIXMAP 1482#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1483 if (moved)
1450 { 1484 {
1451 if (mapped) 1485 if (mapped)
1452 update_background (); 1486 update_background ();
1453 else 1487 else
1454 bgPixmap.invalidate (); 1488 bgPixmap.invalidate ();
… …
3448 { 3482 {
3449 int changed = 0; 3483 int changed = 0;
3450 3484
3451 if (*str != ';') 3485 if (*str != ';')
3452 { 3486 {
3453 /* reset to default scaling :*/
3454 bgPixmap.unset_geometry ();
3455 if (bgPixmap.set_file (str)) /* change pixmap */ 3487 if (bgPixmap.set_file (str)) /* change pixmap */
3488 {
3456 changed++; 3489 changed++;
3457 str = strchr (str, ';'); 3490 str = strchr (str, ';');
3458 if (str == NULL) 3491 if (str == NULL)
3459 bgPixmap.set_defaultGeometry (); 3492 bgPixmap.set_defaultGeometry ();
3493 else
3494 bgPixmap.set_geometry (str+1);
3495 }
3460 } 3496 }
3461 3497 else
3462 while (str)
3463 { 3498 {
3464 str++; 3499 str++;
3465 if (bgPixmap.set_geometry (str)) 3500 if (bgPixmap.set_geometry (str, true))
3466 changed++; 3501 changed++;
3467 str = strchr (str, ';');
3468 } 3502 }
3469 3503
3470 if (changed) 3504 if (changed)
3505 {
3506 if (bgPixmap.window_position_sensitive ())
3507 {
3508 int x, y;
3509 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y);
3511 }
3471 update_background (); 3512 update_background ();
3513 }
3472 } 3514 }
3473 break; 3515 break;
3474#endif 3516#endif
3475 3517
3476 case XTerm_logfile: 3518 case XTerm_logfile:
… …
3627 { 67, PrivMode_BackSpace }, // DECBKM 3669 { 67, PrivMode_BackSpace }, // DECBKM
3628#endif 3670#endif
3629 { 1000, PrivMode_MouseX11 }, 3671 { 1000, PrivMode_MouseX11 },
3630 { 1002, PrivMode_MouseBtnEvent }, 3672 { 1002, PrivMode_MouseBtnEvent },
3631 { 1003, PrivMode_MouseAnyEvent }, 3673 { 1003, PrivMode_MouseAnyEvent },
3674#if ENABLE_FRILLS
3675 { 1005, PrivMode_ExtModeMouse },
3676#endif
3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3677 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3633 { 1011, PrivMode_Keypress }, // rxvt extension 3678 { 1011, PrivMode_Keypress }, // rxvt extension
3679#if ENABLE_FRILLS
3680 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3681#endif
3634 // 1035 enable modifiers for alt, numlock NYI 3682 // 1035 enable modifiers for alt, numlock NYI
3635 // 1036 send ESC for meta keys NYI 3683 // 1036 send ESC for meta keys NYI
3636 // 1037 send DEL for keypad delete NYI 3684 // 1037 send DEL for keypad delete NYI
3637 { 1047, PrivMode_Screen }, 3685 { 1047, PrivMode_Screen },
3638 // 1048 save and restore cursor 3686 // 1048 save and restore cursor, implemented in code
3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3687 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3688 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste }, 3689 { 2004, PrivMode_BracketPaste },
3642 }; 3690 };
3643 3691

Diff Legend

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