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.311 by root, Fri Jun 23 22:35:16 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;
… …
423 my ($self) = @_; 445 my ($self) = @_;
424 446
425 return if $FOCUS == $self; 447 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
427 449
428 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
429 451
430 $focus->update if $focus; 452 $self->update;
431 $FOCUS->update;
432 453
433 0 454 0
434} 455}
435 456
436sub invoke_focus_out { 457sub invoke_focus_out {
437 my ($self) = @_; 458 my ($self) = @_;
438 459
439 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
440 461
441 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
442 463
443 $focus->update if $focus; #? 464 $self->update;
444 465
445 $::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
446 unless $FOCUS; 467 unless $FOCUS;
447 468
448 0 469 0
449} 470}
450 471
451sub grab_focus { 472sub grab_focus {
452 my ($self) = @_; 473 my ($self) = @_;
453 474
475 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 476 $self->emit ("focus_in");
455} 477}
456 478
457sub invoke_mouse_motion { 1 } 479sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 480sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 481sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
461 484
462sub invoke_button_down { 485sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
464 487
465 $self->grab_focus; 488 $self->grab_focus;
466 489
467 1 490 0
468} 491}
469 492
470sub connect { 493sub connect {
471 my ($self, $signal, $cb) = @_; 494 my ($self, $signal, $cb) = @_;
472 495
… …
474} 497}
475 498
476sub emit { 499sub emit {
477 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
478 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
479 #d##TODO# stop propagating at first true, do not use sum 509 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 513}
484 514
485sub find_widget { 515sub find_widget {
486 my ($self, $x, $y) = @_; 516 my ($self, $x, $y) = @_;
487 517
… …
539 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
540 570
541 # update screen rectangle 571 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 572 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 573 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 574
547 # skip widgets that are entirely outside the drawing area 575 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 578
… …
589} 617}
590 618
591sub DESTROY { 619sub DESTROY {
592 my ($self) = @_; 620 my ($self) = @_;
593 621
622 return if CFClient::in_destruct;
623
594 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
595 625
596 eval { $self->destroy }; 626 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 628}
… …
977 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
978 }, 1008 },
979 ; 1009 ;
980 1010
981 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
983 slider => $slider, 1014 slider => $slider,
984 %arg, 1015 %arg,
985 ); 1016 );
986 1017
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child; 1019 $self->add ($child) if $child;
989 1020
990 $self 1021 $self
991} 1022}
992 1023
1024#TODO# update range on size_allocate depending on child
1025
993sub add { 1026sub add {
994 my ($self, $widget) = @_; 1027 my ($self, $widget) = @_;
995 1028
996 $self->{vp}->add ($self->{child} = $widget); 1029 $self->{vp}->add ($self->{child} = $widget);
997} 1030}
998 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
999sub update { 1048sub update {
1000 my ($self) = @_; 1049 my ($self) = @_;
1001 1050
1002 $self->SUPER::update; 1051 $self->SUPER::update;
1003 1052
1004 # todo: overwrite size_allocate of child 1053 $self->update_slider;
1005 my $child = $self->{vp}->child;
1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1007} 1054}
1008 1055
1009sub invoke_size_allocate { 1056sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
1011 1058
1012 my $child = $self->{vp}->child; 1059 $self->update_slider;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014 1060
1015 $self->SUPER::invoke_size_allocate ($w, $h) 1061 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1062}
1017
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020 1063
1021############################################################################# 1064#############################################################################
1022 1065
1023package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
1024 1067
… …
1080 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1126 border => 0.6,
1084 can_events => 1, 1127 can_events => 1,
1085 min_w => 16, 1128 min_w => 64,
1086 min_h => 16, 1129 min_h => 32,
1087 %arg, 1130 %arg,
1088 ); 1131 );
1089 1132
1090 $self->{title_widget} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1134 align => 0,
… …
1096 1139
1097 if ($self->{has_close_button}) { 1140 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1141 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1142 new CFClient::UI::ImageButton
1100 path => 'x1_close.png', 1143 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1144 on_activate => sub { $self->emit ("delete") };
1102 1145
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1146 $self->CFClient::UI::Container::add ($self->{close_button});
1104 } 1147 }
1105 1148
1106 $self 1149 $self
… …
1152 $self->child->configure ($border, $border, $w, $h); 1195 $self->child->configure ($border, $border, $w, $h);
1153 1196
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1198 if $self->{close_button};
1156 1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1207
1157 1 1208 1
1158} 1209}
1159 1210
1160sub invoke_button_down { 1211sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
… …
1583 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1584 1635
1585 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1587 1638
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1590 1640
1591 delete $self->{size_req}; 1641 delete $self->{size_req};
1592 $self->realloc; 1642 $self->realloc;
1593 $self->update; 1643 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1601 1651
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1653
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1606 1655
1607 delete $self->{size_req}; 1656 delete $self->{size_req};
1608 $self->realloc; 1657 $self->realloc;
1609 $self->update; 1658 $self->update;
… …
1621 1670
1622 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1623 1672
1624 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1625 $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);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1677
1628 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1629 1679
1630 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
… …
1654 1704
1655sub set_fontsize { 1705sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1657 1707
1658 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1659 delete $self->{texture}; 1710 delete $self->{texture};
1660 1711
1661 $self->realloc; 1712 $self->realloc;
1662} 1713}
1663 1714
1664sub reconfigure { 1715sub reconfigure {
1665 my ($self) = @_; 1716 my ($self) = @_;
1666 1717
1667 delete $self->{size_req}; 1718 delete $self->{size_req};
1719 delete $self->{texture};
1668 1720
1669 $self->SUPER::reconfigure; 1721 $self->SUPER::reconfigure;
1670} 1722}
1671 1723
1672sub _draw { 1724sub _draw {
1673 my ($self) = @_; 1725 my ($self) = @_;
1674 1726
1675 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1676 1728
1677 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1736
1685 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1686 }; 1738 };
1687 1739
1688 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1692 1744
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1748 };
1697 1749
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1752
1703 if ($tex->{format} == GL_ALPHA) { 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 1754}
1714 1755
1715############################################################################# 1756#############################################################################
1716 1757
1717package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1828 1869
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 1871
1831 # byte-index to char-index 1872 # byte-index to char-index
1832 my $text = $self->{text}; 1873 my $text = $self->{text};
1833 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1835 1876
1836 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1837 $self->update; 1878 $self->update;
1838 1879
1839 1 1880 1
… …
2059 my ($self) = @_; 2100 my ($self) = @_;
2060 2101
2061 (6) x 2 2102 (6) x 2
2062} 2103}
2063 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
2064sub invoke_button_down { 2113sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
2066 2115
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state}; 2118 $self->toggle;
2070 $self->emit (changed => $self->{state});
2071 } else { 2119 } else {
2072 return 0 2120 return 0
2073 } 2121 }
2074 2122
2075 1 2123 1
… …
2111 my $self = $class->SUPER::new ( 2159 my $self = $class->SUPER::new (
2112 can_events => 0, 2160 can_events => 0,
2113 @_, 2161 @_,
2114 ); 2162 );
2115 2163
2116 $self->{path} 2164 $self->{path} || $self->{tex}
2117 or Carp::croak "required attribute 'path' not set"; 2165 or Carp::croak "'path' or 'tex' attributes required";
2118 2166
2119 $self->{tex} = $texture_cache{$self->{path}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2120 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;
2121 2169
2122 Scalar::Util::weaken $texture_cache{$self->{path}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2123 2171
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2296
2249 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2250 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);
2251 2302
2252 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
… …
2274 2325
2275 if ($t3) { 2326 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2333 glEnd;
2283 } 2334 }
2284 2335
2285 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2441 } 2492 }
2442 2493
2443 1 2494 1
2444} 2495}
2445 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
2446sub update { 2507sub update {
2447 my ($self) = @_; 2508 my ($self) = @_;
2448 2509
2449 delete $self->{knob_w}; 2510 delete $self->{knob_w};
2450 $self->SUPER::update; 2511 $self->SUPER::update;
… …
2549sub new { 2610sub new {
2550 my $class = shift; 2611 my $class = shift;
2551 2612
2552 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2553 fontsize => 1, 2614 fontsize => 1,
2554 can_events => 0, 2615 can_events => 1,
2555 indent => 0, 2616 indent => 0,
2556 #font => default_font 2617 #font => default_font
2557 @_, 2618 @_,
2558 2619
2559 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2560 par => [], 2621 par => [],
2561 height => 0, 2622 height => 0,
2562 children => [ 2623 children => [
2563 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2575 2636
2576 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2577 $self->reflow; 2638 $self->reflow;
2578} 2639}
2579 2640
2580sub visible_children { 2641sub size_request {
2581 my ($self) = @_; 2642 my ($self) = @_;
2582 2643
2583 @{$self->{children}}[0,1] 2644 my ($empty, $slider) = @{ $self->{children} };
2645
2646 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request
2584} 2648}
2585 2649
2586sub invoke_size_allocate { 2650sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2588 2652
… …
2594 $self->{layout}->set_width ($empty->{w}); 2658 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 2660
2597 $self->reflow; 2661 $self->reflow;
2598 2662
2663 local $self->{children} = [$empty, $slider];
2599 $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
2600} 2675}
2601 2676
2602sub get_layout { 2677sub get_layout {
2603 my ($self, $para) = @_; 2678 my ($self, $para) = @_;
2604 2679
… …
2721 my $y0 = $top; 2796 my $y0 = $top;
2722 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2723 2798
2724 my $y = 0; 2799 my $y = 0;
2725 2800
2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730 for my $para (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 2802 my $h = $para->{h};
2732 2803
2733 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2734 2805
2735 my $layout = $self->get_layout ($para); 2806 my $layout = $self->get_layout ($para);
2736 2807
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 2809
2742 if (my @w = @{ $para->{widget} }) { 2810 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 2811 my @s = $layout->get_shapes;
2744 2812
2745 for (@w) { 2813 for (@w) {
… …
2753 } 2821 }
2754 } 2822 }
2755 2823
2756 $y += $h; 2824 $y += $h;
2757 } 2825 }
2758
2759 glDisable GL_BLEND;
2760 }; 2826 };
2761 }); 2827 });
2762} 2828}
2763 2829
2764sub reconfigure { 2830sub reconfigure {
… …
3060 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
3062 3128
3063 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
3064 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 {
3065 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
3066 can_hover => 1, 3146 can_hover => 1,
3067 can_events => 1, 3147 can_events => 1,
3068 markup => $widget, 3148 markup => $widget,
3069 tooltip => $tooltip 3149 tooltip => $tooltip;
3150 }
3070 } 3151 }
3071 3152
3072 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
3073 3154
3074 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
3141 3222
3142 $self->SUPER::add (@widgets); 3223 $self->SUPER::add (@widgets);
3143 3224
3144 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3226 if @{ $self->{children} };
3227}
3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3146} 3233}
3147 3234
3148sub set_current_page { 3235sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
3150 3237
… …
3216 tooltip => $tooltip, 3303 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) }, 3304 on_activate => sub { $self->set_current_page ($widget) },
3218 ); 3305 );
3219 3306
3220 $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
3221} 3314}
3222 3315
3223sub set_current_page { 3316sub set_current_page {
3224 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3225 3318
… …
3403 count => 1, 3496 count => 1,
3404 %arg, 3497 %arg,
3405 }; 3498 };
3406 } 3499 }
3407 3500
3501 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 3502 $self->reorder;
3503 });
3409} 3504}
3410 3505
3411sub reconfigure { 3506sub reconfigure {
3412 my ($self) = @_; 3507 my ($self) = @_;
3413 3508
… …
3428 3523
3429############################################################################# 3524#############################################################################
3430 3525
3431package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3432 3527
3433our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3434 3529
3435sub new { 3530sub new {
3436 my $class = shift; 3531 my $class = shift;
3437 3532
3438 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3440 @_, 3535 @_,
3441 ); 3536 );
3442 3537
3443 $self 3538 $self
3444} 3539}
3445 3540
3446sub set_items { 3541sub set_items {
3447 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3448 3543
3449 $self->{child}->clear; 3544 $self->clear;
3450 return unless $items; 3545 return unless $items;
3451 3546
3452 my @items = sort { 3547 my @items = sort {
3453 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3455 } @$items; 3550 } values %$items;
3456 3551
3457 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3458 3553
3459 my $row = 0; 3554 my $row = 0;
3460 for my $item (@items) { 3555 for my $item (@items) {
3461 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3462 3557
3463 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3466 3561
3467 $row++; 3562 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 } 3563 }
3677} 3564}
3678 3565
3679############################################################################# 3566#############################################################################
3680 3567
… …
3734 } elsif ($ev->{button} == 2) { 3621 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}"); 3622 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) { 3623 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu 3624 (new CFClient::UI::Menu
3738 items => [ 3625 items => [
3739 ["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}"]) }],
3740 ["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}"]) }],
3741 ], 3628 ],
3742 )->popup ($ev); 3629 )->popup ($ev);
3743 } else { 3630 } else {
3744 return 0; 3631 return 0;
… …
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 3878
3992 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3993 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3994 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
3995 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3997 3890
3998 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}) {
3999 $widget->{old_w} = $widget->{w}; 3892 $widget->{old_w} = $widget->{w};

Diff Legend

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