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.517 by root, Wed Jun 6 08:59:13 2012 UTC vs.
Revision 1.519 by root, Thu Jun 7 11:27:08 2012 UTC

1488 else 1488 else
1489 get_window_origin (x, y); 1489 get_window_origin (x, y);
1490 1490
1491 if (x != parent_x || y != parent_y) 1491 if (x != parent_x || y != parent_y)
1492 { 1492 {
1493 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1494 parent_x = x; 1493 parent_x = x;
1495 parent_y = y; 1494 parent_y = y;
1495 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1496 } 1496 }
1497 1497
1498 if (bg_set_position (x, y) 1498 if (bg_set_position (x, y)
1499 || !(bg_flags & BG_IS_VALID)) 1499 || !(bg_flags & BG_IS_VALID))
1500 moved = true; 1500 moved = true;
3472#if BG_IMAGE_FROM_FILE 3472#if BG_IMAGE_FROM_FILE
3473 case Rxvt_Pixmap: 3473 case Rxvt_Pixmap:
3474 if (!strcmp (str, "?")) 3474 if (!strcmp (str, "?"))
3475 { 3475 {
3476 char str[256]; 3476 char str[256];
3477 int h_scale = 0, v_scale = 0;
3478 int h_align = 0, v_align = 0;
3479 if (image_vec.size () > 0)
3480 {
3481 h_scale = image_vec[0].h_scale; 3477 int h_scale = fimage.h_scale;
3482 v_scale = image_vec[0].v_scale; 3478 int v_scale = fimage.v_scale;
3483 h_align = image_vec[0].h_align; 3479 int h_align = fimage.h_align;
3484 v_align = image_vec[0].v_align; 3480 int v_align = fimage.v_align;
3485 }
3486 3481
3487 sprintf (str, "[%dx%d+%d+%d]", 3482 sprintf (str, "[%dx%d+%d+%d]",
3488 h_scale, v_scale, 3483 h_scale, v_scale,
3489 h_align, v_align); 3484 h_align, v_align);
3490 process_xterm_seq (XTerm_title, str, CHAR_ST); 3485 process_xterm_seq (XTerm_title, str, CHAR_ST);
3493 { 3488 {
3494 bool changed = false; 3489 bool changed = false;
3495 3490
3496 if (*str != ';') 3491 if (*str != ';')
3497 { 3492 {
3498 if (image_vec.size () > 0)
3499 changed = image_vec[0].set_file_geometry (str);
3500 else
3501 {
3502 rxvt_image *image = new_image ();
3503 if (!image->set_file_geometry (str)) 3493 if (fimage.set_file_geometry (str))
3504 image_vec.pop_back ();
3505 else
3506 changed = true; 3494 changed = true;
3507 }
3508 } 3495 }
3509 else 3496 else
3510 { 3497 {
3511 str++; 3498 str++;
3512 if (image_vec.size () > 0)
3513 changed = image_vec[0].set_geometry (str, true); 3499 if (fimage.set_geometry (str, true))
3500 changed = true;
3514 } 3501 }
3515 3502
3516 if (changed) 3503 if (changed)
3517 { 3504 {
3518 if (bg_window_position_sensitive ()) 3505 if (bg_window_position_sensitive ())

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines