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.313 by root, Sat Jun 24 00:24:09 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
… …
587} 617}
588 618
589sub DESTROY { 619sub DESTROY {
590 my ($self) = @_; 620 my ($self) = @_;
591 621
622 return if CFClient::in_destruct;
623
592 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
593 625
594 eval { $self->destroy }; 626 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 628}
… …
975 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
976 }, 1008 },
977 ; 1009 ;
978 1010
979 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
981 slider => $slider, 1014 slider => $slider,
982 %arg, 1015 %arg,
983 ); 1016 );
984 1017
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1019 $self->add ($child) if $child;
987 1020
988 $self 1021 $self
989} 1022}
990 1023
1024#TODO# update range on size_allocate depending on child
1025
991sub add { 1026sub add {
992 my ($self, $widget) = @_; 1027 my ($self, $widget) = @_;
993 1028
994 $self->{vp}->add ($self->{child} = $widget); 1029 $self->{vp}->add ($self->{child} = $widget);
995} 1030}
996 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
997sub update { 1048sub update {
998 my ($self) = @_; 1049 my ($self) = @_;
999 1050
1000 $self->SUPER::update; 1051 $self->SUPER::update;
1001 1052
1002 # todo: overwrite size_allocate of child 1053 $self->update_slider;
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1054}
1006 1055
1007sub invoke_size_allocate { 1056sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
1009 1058
1010 my $child = $self->{vp}->child; 1059 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012 1060
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1061 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1062}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1063
1019############################################################################# 1064#############################################################################
1020 1065
1021package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
1022 1067
… …
1078 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1126 border => 0.6,
1082 can_events => 1, 1127 can_events => 1,
1083 min_w => 16, 1128 min_w => 64,
1084 min_h => 16, 1129 min_h => 32,
1085 %arg, 1130 %arg,
1086 ); 1131 );
1087 1132
1088 $self->{title_widget} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1134 align => 0,
… …
1094 1139
1095 if ($self->{has_close_button}) { 1140 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1141 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1142 new CFClient::UI::ImageButton
1098 path => 'x1_close.png', 1143 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1144 on_activate => sub { $self->emit ("delete") };
1100 1145
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1146 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1147 }
1103 1148
1104 $self 1149 $self
… …
1150 $self->child->configure ($border, $border, $w, $h); 1195 $self->child->configure ($border, $border, $w, $h);
1151 1196
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1198 if $self->{close_button};
1154 1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1207
1155 1 1208 1
1156} 1209}
1157 1210
1158sub invoke_button_down { 1211sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
… …
1581 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1582 1635
1583 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1585 1638
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1588 1640
1589 delete $self->{size_req}; 1641 delete $self->{size_req};
1590 $self->realloc; 1642 $self->realloc;
1591 $self->update; 1643 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1599 1651
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1653
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1604 1655
1605 delete $self->{size_req}; 1656 delete $self->{size_req};
1606 $self->realloc; 1657 $self->realloc;
1607 $self->update; 1658 $self->update;
… …
1619 1670
1620 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1621 1672
1622 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1623 $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);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1677
1626 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1627 1679
1628 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
… …
1652 1704
1653sub set_fontsize { 1705sub set_fontsize {
1654 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1655 1707
1656 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1657 delete $self->{texture}; 1710 delete $self->{texture};
1658 1711
1659 $self->realloc; 1712 $self->realloc;
1660} 1713}
1661 1714
1662sub reconfigure { 1715sub reconfigure {
1663 my ($self) = @_; 1716 my ($self) = @_;
1664 1717
1665 delete $self->{size_req}; 1718 delete $self->{size_req};
1719 delete $self->{texture};
1666 1720
1667 $self->SUPER::reconfigure; 1721 $self->SUPER::reconfigure;
1668} 1722}
1669 1723
1670sub _draw { 1724sub _draw {
1671 my ($self) = @_; 1725 my ($self) = @_;
1672 1726
1673 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1674 1728
1675 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 1736
1683 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1684 }; 1738 };
1685 1739
1686 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1690 1744
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 1748 };
1695 1749
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 1752
1701 if ($tex->{format} == GL_ALPHA) { 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708 }
1709
1710 glDisable GL_TEXTURE_2D;
1711} 1754}
1712 1755
1713############################################################################# 1756#############################################################################
1714 1757
1715package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1826 1869
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 1871
1829 # byte-index to char-index 1872 # byte-index to char-index
1830 my $text = $self->{text}; 1873 my $text = $self->{text};
1831 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1833 1876
1834 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1835 $self->update; 1878 $self->update;
1836 1879
1837 1 1880 1
… …
2057 my ($self) = @_; 2100 my ($self) = @_;
2058 2101
2059 (6) x 2 2102 (6) x 2
2060} 2103}
2061 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
2062sub invoke_button_down { 2113sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
2064 2115
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state}; 2118 $self->toggle;
2068 $self->emit (changed => $self->{state});
2069 } else { 2119 } else {
2070 return 0 2120 return 0
2071 } 2121 }
2072 2122
2073 1 2123 1
… …
2109 my $self = $class->SUPER::new ( 2159 my $self = $class->SUPER::new (
2110 can_events => 0, 2160 can_events => 0,
2111 @_, 2161 @_,
2112 ); 2162 );
2113 2163
2114 $self->{path} 2164 $self->{path} || $self->{tex}
2115 or Carp::croak "required attribute 'path' not set"; 2165 or Carp::croak "'path' or 'tex' attributes required";
2116 2166
2117 $self->{tex} = $texture_cache{$self->{path}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2118 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;
2119 2169
2120 Scalar::Util::weaken $texture_cache{$self->{path}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2121 2171
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2296
2247 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2248 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);
2249 2302
2250 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
… …
2272 2325
2273 if ($t3) { 2326 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2333 glEnd;
2281 } 2334 }
2282 2335
2283 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2439 } 2492 }
2440 2493
2441 1 2494 1
2442} 2495}
2443 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
2444sub update { 2507sub update {
2445 my ($self) = @_; 2508 my ($self) = @_;
2446 2509
2447 delete $self->{knob_w}; 2510 delete $self->{knob_w};
2448 $self->SUPER::update; 2511 $self->SUPER::update;
… …
2547sub new { 2610sub new {
2548 my $class = shift; 2611 my $class = shift;
2549 2612
2550 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2551 fontsize => 1, 2614 fontsize => 1,
2552 can_events => 0, 2615 can_events => 1,
2553 indent => 0, 2616 indent => 0,
2554 #font => default_font 2617 #font => default_font
2555 @_, 2618 @_,
2556 2619
2557 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2558 par => [], 2621 par => [],
2559 height => 0, 2622 height => 0,
2560 children => [ 2623 children => [
2561 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2597 2660
2598 $self->reflow; 2661 $self->reflow;
2599 2662
2600 local $self->{children} = [$empty, $slider]; 2663 local $self->{children} = [$empty, $slider];
2601 $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
2602} 2675}
2603 2676
2604sub get_layout { 2677sub get_layout {
2605 my ($self, $para) = @_; 2678 my ($self, $para) = @_;
2606 2679
… …
2723 my $y0 = $top; 2796 my $y0 = $top;
2724 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2725 2798
2726 my $y = 0; 2799 my $y = 0;
2727 2800
2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732 for my $para (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 2802 my $h = $para->{h};
2734 2803
2735 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2736 2805
2737 my $layout = $self->get_layout ($para); 2806 my $layout = $self->get_layout ($para);
2738 2807
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 2809
2744 if (my @w = @{ $para->{widget} }) { 2810 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 2811 my @s = $layout->get_shapes;
2746 2812
2747 glDisable GL_BLEND;
2748 for (@w) { 2813 for (@w) {
2749 my ($dx, $dy) = splice @s, 0, 2, (); 2814 my ($dx, $dy) = splice @s, 0, 2, ();
2750 2815
2751 $_->{x} = $dx + $para->{indent}; 2816 $_->{x} = $dx + $para->{indent};
2752 $_->{y} = $dy + $y - $y0; 2817 $_->{y} = $dy + $y - $y0;
2753 2818
2754 $_->draw; 2819 $_->draw;
2755 } 2820 }
2756 glEnable GL_BLEND;
2757 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758 } 2821 }
2759 } 2822 }
2760 2823
2761 $y += $h; 2824 $y += $h;
2762 } 2825 }
2763
2764 glDisable GL_BLEND;
2765 }; 2826 };
2766 }); 2827 });
2767} 2828}
2768 2829
2769sub reconfigure { 2830sub reconfigure {
… …
3065 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
3066 my ($widget, $cb, $tooltip) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
3067 3128
3068 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
3069 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 {
3070 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
3071 can_hover => 1, 3146 can_hover => 1,
3072 can_events => 1, 3147 can_events => 1,
3073 markup => $widget, 3148 markup => $widget,
3074 tooltip => $tooltip 3149 tooltip => $tooltip;
3150 }
3075 } 3151 }
3076 3152
3077 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
3078 3154
3079 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
3146 3222
3147 $self->SUPER::add (@widgets); 3223 $self->SUPER::add (@widgets);
3148 3224
3149 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
3150 if @{ $self->{children} }; 3226 if @{ $self->{children} };
3227}
3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3151} 3233}
3152 3234
3153sub set_current_page { 3235sub set_current_page {
3154 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
3155 3237
… …
3221 tooltip => $tooltip, 3303 tooltip => $tooltip,
3222 on_activate => sub { $self->set_current_page ($widget) }, 3304 on_activate => sub { $self->set_current_page ($widget) },
3223 ); 3305 );
3224 3306
3225 $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
3226} 3314}
3227 3315
3228sub set_current_page { 3316sub set_current_page {
3229 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3230 3318
… …
3408 count => 1, 3496 count => 1,
3409 %arg, 3497 %arg,
3410 }; 3498 };
3411 } 3499 }
3412 3500
3501 $ROOT->on_refresh (reorder => sub {
3413 $self->reorder; 3502 $self->reorder;
3503 });
3414} 3504}
3415 3505
3416sub reconfigure { 3506sub reconfigure {
3417 my ($self) = @_; 3507 my ($self) = @_;
3418 3508
… …
3433 3523
3434############################################################################# 3524#############################################################################
3435 3525
3436package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3437 3527
3438our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3439 3529
3440sub new { 3530sub new {
3441 my $class = shift; 3531 my $class = shift;
3442 3532
3443 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3444 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3445 @_, 3535 @_,
3446 ); 3536 );
3447 3537
3448 $self 3538 $self
3449} 3539}
3450 3540
3451sub set_items { 3541sub set_items {
3452 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3453 3543
3454 $self->{child}->clear; 3544 $self->clear;
3455 return unless $items; 3545 return unless $items;
3456 3546
3457 my @items = sort { 3547 my @items = sort {
3458 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3459 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3460 } @$items; 3550 } values %$items;
3461 3551
3462 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3463 3553
3464 my $row = 0; 3554 my $row = 0;
3465 for my $item (@items) { 3555 for my $item (@items) {
3466 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3467 3557
3468 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3469 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3470 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3471 3561
3472 $row++; 3562 $row++;
3473 }
3474}
3475
3476#############################################################################
3477
3478package CFClient::UI::BindEditor;
3479
3480our @ISA = CFClient::UI::FancyFrame::;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3486
3487 $self->add (my $vb = new CFClient::UI::VBox);
3488
3489
3490 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3491 text => "start recording",
3492 tooltip => "Start/Stops recording of actions."
3493 ."All subsequent actions after the recording started will be captured."
3494 ."The actions are displayed after the record was stopped."
3495 ."To bind the action you have to click on the 'Bind' button",
3496 on_activate => sub {
3497 unless ($self->{recording}) {
3498 $self->start;
3499 } else {
3500 $self->stop;
3501 }
3502 });
3503
3504 $vb->add (new CFClient::UI::Label text => "Actions:");
3505 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3506
3507 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3508 $vb->add (my $hb = new CFClient::UI::HBox);
3509 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3510 $hb->add (new CFClient::UI::Button
3511 text => "bind",
3512 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3513 on_activate => sub {
3514 $self->ask_for_bind;
3515 });
3516
3517 $vb->add (my $hb = new CFClient::UI::HBox);
3518 $hb->add (new CFClient::UI::Button
3519 text => "ok",
3520 expand => 1,
3521 tooltip => "This closes the binding editor and saves the binding",
3522 on_activate => sub {
3523 $self->hide;
3524 $self->commit;
3525 });
3526
3527 $hb->add (new CFClient::UI::Button
3528 text => "cancel",
3529 expand => 1,
3530 tooltip => "This closes the binding editor without saving",
3531 on_activate => sub {
3532 $self->hide;
3533 $self->{binding_cancel}->()
3534 if $self->{binding_cancel};
3535 });
3536
3537 $self->update_binding_widgets;
3538
3539 $self
3540}
3541
3542sub cfg_bind {
3543 my ($self, $mod, $sym, $cmds) = @_;
3544 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3545 ::update_bindings ();
3546}
3547
3548sub cfg_unbind {
3549 my ($self, $mod, $sym, $cmds) = @_;
3550 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3551 ::update_bindings ();
3552}
3553
3554sub commit {
3555 my ($self) = @_;
3556 my ($mod, $sym, $cmds) = $self->get_binding;
3557 if ($sym != 0 && @$cmds > 0) {
3558 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3559 ."'. Don't forget 'Save Config'!");
3560 $self->{binding_change}->($mod, $sym, $cmds)
3561 if $self->{binding_change};
3562 } else {
3563 $::STATUSBOX->add ("No action bound, no key or action specified!");
3564 $self->{binding_cancel}->()
3565 if $self->{binding_cancel};
3566 }
3567}
3568
3569sub start {
3570 my ($self) = @_;
3571
3572 $self->{rec_btn}->set_text ("stop recording");
3573 $self->{recording} = 1;
3574 $self->clear_command_list;
3575 $::CONN->start_record if $::CONN;
3576}
3577
3578sub stop {
3579 my ($self) = @_;
3580
3581 $self->{rec_btn}->set_text ("start recording");
3582 $self->{recording} = 0;
3583
3584 my $rec;
3585 $rec = $::CONN->stop_record if $::CONN;
3586 return unless ref $rec eq 'ARRAY';
3587 $self->set_command_list ($rec);
3588}
3589
3590
3591sub ask_for_bind_and_commit {
3592 my ($self) = @_;
3593 $self->ask_for_bind (1);
3594}
3595
3596sub ask_for_bind {
3597 my ($self, $commit, $end_cb) = @_;
3598
3599 CFClient::Binder::open_binding_dialog (sub {
3600 my ($mod, $sym) = @_;
3601 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3602 $self->update_binding_widgets;
3603 $self->commit if $commit;
3604 $end_cb->() if $end_cb;
3605 });
3606}
3607
3608# $mod and $sym are the modifiers and key symbol
3609# $cmds is a array ref of strings (the commands)
3610# $cb is the callback that is executed on OK
3611# $ccb is the callback that is executed on CANCEL and
3612# when the binding was unsuccessful on OK
3613sub set_binding {
3614 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3615
3616 $self->clear_command_list;
3617 $self->{recording} = 0;
3618 $self->{rec_btn}->set_text ("start recording");
3619
3620 $self->{binding} = [$mod, $sym];
3621 $self->{commands} = $cmds;
3622
3623 $self->{binding_change} = $cb;
3624 $self->{binding_cancel} = $ccb;
3625
3626 $self->update_binding_widgets;
3627}
3628
3629# this is a shortcut method that asks for a binding
3630# and then just binds it.
3631sub do_quick_binding {
3632 my ($self, $cmds, $end_cb) = @_;
3633 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3634 $self->ask_for_bind (1, $end_cb);
3635}
3636
3637sub update_binding_widgets {
3638 my ($self) = @_;
3639 my ($mod, $sym, $cmds) = $self->get_binding;
3640 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3641 $self->set_command_list ($cmds);
3642}
3643
3644sub get_binding {
3645 my ($self) = @_;
3646 return (
3647 $self->{binding}->[0],
3648 $self->{binding}->[1],
3649 [ grep { defined $_ } @{$self->{commands}} ]
3650 );
3651}
3652
3653sub clear_command_list {
3654 my ($self) = @_;
3655 $self->{cmdbox}->clear ();
3656}
3657
3658sub set_command_list {
3659 my ($self, $cmds) = @_;
3660
3661 $self->{cmdbox}->clear ();
3662 $self->{commands} = $cmds;
3663
3664 my $idx = 0;
3665
3666 for (@$cmds) {
3667 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3668
3669 my $i = $idx;
3670 $hb->add (new CFClient::UI::Label text => $_);
3671 $hb->add (new CFClient::UI::Button
3672 text => "delete",
3673 tooltip => "Deletes the action from the record",
3674 on_activate => sub {
3675 $self->{cmdbox}->remove ($hb);
3676 $cmds->[$i] = undef;
3677 });
3678
3679
3680 $idx++
3681 } 3563 }
3682} 3564}
3683 3565
3684############################################################################# 3566#############################################################################
3685 3567
… …
3739 } elsif ($ev->{button} == 2) { 3621 } elsif ($ev->{button} == 2) {
3740 $::CONN->user_send ("invoke $spell->{name}"); 3622 $::CONN->user_send ("invoke $spell->{name}");
3741 } elsif ($ev->{button} == 3) { 3623 } elsif ($ev->{button} == 3) {
3742 (new CFClient::UI::Menu 3624 (new CFClient::UI::Menu
3743 items => [ 3625 items => [
3744 ["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}"]) }],
3745 ["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}"]) }],
3746 ], 3628 ],
3747 )->popup ($ev); 3629 )->popup ($ev);
3748 } else { 3630 } else {
3749 return 0; 3631 return 0;
… …
3995 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3996 3878
3997 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3998 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3999 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
4000 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
4001 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
4002 3890
4003 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}) {
4004 $widget->{old_w} = $widget->{w}; 3892 $widget->{old_w} = $widget->{w};

Diff Legend

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