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.331 by root, Sun Jul 23 04:46:02 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);
… …
403 429
404# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
405sub coord2local { 431sub coord2local {
406 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
407 433
434 Carp::confess unless $self->{parent};#d#
435
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 437}
410 438
411# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
412sub coord2global { 440sub coord2global {
… …
419 my ($self) = @_; 447 my ($self) = @_;
420 448
421 return if $FOCUS == $self; 449 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 450 return unless $self->{can_focus};
423 451
424 my $focus = $FOCUS; $FOCUS = $self; 452 $FOCUS = $self;
425 453
426 $focus->update if $focus; 454 $self->update;
427 $FOCUS->update;
428 455
429 0 456 0
430} 457}
431 458
432sub invoke_focus_out { 459sub invoke_focus_out {
433 my ($self) = @_; 460 my ($self) = @_;
434 461
435 return unless $FOCUS == $self; 462 return unless $FOCUS == $self;
436 463
437 my $focus = $FOCUS; undef $FOCUS; 464 undef $FOCUS;
438 465
439 $focus->update if $focus; #? 466 $self->update;
440 467
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 468 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 469 unless $FOCUS;
443 470
444 0 471 0
445} 472}
446 473
447sub grab_focus { 474sub grab_focus {
448 my ($self) = @_; 475 my ($self) = @_;
449 476
477 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 478 $self->emit ("focus_in");
451} 479}
452 480
453sub invoke_mouse_motion { 1 } 481sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 482sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 483sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 484sub invoke_key_up { 0 }
485sub invoke_mouse_wheel { 0 }
457 486
458sub invoke_button_down { 487sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 488 my ($self, $ev, $x, $y) = @_;
460 489
461 $self->grab_focus; 490 $self->grab_focus;
462 491
463 1 492 0
464} 493}
465 494
466sub connect { 495sub connect {
467 my ($self, $signal, $cb) = @_; 496 my ($self, $signal, $cb) = @_;
468 497
469 push @{ $self->{signal_cb}{$signal} }, $cb; 498 push @{ $self->{signal_cb}{$signal} }, $cb;
470} 499}
471 500
501my %has_coords = (
502 button_down => 1,
503 button_up => 1,
504 mouse_motion => 1,
505 mouse_wheel => 1,
506);
507
472sub emit { 508sub emit {
473 my ($self, $signal, @args) = @_; 509 my ($self, $signal, @args) = @_;
474 510
511 my @append
512 = $has_coords{$signal}
513 ? $args[0]->xy ($self)
514 : ();
515
516 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517
475 #d##TODO# stop propagating at first true, do not use sum 518 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 519 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 520 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 521 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479} 522}
480 523
481sub find_widget { 524sub find_widget {
482 my ($self, $x, $y) = @_; 525 my ($self, $x, $y) = @_;
483 526
… …
535 return unless $self->{h} && $self->{w}; 578 return unless $self->{h} && $self->{w};
536 579
537 # update screen rectangle 580 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 581 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 582 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 583
543 # skip widgets that are entirely outside the drawing area 584 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 585 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 586 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 587
… …
585} 626}
586 627
587sub DESTROY { 628sub DESTROY {
588 my ($self) = @_; 629 my ($self) = @_;
589 630
631 return if CFClient::in_destruct;
632
590 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
591 634
592 eval { $self->destroy }; 635 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
594} 637}
… …
973 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
974 }, 1017 },
975 ; 1018 ;
976 1019
977 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
979 slider => $slider, 1023 slider => $slider,
980 %arg, 1024 %arg,
981 ); 1025 );
982 1026
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1028 $self->add ($child) if $child;
985 1029
986 $self 1030 $self
987} 1031}
988 1032
1033#TODO# update range on size_allocate depending on child
1034
989sub add { 1035sub add {
990 my ($self, $widget) = @_; 1036 my ($self, $widget) = @_;
991 1037
992 $self->{vp}->add ($self->{child} = $widget); 1038 $self->{vp}->add ($self->{child} = $widget);
993} 1039}
994 1040
1041sub invoke_mouse_wheel {
1042 my ($self, $ev) = @_;
1043
1044 return 0 unless $ev->{dy}; # only vertical movements
1045
1046 $self->{slider}->emit (mouse_wheel => $ev);
1047
1048 1
1049}
1050
1051sub update_slider {
1052 my ($self) = @_;
1053
1054 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1055}
1056
995sub update { 1057sub update {
996 my ($self) = @_; 1058 my ($self) = @_;
997 1059
998 $self->SUPER::update; 1060 $self->SUPER::update;
999 1061
1000 # todo: overwrite size_allocate of child 1062 $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} 1063}
1004 1064
1005sub invoke_size_allocate { 1065sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h) = @_;
1007 1067
1008 my $child = $self->{vp}->child; 1068 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010 1069
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1070 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1071}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1072
1017############################################################################# 1073#############################################################################
1018 1074
1019package CFClient::UI::Frame; 1075package CFClient::UI::Frame;
1020 1076
… …
1076 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1135 border => 0.6,
1080 can_events => 1, 1136 can_events => 1,
1081 min_w => 16, 1137 min_w => 64,
1082 min_h => 16, 1138 min_h => 32,
1083 %arg, 1139 %arg,
1084 ); 1140 );
1085 1141
1086 $self->{title_widget} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1087 align => 0, 1143 align => 0,
… …
1092 1148
1093 if ($self->{has_close_button}) { 1149 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1150 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1151 new CFClient::UI::ImageButton
1096 path => 'x1_close.png', 1152 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1153 on_activate => sub { $self->emit ("delete") };
1098 1154
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1155 $self->CFClient::UI::Container::add ($self->{close_button});
1100 } 1156 }
1101 1157
1102 $self 1158 $self
… …
1148 $self->child->configure ($border, $border, $w, $h); 1204 $self->child->configure ($border, $border, $w, $h);
1149 1205
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1206 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1207 if $self->{close_button};
1152 1208
1209 1
1210}
1211
1212sub invoke_delete {
1213 my ($self) = @_;
1214
1215 $self->hide;
1216
1153 1 1217 1
1154} 1218}
1155 1219
1156sub invoke_button_down { 1220sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
… …
1579 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1580 1644
1581 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1583 1647
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1586 1649
1587 delete $self->{size_req}; 1650 delete $self->{size_req};
1588 $self->realloc; 1651 $self->realloc;
1589 $self->update; 1652 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1597 1660
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1662
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1602 1664
1603 delete $self->{size_req}; 1665 delete $self->{size_req};
1604 $self->realloc; 1666 $self->realloc;
1605 $self->update; 1667 $self->update;
… …
1617 1679
1618 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1619 1681
1620 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1683 $self->{template}->set_font ($self->{font}) if $self->{font};
1684 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1686
1624 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1625 1688
1626 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
… …
1631 }; 1694 };
1632 1695
1633 @{ $self->{size_req} } 1696 @{ $self->{size_req} }
1634} 1697}
1635 1698
1699sub baseline_shift {
1700 $_[0]{layout}->descent
1701}
1702
1636sub invoke_size_allocate { 1703sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1704 my ($self, $w, $h) = @_;
1638 1705
1639 delete $self->{ox}; 1706 delete $self->{ox};
1640 1707
… …
1646 1713
1647sub set_fontsize { 1714sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1649 1716
1650 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1651 delete $self->{texture}; 1719 delete $self->{texture};
1652 1720
1653 $self->realloc; 1721 $self->realloc;
1654} 1722}
1655 1723
1656sub reconfigure { 1724sub reconfigure {
1657 my ($self) = @_; 1725 my ($self) = @_;
1658 1726
1659 delete $self->{size_req}; 1727 delete $self->{size_req};
1728 delete $self->{texture};
1660 1729
1661 $self->SUPER::reconfigure; 1730 $self->SUPER::reconfigure;
1662} 1731}
1663 1732
1664sub _draw { 1733sub _draw {
1665 my ($self) = @_; 1734 my ($self) = @_;
1666 1735
1667 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1668 1737
1669 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1745
1677 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1678 }; 1747 };
1679 1748
1680 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1684 1753
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1757 };
1689 1758
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1761
1695 if ($tex->{format} == GL_ALPHA) { 1762 $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} 1763}
1706 1764
1707############################################################################# 1765#############################################################################
1708 1766
1709package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1820 1878
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1880
1823 # byte-index to char-index 1881 # byte-index to char-index
1824 my $text = $self->{text}; 1882 my $text = $self->{text};
1825 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1827 1885
1828 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1829 $self->update; 1887 $self->update;
1830 1888
1831 1 1889 1
… …
2051 my ($self) = @_; 2109 my ($self) = @_;
2052 2110
2053 (6) x 2 2111 (6) x 2
2054} 2112}
2055 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
2056sub invoke_button_down { 2122sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
2058 2124
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 2127 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 2128 } else {
2064 return 0 2129 return 0
2065 } 2130 }
2066 2131
2067 1 2132 1
… …
2103 my $self = $class->SUPER::new ( 2168 my $self = $class->SUPER::new (
2104 can_events => 0, 2169 can_events => 0,
2105 @_, 2170 @_,
2106 ); 2171 );
2107 2172
2108 $self->{path} 2173 $self->{path} || $self->{tex}
2109 or Carp::croak "required attribute 'path' not set"; 2174 or Carp::croak "'path' or 'tex' attributes required";
2110 2175
2111 $self->{tex} = $texture_cache{$self->{path}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2177 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113 2178
2114 Scalar::Util::weaken $texture_cache{$self->{path}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2180
2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2238 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2239 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2240 2305
2241 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2242 my $h2 = $self->{h} * (1 - $ycut2); 2307 my $h2 = $self->{h} * (1 - $ycut2);
2308 my $h3 = $self->{h};
2309
2310 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243 2311
2244 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
… …
2266 2334
2267 if ($t3) { 2335 if ($t3) {
2268 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2269 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2270 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274 glEnd; 2342 glEnd;
2275 } 2343 }
2276 2344
2277 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2433 } 2501 }
2434 2502
2435 1 2503 1
2436} 2504}
2437 2505
2506sub invoke_mouse_wheel {
2507 my ($self, $ev) = @_;
2508
2509 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510
2511 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2512
2513 ! ! $delta
2514}
2515
2438sub update { 2516sub update {
2439 my ($self) = @_; 2517 my ($self) = @_;
2440 2518
2441 delete $self->{knob_w}; 2519 delete $self->{knob_w};
2442 $self->SUPER::update; 2520 $self->SUPER::update;
… …
2541sub new { 2619sub new {
2542 my $class = shift; 2620 my $class = shift;
2543 2621
2544 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2545 fontsize => 1, 2623 fontsize => 1,
2546 can_events => 0, 2624 can_events => 1,
2547 indent => 0, 2625 indent => 0,
2548 #font => default_font 2626 #font => default_font
2549 @_, 2627 @_,
2550 2628
2551 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2552 par => [], 2630 par => [],
2553 height => 0, 2631 height => 0,
2554 children => [ 2632 children => [
2555 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2556 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2567 2645
2568 $self->{fontsize} = $fontsize; 2646 $self->{fontsize} = $fontsize;
2569 $self->reflow; 2647 $self->reflow;
2570} 2648}
2571 2649
2572sub visible_children { 2650sub size_request {
2573 my ($self) = @_; 2651 my ($self) = @_;
2574 2652
2575 @{$self->{children}}[0,1] 2653 my ($empty, $slider) = @{ $self->{children} };
2654
2655 local $self->{children} = [$empty, $slider];
2656 $self->SUPER::size_request
2576} 2657}
2577 2658
2578sub invoke_size_allocate { 2659sub invoke_size_allocate {
2579 my ($self, $w, $h) = @_; 2660 my ($self, $w, $h) = @_;
2580 2661
2581 my (undef, undef, @other) = @{ $self->{children} }; 2662 my ($empty, $slider, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other; 2663 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583 2664
2584 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2665 $self->{layout}->set_font ($self->{font}) if $self->{font};
2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2666 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586 $self->{layout}->set_width ($self->{children}[0]{w}); 2667 $self->{layout}->set_width ($empty->{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2668 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588 2669
2589 $self->reflow; 2670 $self->reflow;
2590 2671
2672 local $self->{children} = [$empty, $slider];
2591 $self->SUPER::invoke_size_allocate ($w, $h) 2673 $self->SUPER::invoke_size_allocate ($w, $h)
2674}
2675
2676sub invoke_mouse_wheel {
2677 my ($self, $ev) = @_;
2678
2679 return 0 unless $ev->{dy}; # only vertical movements
2680
2681 $self->{children}[1]->emit (mouse_wheel => $ev);
2682
2683 1
2592} 2684}
2593 2685
2594sub get_layout { 2686sub get_layout {
2595 my ($self, $para) = @_; 2687 my ($self, $para) = @_;
2596 2688
2597 my $layout = $self->{layout}; 2689 my $layout = $self->{layout};
2598 2690
2599 $layout->set_font ($self->{font}) if $self->{font}; 2691 $layout->set_font ($self->{font}) if $self->{font};
2692 $layout->set_foreground (@{$para->{fg}});
2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent}); 2694 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603 $layout->set_markup ($para->{markup}); 2696 $layout->set_markup ($para->{markup});
2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}}); 2697
2698 $layout->set_shapes (
2699 map
2700 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2701 @{$para->{widget}}
2702 );
2605 2703
2606 $layout 2704 $layout
2607} 2705}
2608 2706
2609sub reflow { 2707sub reflow {
… …
2677 for my $para (@{$self->{par}}) { 2775 for my $para (@{$self->{par}}) {
2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 2776 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679 my $layout = $self->get_layout ($para); 2777 my $layout = $self->get_layout ($para);
2680 my ($w, $h) = $layout->size; 2778 my ($w, $h) = $layout->size;
2681 2779
2682 $para->{w} = $w + $para->{indent}; 2780 $para->{w} = $w + $para->{indent};
2683 $para->{h} = $h; 2781 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped; 2782 $para->{wrapped} = $layout->has_wrapped;
2685 } 2783 }
2686 2784
2687 $height += $para->{h}; 2785 $height += $para->{h};
2688 } 2786 }
… …
2707 my $y0 = $top; 2805 my $y0 = $top;
2708 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2709 2807
2710 my $y = 0; 2808 my $y = 0;
2711 2809
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}}) { 2810 for my $para (@{$self->{par}}) {
2717 my $h = $para->{h}; 2811 my $h = $para->{h};
2718 2812
2719 if ($y0 < $y + $h && $y < $y1) { 2813 if ($y0 < $y + $h && $y < $y1) {
2720 2814
2721 my $layout = $self->get_layout ($para); 2815 my $layout = $self->get_layout ($para);
2722 2816
2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725 glRasterPos $para->{indent}, $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727 2818
2728 if (my @w = @{ $para->{widget} }) { 2819 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes; 2820 my @s = $layout->get_shapes;
2730 2821
2731 for (@w) { 2822 for (@w) {
… …
2739 } 2830 }
2740 } 2831 }
2741 2832
2742 $y += $h; 2833 $y += $h;
2743 } 2834 }
2744
2745 glDisable GL_BLEND;
2746 }; 2835 };
2747 }); 2836 });
2748} 2837}
2749 2838
2750sub reconfigure { 2839sub reconfigure {
… …
3046 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
3047 my ($widget, $cb, $tooltip) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
3048 3137
3049 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
3050 if (!ref $widget) { 3139 if (!ref $widget) {
3140 if ($widget =~ /\t/) {
3141 my ($left, $right) = split /\t/, $widget, 2;
3142
3143 $widget = new CFClient::UI::HBox
3144 can_hover => 1,
3145 can_events => 1,
3146 tooltip => $tooltip,
3147 children => [
3148 (new CFClient::UI::Label markup => $left, expand => 1),
3149 (new CFClient::UI::Label markup => $right, align => +1),
3150 ],
3151 ;
3152
3153 } else {
3051 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
3052 can_hover => 1, 3155 can_hover => 1,
3053 can_events => 1, 3156 can_events => 1,
3054 markup => $widget, 3157 markup => $widget,
3055 tooltip => $tooltip 3158 tooltip => $tooltip;
3159 }
3056 } 3160 }
3057 3161
3058 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
3059 3163
3060 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
3127 3231
3128 $self->SUPER::add (@widgets); 3232 $self->SUPER::add (@widgets);
3129 3233
3130 $self->{current} = $self->{children}[0] 3234 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} }; 3235 if @{ $self->{children} };
3236}
3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3132} 3242}
3133 3243
3134sub set_current_page { 3244sub set_current_page {
3135 my ($self, $page_or_widget) = @_; 3245 my ($self, $page_or_widget) = @_;
3136 3246
… …
3202 tooltip => $tooltip, 3312 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) }, 3313 on_activate => sub { $self->set_current_page ($widget) },
3204 ); 3314 );
3205 3315
3206 $self->{multiplexer}->add ($widget); 3316 $self->{multiplexer}->add ($widget);
3317}
3318
3319sub get_current_page {
3320 my ($self) = @_;
3321
3322 $self->{multiplexer}->get_current_page
3207} 3323}
3208 3324
3209sub set_current_page { 3325sub set_current_page {
3210 my ($self, $page) = @_; 3326 my ($self, $page) = @_;
3211 3327
… …
3389 count => 1, 3505 count => 1,
3390 %arg, 3506 %arg,
3391 }; 3507 };
3392 } 3508 }
3393 3509
3510 $ROOT->on_refresh (reorder => sub {
3394 $self->reorder; 3511 $self->reorder;
3512 });
3395} 3513}
3396 3514
3397sub reconfigure { 3515sub reconfigure {
3398 my ($self) = @_; 3516 my ($self) = @_;
3399 3517
… …
3414 3532
3415############################################################################# 3533#############################################################################
3416 3534
3417package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
3418 3536
3419our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
3420 3538
3421sub new { 3539sub new {
3422 my $class = shift; 3540 my $class = shift;
3423 3541
3424 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
3426 @_, 3544 @_,
3427 ); 3545 );
3428 3546
3429 $self 3547 $self
3430} 3548}
3431 3549
3432sub set_items { 3550sub set_items {
3433 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3434 3552
3435 $self->{child}->clear; 3553 $self->clear;
3436 return unless $items; 3554 return unless $items;
3437 3555
3438 my @items = sort { 3556 my @items = sort {
3439 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
3441 } @$items; 3559 } values %$items;
3442 3560
3443 $self->{real_items} = \@items; 3561 $self->{real_items} = \@items;
3444 3562
3445 my $row = 0; 3563 my $row = 0;
3446 for my $item (@items) { 3564 for my $item (@items) {
3447 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3448 3566
3449 $self->{child}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3452 3570
3453 $row++; 3571 $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 } 3572 }
3663} 3573}
3664 3574
3665############################################################################# 3575#############################################################################
3666 3576
… …
3720 } elsif ($ev->{button} == 2) { 3630 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}"); 3631 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) { 3632 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu 3633 (new CFClient::UI::Menu
3724 items => [ 3634 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3635 ["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}"]) }], 3636 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ], 3637 ],
3728 )->popup ($ev); 3638 )->popup ($ev);
3729 } else { 3639 } else {
3730 return 0; 3640 return 0;
… …
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 3887
3978 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3980 3890
3891 $w = max $widget->{min_w}, $w;
3892 $h = max $widget->{min_h}, $h;
3893
3894 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896
3981 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3982 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3983 3899
3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3900 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w}; 3901 $widget->{old_w} = $widget->{w};

Diff Legend

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