ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.330 by root, Sun Jul 23 04:37:51 2006 UTC

… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
90 103
91 $GRAB = $widget; 104 $GRAB = $widget;
92 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
93 106
94 $TOOLTIP_WATCHER->cb->(); 107 $TOOLTIP_WATCHER->cb->();
95 } 108 }
96 109
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 111
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
100 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
189 203
190 } 204 }
191 } 205 }
192 206
193 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
194} 216}
195 217
196############################################################################# 218#############################################################################
197 219
198package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
335sub size_request { 357sub size_request {
336 require Carp; 358 require Carp;
337 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
338} 360}
339 361
362sub baseline_shift {
363 0
364}
365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
343 if ($self->{aspect}) { 369 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
… …
419 my ($self) = @_; 445 my ($self) = @_;
420 446
421 return if $FOCUS == $self; 447 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
423 449
424 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
425 451
426 $focus->update if $focus; 452 $self->update;
427 $FOCUS->update;
428 453
429 0 454 0
430} 455}
431 456
432sub invoke_focus_out { 457sub invoke_focus_out {
433 my ($self) = @_; 458 my ($self) = @_;
434 459
435 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
436 461
437 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
438 463
439 $focus->update if $focus; #? 464 $self->update;
440 465
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 467 unless $FOCUS;
443 468
444 0 469 0
445} 470}
446 471
447sub grab_focus { 472sub grab_focus {
448 my ($self) = @_; 473 my ($self) = @_;
449 474
475 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 476 $self->emit ("focus_in");
451} 477}
452 478
453sub invoke_mouse_motion { 1 } 479sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 480sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 481sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
457 484
458sub invoke_button_down { 485sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
460 487
461 $self->grab_focus; 488 $self->grab_focus;
462 489
463 1 490 0
464} 491}
465 492
466sub connect { 493sub connect {
467 my ($self, $signal, $cb) = @_; 494 my ($self, $signal, $cb) = @_;
468 495
… …
470} 497}
471 498
472sub emit { 499sub emit {
473 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
474 501
502 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event")
504 ? $args[0]->xy ($self)
505 : ();
506
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508
475 #d##TODO# stop propagating at first true, do not use sum 509 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479} 513}
480 514
481sub find_widget { 515sub find_widget {
482 my ($self, $x, $y) = @_; 516 my ($self, $x, $y) = @_;
483 517
… …
535 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
536 570
537 # update screen rectangle 571 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 572 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 573 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 574
543 # skip widgets that are entirely outside the drawing area 575 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 578
… …
585} 617}
586 618
587sub DESTROY { 619sub DESTROY {
588 my ($self) = @_; 620 my ($self) = @_;
589 621
622 return if CFClient::in_destruct;
623
590 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
591 625
592 eval { $self->destroy }; 626 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
594} 628}
… …
973 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
974 }, 1008 },
975 ; 1009 ;
976 1010
977 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
979 slider => $slider, 1014 slider => $slider,
980 %arg, 1015 %arg,
981 ); 1016 );
982 1017
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1019 $self->add ($child) if $child;
985 1020
986 $self 1021 $self
987} 1022}
988 1023
1024#TODO# update range on size_allocate depending on child
1025
989sub add { 1026sub add {
990 my ($self, $widget) = @_; 1027 my ($self, $widget) = @_;
991 1028
992 $self->{vp}->add ($self->{child} = $widget); 1029 $self->{vp}->add ($self->{child} = $widget);
993} 1030}
994 1031
1032sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_;
1034
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev);
1038
1039 1
1040}
1041
1042sub update_slider {
1043 my ($self) = @_;
1044
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1046}
1047
995sub update { 1048sub update {
996 my ($self) = @_; 1049 my ($self) = @_;
997 1050
998 $self->SUPER::update; 1051 $self->SUPER::update;
999 1052
1000 # todo: overwrite size_allocate of child 1053 $self->update_slider;
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1054}
1004 1055
1005sub invoke_size_allocate { 1056sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
1007 1058
1008 my $child = $self->{vp}->child; 1059 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010 1060
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1061 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1062}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1063
1017############################################################################# 1064#############################################################################
1018 1065
1019package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
1020 1067
… …
1076 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1126 border => 0.6,
1080 can_events => 1, 1127 can_events => 1,
1081 min_w => 16, 1128 min_w => 64,
1082 min_h => 16, 1129 min_h => 32,
1083 %arg, 1130 %arg,
1084 ); 1131 );
1085 1132
1086 $self->{title_widget} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1087 align => 0, 1134 align => 0,
… …
1092 1139
1093 if ($self->{has_close_button}) { 1140 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1141 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1142 new CFClient::UI::ImageButton
1096 path => 'x1_close.png', 1143 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1144 on_activate => sub { $self->emit ("delete") };
1098 1145
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1146 $self->CFClient::UI::Container::add ($self->{close_button});
1100 } 1147 }
1101 1148
1102 $self 1149 $self
… …
1148 $self->child->configure ($border, $border, $w, $h); 1195 $self->child->configure ($border, $border, $w, $h);
1149 1196
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1198 if $self->{close_button};
1152 1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1207
1153 1 1208 1
1154} 1209}
1155 1210
1156sub invoke_button_down { 1211sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
… …
1579 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1580 1635
1581 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1583 1638
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1586 1640
1587 delete $self->{size_req}; 1641 delete $self->{size_req};
1588 $self->realloc; 1642 $self->realloc;
1589 $self->update; 1643 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1597 1651
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1653
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1602 1655
1603 delete $self->{size_req}; 1656 delete $self->{size_req};
1604 $self->realloc; 1657 $self->realloc;
1605 $self->update; 1658 $self->update;
… …
1617 1670
1618 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1619 1672
1620 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1674 $self->{template}->set_font ($self->{font}) if $self->{font};
1675 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1677
1624 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1625 1679
1626 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
… …
1631 }; 1685 };
1632 1686
1633 @{ $self->{size_req} } 1687 @{ $self->{size_req} }
1634} 1688}
1635 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1636sub invoke_size_allocate { 1694sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1638 1696
1639 delete $self->{ox}; 1697 delete $self->{ox};
1640 1698
… …
1646 1704
1647sub set_fontsize { 1705sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1649 1707
1650 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1651 delete $self->{texture}; 1710 delete $self->{texture};
1652 1711
1653 $self->realloc; 1712 $self->realloc;
1654} 1713}
1655 1714
1656sub reconfigure { 1715sub reconfigure {
1657 my ($self) = @_; 1716 my ($self) = @_;
1658 1717
1659 delete $self->{size_req}; 1718 delete $self->{size_req};
1719 delete $self->{texture};
1660 1720
1661 $self->SUPER::reconfigure; 1721 $self->SUPER::reconfigure;
1662} 1722}
1663 1723
1664sub _draw { 1724sub _draw {
1665 my ($self) = @_; 1725 my ($self) = @_;
1666 1726
1667 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1668 1728
1669 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1736
1677 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1678 }; 1738 };
1679 1739
1680 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1684 1744
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1748 };
1689 1749
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1752
1695 if ($tex->{format} == GL_ALPHA) { 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 1754}
1706 1755
1707############################################################################# 1756#############################################################################
1708 1757
1709package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1820 1869
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1871
1823 # byte-index to char-index 1872 # byte-index to char-index
1824 my $text = $self->{text}; 1873 my $text = $self->{text};
1825 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1827 1876
1828 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1829 $self->update; 1878 $self->update;
1830 1879
1831 1 1880 1
… …
2051 my ($self) = @_; 2100 my ($self) = @_;
2052 2101
2053 (6) x 2 2102 (6) x 2
2054} 2103}
2055 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
2056sub invoke_button_down { 2113sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
2058 2115
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 2118 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 2119 } else {
2064 return 0 2120 return 0
2065 } 2121 }
2066 2122
2067 1 2123 1
… …
2103 my $self = $class->SUPER::new ( 2159 my $self = $class->SUPER::new (
2104 can_events => 0, 2160 can_events => 0,
2105 @_, 2161 @_,
2106 ); 2162 );
2107 2163
2108 $self->{path} 2164 $self->{path} || $self->{tex}
2109 or Carp::croak "required attribute 'path' not set"; 2165 or Carp::croak "'path' or 'tex' attributes required";
2110 2166
2111 $self->{tex} = $texture_cache{$self->{path}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113 2169
2114 Scalar::Util::weaken $texture_cache{$self->{path}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2171
2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2238 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2239 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2240 2296
2241 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2242 my $h2 = $self->{h} * (1 - $ycut2); 2298 my $h2 = $self->{h} * (1 - $ycut2);
2299 my $h3 = $self->{h};
2300
2301 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243 2302
2244 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
… …
2266 2325
2267 if ($t3) { 2326 if ($t3) {
2268 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2269 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2270 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274 glEnd; 2333 glEnd;
2275 } 2334 }
2276 2335
2277 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2433 } 2492 }
2434 2493
2435 1 2494 1
2436} 2495}
2437 2496
2497sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_;
2499
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2503
2504 ! ! $delta
2505}
2506
2438sub update { 2507sub update {
2439 my ($self) = @_; 2508 my ($self) = @_;
2440 2509
2441 delete $self->{knob_w}; 2510 delete $self->{knob_w};
2442 $self->SUPER::update; 2511 $self->SUPER::update;
… …
2541sub new { 2610sub new {
2542 my $class = shift; 2611 my $class = shift;
2543 2612
2544 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2545 fontsize => 1, 2614 fontsize => 1,
2546 can_events => 0, 2615 can_events => 1,
2547 indent => 0, 2616 indent => 0,
2548 #font => default_font 2617 #font => default_font
2549 @_, 2618 @_,
2550 2619
2551 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2552 par => [], 2621 par => [],
2553 height => 0, 2622 height => 0,
2554 children => [ 2623 children => [
2555 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2556 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2567 2636
2568 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2569 $self->reflow; 2638 $self->reflow;
2570} 2639}
2571 2640
2572sub visible_children { 2641sub size_request {
2573 my ($self) = @_; 2642 my ($self) = @_;
2574 2643
2575 @{$self->{children}}[0,1] 2644 my ($empty, $slider) = @{ $self->{children} };
2645
2646 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request
2576} 2648}
2577 2649
2578sub invoke_size_allocate { 2650sub invoke_size_allocate {
2579 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2580 2652
2581 my (undef, undef, @other) = @{ $self->{children} }; 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other; 2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583 2655
2584 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586 $self->{layout}->set_width ($self->{children}[0]{w}); 2658 $self->{layout}->set_width ($empty->{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588 2660
2589 $self->reflow; 2661 $self->reflow;
2590 2662
2663 local $self->{children} = [$empty, $slider];
2591 $self->SUPER::invoke_size_allocate ($w, $h) 2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2668 my ($self, $ev) = @_;
2669
2670 return 0 unless $ev->{dy}; # only vertical movements
2671
2672 $self->{children}[1]->emit (mouse_wheel => $ev);
2673
2674 1
2592} 2675}
2593 2676
2594sub get_layout { 2677sub get_layout {
2595 my ($self, $para) = @_; 2678 my ($self, $para) = @_;
2596 2679
2597 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2598 2681
2599 $layout->set_font ($self->{font}) if $self->{font}; 2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent}); 2685 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2686 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603 $layout->set_markup ($para->{markup}); 2687 $layout->set_markup ($para->{markup});
2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}}); 2688
2689 $layout->set_shapes (
2690 map
2691 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2692 @{$para->{widget}}
2693 );
2605 2694
2606 $layout 2695 $layout
2607} 2696}
2608 2697
2609sub reflow { 2698sub reflow {
… …
2677 for my $para (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679 my $layout = $self->get_layout ($para); 2768 my $layout = $self->get_layout ($para);
2680 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2681 2770
2682 $para->{w} = $w + $para->{indent}; 2771 $para->{w} = $w + $para->{indent};
2683 $para->{h} = $h; 2772 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped; 2773 $para->{wrapped} = $layout->has_wrapped;
2685 } 2774 }
2686 2775
2687 $height += $para->{h}; 2776 $height += $para->{h};
2688 } 2777 }
… …
2707 my $y0 = $top; 2796 my $y0 = $top;
2708 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2709 2798
2710 my $y = 0; 2799 my $y = 0;
2711 2800
2712 glEnable GL_BLEND;
2713 #TODO# not correct in windows where rgba is forced off
2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2715
2716 for my $para (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2717 my $h = $para->{h}; 2802 my $h = $para->{h};
2718 2803
2719 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2720 2805
2721 my $layout = $self->get_layout ($para); 2806 my $layout = $self->get_layout ($para);
2722 2807
2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725 glRasterPos $para->{indent}, $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727 2809
2728 if (my @w = @{ $para->{widget} }) { 2810 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes; 2811 my @s = $layout->get_shapes;
2730 2812
2731 for (@w) { 2813 for (@w) {
… …
2739 } 2821 }
2740 } 2822 }
2741 2823
2742 $y += $h; 2824 $y += $h;
2743 } 2825 }
2744
2745 glDisable GL_BLEND;
2746 }; 2826 };
2747 }); 2827 });
2748} 2828}
2749 2829
2750sub reconfigure { 2830sub reconfigure {
… …
3046 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
3047 my ($widget, $cb, $tooltip) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
3048 3128
3049 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
3050 if (!ref $widget) { 3130 if (!ref $widget) {
3131 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2;
3133
3134 $widget = new CFClient::UI::HBox
3135 can_hover => 1,
3136 can_events => 1,
3137 tooltip => $tooltip,
3138 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1),
3141 ],
3142 ;
3143
3144 } else {
3051 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
3052 can_hover => 1, 3146 can_hover => 1,
3053 can_events => 1, 3147 can_events => 1,
3054 markup => $widget, 3148 markup => $widget,
3055 tooltip => $tooltip 3149 tooltip => $tooltip;
3150 }
3056 } 3151 }
3057 3152
3058 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
3059 3154
3060 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
3127 3222
3128 $self->SUPER::add (@widgets); 3223 $self->SUPER::add (@widgets);
3129 3224
3130 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} }; 3226 if @{ $self->{children} };
3227}
3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3132} 3233}
3133 3234
3134sub set_current_page { 3235sub set_current_page {
3135 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
3136 3237
… …
3202 tooltip => $tooltip, 3303 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) }, 3304 on_activate => sub { $self->set_current_page ($widget) },
3204 ); 3305 );
3205 3306
3206 $self->{multiplexer}->add ($widget); 3307 $self->{multiplexer}->add ($widget);
3308}
3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3207} 3314}
3208 3315
3209sub set_current_page { 3316sub set_current_page {
3210 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3211 3318
… …
3389 count => 1, 3496 count => 1,
3390 %arg, 3497 %arg,
3391 }; 3498 };
3392 } 3499 }
3393 3500
3501 $ROOT->on_refresh (reorder => sub {
3394 $self->reorder; 3502 $self->reorder;
3503 });
3395} 3504}
3396 3505
3397sub reconfigure { 3506sub reconfigure {
3398 my ($self) = @_; 3507 my ($self) = @_;
3399 3508
… …
3414 3523
3415############################################################################# 3524#############################################################################
3416 3525
3417package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3418 3527
3419our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3420 3529
3421sub new { 3530sub new {
3422 my $class = shift; 3531 my $class = shift;
3423 3532
3424 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3426 @_, 3535 @_,
3427 ); 3536 );
3428 3537
3429 $self 3538 $self
3430} 3539}
3431 3540
3432sub set_items { 3541sub set_items {
3433 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3434 3543
3435 $self->{child}->clear; 3544 $self->clear;
3436 return unless $items; 3545 return unless $items;
3437 3546
3438 my @items = sort { 3547 my @items = sort {
3439 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3441 } @$items; 3550 } values %$items;
3442 3551
3443 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3444 3553
3445 my $row = 0; 3554 my $row = 0;
3446 for my $item (@items) { 3555 for my $item (@items) {
3447 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3448 3557
3449 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3452 3561
3453 $row++; 3562 $row++;
3454 }
3455}
3456
3457#############################################################################
3458
3459package CFClient::UI::BindEditor;
3460
3461our @ISA = CFClient::UI::FancyFrame::;
3462
3463sub new {
3464 my $class = shift;
3465
3466 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468 $self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472 text => "start recording",
3473 tooltip => "Start/Stops recording of actions."
3474 ."All subsequent actions after the recording started will be captured."
3475 ."The actions are displayed after the record was stopped."
3476 ."To bind the action you have to click on the 'Bind' button",
3477 on_activate => sub {
3478 unless ($self->{recording}) {
3479 $self->start;
3480 } else {
3481 $self->stop;
3482 }
3483 });
3484
3485 $vb->add (new CFClient::UI::Label text => "Actions:");
3486 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3489 $vb->add (my $hb = new CFClient::UI::HBox);
3490 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491 $hb->add (new CFClient::UI::Button
3492 text => "bind",
3493 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494 on_activate => sub {
3495 $self->ask_for_bind;
3496 });
3497
3498 $vb->add (my $hb = new CFClient::UI::HBox);
3499 $hb->add (new CFClient::UI::Button
3500 text => "ok",
3501 expand => 1,
3502 tooltip => "This closes the binding editor and saves the binding",
3503 on_activate => sub {
3504 $self->hide;
3505 $self->commit;
3506 });
3507
3508 $hb->add (new CFClient::UI::Button
3509 text => "cancel",
3510 expand => 1,
3511 tooltip => "This closes the binding editor without saving",
3512 on_activate => sub {
3513 $self->hide;
3514 $self->{binding_cancel}->()
3515 if $self->{binding_cancel};
3516 });
3517
3518 $self->update_binding_widgets;
3519
3520 $self
3521}
3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3535sub commit {
3536 my ($self) = @_;
3537 my ($mod, $sym, $cmds) = $self->get_binding;
3538 if ($sym != 0 && @$cmds > 0) {
3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540 ."'. Don't forget 'Save Config'!");
3541 $self->{binding_change}->($mod, $sym, $cmds)
3542 if $self->{binding_change};
3543 } else {
3544 $::STATUSBOX->add ("No action bound, no key or action specified!");
3545 $self->{binding_cancel}->()
3546 if $self->{binding_cancel};
3547 }
3548}
3549
3550sub start {
3551 my ($self) = @_;
3552
3553 $self->{rec_btn}->set_text ("stop recording");
3554 $self->{recording} = 1;
3555 $self->clear_command_list;
3556 $::CONN->start_record if $::CONN;
3557}
3558
3559sub stop {
3560 my ($self) = @_;
3561
3562 $self->{rec_btn}->set_text ("start recording");
3563 $self->{recording} = 0;
3564
3565 my $rec;
3566 $rec = $::CONN->stop_record if $::CONN;
3567 return unless ref $rec eq 'ARRAY';
3568 $self->set_command_list ($rec);
3569}
3570
3571
3572sub ask_for_bind_and_commit {
3573 my ($self) = @_;
3574 $self->ask_for_bind (1);
3575}
3576
3577sub ask_for_bind {
3578 my ($self, $commit, $end_cb) = @_;
3579
3580 CFClient::Binder::open_binding_dialog (sub {
3581 my ($mod, $sym) = @_;
3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583 $self->update_binding_widgets;
3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3586 });
3587}
3588
3589# $mod and $sym are the modifiers and key symbol
3590# $cmds is a array ref of strings (the commands)
3591# $cb is the callback that is executed on OK
3592# $ccb is the callback that is executed on CANCEL and
3593# when the binding was unsuccessful on OK
3594sub set_binding {
3595 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597 $self->clear_command_list;
3598 $self->{recording} = 0;
3599 $self->{rec_btn}->set_text ("start recording");
3600
3601 $self->{binding} = [$mod, $sym];
3602 $self->{commands} = $cmds;
3603
3604 $self->{binding_change} = $cb;
3605 $self->{binding_cancel} = $ccb;
3606
3607 $self->update_binding_widgets;
3608}
3609
3610# this is a shortcut method that asks for a binding
3611# and then just binds it.
3612sub do_quick_binding {
3613 my ($self, $cmds, $end_cb) = @_;
3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615 $self->ask_for_bind (1, $end_cb);
3616}
3617
3618sub update_binding_widgets {
3619 my ($self) = @_;
3620 my ($mod, $sym, $cmds) = $self->get_binding;
3621 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622 $self->set_command_list ($cmds);
3623}
3624
3625sub get_binding {
3626 my ($self) = @_;
3627 return (
3628 $self->{binding}->[0],
3629 $self->{binding}->[1],
3630 [ grep { defined $_ } @{$self->{commands}} ]
3631 );
3632}
3633
3634sub clear_command_list {
3635 my ($self) = @_;
3636 $self->{cmdbox}->clear ();
3637}
3638
3639sub set_command_list {
3640 my ($self, $cmds) = @_;
3641
3642 $self->{cmdbox}->clear ();
3643 $self->{commands} = $cmds;
3644
3645 my $idx = 0;
3646
3647 for (@$cmds) {
3648 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650 my $i = $idx;
3651 $hb->add (new CFClient::UI::Label text => $_);
3652 $hb->add (new CFClient::UI::Button
3653 text => "delete",
3654 tooltip => "Deletes the action from the record",
3655 on_activate => sub {
3656 $self->{cmdbox}->remove ($hb);
3657 $cmds->[$i] = undef;
3658 });
3659
3660
3661 $idx++
3662 } 3563 }
3663} 3564}
3664 3565
3665############################################################################# 3566#############################################################################
3666 3567
… …
3720 } elsif ($ev->{button} == 2) { 3621 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}"); 3622 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) { 3623 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu 3624 (new CFClient::UI::Menu
3724 items => [ 3625 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ], 3628 ],
3728 )->popup ($ev); 3629 )->popup ($ev);
3729 } else { 3630 } else {
3730 return 0; 3631 return 0;
… …
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 3878
3978 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3980 3881
3882 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887
3981 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3982 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3983 3890
3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w}; 3892 $widget->{old_w} = $widget->{w};

Diff Legend

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