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.316 by root, Sun Jul 2 13:57:58 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;
… …
407 429
408# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
409sub coord2local { 431sub coord2local {
410 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
411 433
434 Carp::confess unless $self->{parent};#d#
435
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 437}
414 438
415# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
416sub coord2global { 440sub coord2global {
… …
423 my ($self) = @_; 447 my ($self) = @_;
424 448
425 return if $FOCUS == $self; 449 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 450 return unless $self->{can_focus};
427 451
428 my $focus = $FOCUS; $FOCUS = $self; 452 $FOCUS = $self;
429 453
430 $focus->update if $focus; 454 $self->update;
431 $FOCUS->update;
432 455
433 0 456 0
434} 457}
435 458
436sub invoke_focus_out { 459sub invoke_focus_out {
437 my ($self) = @_; 460 my ($self) = @_;
438 461
439 return unless $FOCUS == $self; 462 return unless $FOCUS == $self;
440 463
441 my $focus = $FOCUS; undef $FOCUS; 464 undef $FOCUS;
442 465
443 $focus->update if $focus; #? 466 $self->update;
444 467
445 $::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
446 unless $FOCUS; 469 unless $FOCUS;
447 470
448 0 471 0
449} 472}
450 473
451sub grab_focus { 474sub grab_focus {
452 my ($self) = @_; 475 my ($self) = @_;
453 476
477 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 478 $self->emit ("focus_in");
455} 479}
456 480
457sub invoke_mouse_motion { 1 } 481sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 482sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 483sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 484sub invoke_key_up { 0 }
485sub invoke_mouse_wheel { 0 }
461 486
462sub invoke_button_down { 487sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 488 my ($self, $ev, $x, $y) = @_;
464 489
465 $self->grab_focus; 490 $self->grab_focus;
466 491
467 1 492 0
468} 493}
469 494
470sub connect { 495sub connect {
471 my ($self, $signal, $cb) = @_; 496 my ($self, $signal, $cb) = @_;
472 497
473 push @{ $self->{signal_cb}{$signal} }, $cb; 498 push @{ $self->{signal_cb}{$signal} }, $cb;
474} 499}
475 500
501my %has_coords = (
502 button_down => 1,
503 button_up => 1,
504 mouse_motion => 1,
505 mouse_wheel => 1,
506);
507
476sub emit { 508sub emit {
477 my ($self, $signal, @args) = @_; 509 my ($self, $signal, @args) = @_;
478 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
479 #d##TODO# stop propagating at first true, do not use sum 518 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 519 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 520 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 521 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 522}
484 523
485sub find_widget { 524sub find_widget {
486 my ($self, $x, $y) = @_; 525 my ($self, $x, $y) = @_;
487 526
… …
587} 626}
588 627
589sub DESTROY { 628sub DESTROY {
590 my ($self) = @_; 629 my ($self) = @_;
591 630
631 return if CFClient::in_destruct;
632
592 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
593 634
594 eval { $self->destroy }; 635 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 637}
… …
975 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
976 }, 1017 },
977 ; 1018 ;
978 1019
979 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
981 slider => $slider, 1023 slider => $slider,
982 %arg, 1024 %arg,
983 ); 1025 );
984 1026
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1028 $self->add ($child) if $child;
… …
992 1034
993sub add { 1035sub add {
994 my ($self, $widget) = @_; 1036 my ($self, $widget) = @_;
995 1037
996 $self->{vp}->add ($self->{child} = $widget); 1038 $self->{vp}->add ($self->{child} = $widget);
1039}
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
997} 1049}
998 1050
999sub update_slider { 1051sub update_slider {
1000 my ($self) = @_; 1052 my ($self) = @_;
1001 1053
… …
1080 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1135 border => 0.6,
1084 can_events => 1, 1136 can_events => 1,
1085 min_w => 16, 1137 min_w => 64,
1086 min_h => 16, 1138 min_h => 32,
1087 %arg, 1139 %arg,
1088 ); 1140 );
1089 1141
1090 $self->{title_widget} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1143 align => 0,
… …
1096 1148
1097 if ($self->{has_close_button}) { 1149 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1150 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1151 new CFClient::UI::ImageButton
1100 path => 'x1_close.png', 1152 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1153 on_activate => sub { $self->emit ("delete") };
1102 1154
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1155 $self->CFClient::UI::Container::add ($self->{close_button});
1104 } 1156 }
1105 1157
1106 $self 1158 $self
… …
1152 $self->child->configure ($border, $border, $w, $h); 1204 $self->child->configure ($border, $border, $w, $h);
1153 1205
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1206 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1207 if $self->{close_button};
1156 1208
1209 1
1210}
1211
1212sub invoke_delete {
1213 my ($self) = @_;
1214
1215 $self->hide;
1216
1157 1 1217 1
1158} 1218}
1159 1219
1160sub invoke_button_down { 1220sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
… …
1583 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1584 1644
1585 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1587 1647
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1590 1649
1591 delete $self->{size_req}; 1650 delete $self->{size_req};
1592 $self->realloc; 1651 $self->realloc;
1593 $self->update; 1652 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1601 1660
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1662
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1606 1664
1607 delete $self->{size_req}; 1665 delete $self->{size_req};
1608 $self->realloc; 1666 $self->realloc;
1609 $self->update; 1667 $self->update;
… …
1621 1679
1622 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1623 1681
1624 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1625 $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);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1686
1628 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1629 1688
1630 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
… …
1664 1723
1665sub reconfigure { 1724sub reconfigure {
1666 my ($self) = @_; 1725 my ($self) = @_;
1667 1726
1668 delete $self->{size_req}; 1727 delete $self->{size_req};
1728 delete $self->{texture};
1669 1729
1670 $self->SUPER::reconfigure; 1730 $self->SUPER::reconfigure;
1671} 1731}
1672 1732
1673sub _draw { 1733sub _draw {
1674 my ($self) = @_; 1734 my ($self) = @_;
1675 1735
1676 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1677 1737
1678 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1679 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1680 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1681 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1682 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685 1745
1686 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1687 }; 1747 };
1688 1748
1689 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1693 1753
1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1697 }; 1757 };
1698 1758
1699 glEnable GL_TEXTURE_2D;
1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1703 1761
1704 if ($tex->{format} == GL_ALPHA) { 1762 $self->{layout}->render ($self->{ox}, $self->{oy});
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706 glColor @{$self->{fg}};
1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711 }
1712
1713 glDisable GL_TEXTURE_2D;
1714} 1763}
1715 1764
1716############################################################################# 1765#############################################################################
1717 1766
1718package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1829 1878
1830 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1831 1880
1832 # byte-index to char-index 1881 # byte-index to char-index
1833 my $text = $self->{text}; 1882 my $text = $self->{text};
1834 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1836 1885
1837 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1838 $self->update; 1887 $self->update;
1839 1888
1840 1 1889 1
… …
2060 my ($self) = @_; 2109 my ($self) = @_;
2061 2110
2062 (6) x 2 2111 (6) x 2
2063} 2112}
2064 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
2065sub invoke_button_down { 2122sub invoke_button_down {
2066 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
2067 2124
2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070 $self->{state} = !$self->{state}; 2127 $self->toggle;
2071 $self->emit (changed => $self->{state});
2072 } else { 2128 } else {
2073 return 0 2129 return 0
2074 } 2130 }
2075 2131
2076 1 2132 1
… …
2112 my $self = $class->SUPER::new ( 2168 my $self = $class->SUPER::new (
2113 can_events => 0, 2169 can_events => 0,
2114 @_, 2170 @_,
2115 ); 2171 );
2116 2172
2117 $self->{path} 2173 $self->{path} || $self->{tex}
2118 or Carp::croak "required attribute 'path' not set"; 2174 or Carp::croak "'path' or 'tex' attributes required";
2119 2175
2120 $self->{tex} = $texture_cache{$self->{path}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2121 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;
2122 2178
2123 Scalar::Util::weaken $texture_cache{$self->{path}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2124 2180
2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2247 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2248 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2249 2305
2250 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2251 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);
2252 2311
2253 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
… …
2275 2334
2276 if ($t3) { 2335 if ($t3) {
2277 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2278 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2279 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283 glEnd; 2342 glEnd;
2284 } 2343 }
2285 2344
2286 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2442 } 2501 }
2443 2502
2444 1 2503 1
2445} 2504}
2446 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
2447sub update { 2516sub update {
2448 my ($self) = @_; 2517 my ($self) = @_;
2449 2518
2450 delete $self->{knob_w}; 2519 delete $self->{knob_w};
2451 $self->SUPER::update; 2520 $self->SUPER::update;
… …
2550sub new { 2619sub new {
2551 my $class = shift; 2620 my $class = shift;
2552 2621
2553 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2554 fontsize => 1, 2623 fontsize => 1,
2555 can_events => 0, 2624 can_events => 1,
2556 indent => 0, 2625 indent => 0,
2557 #font => default_font 2626 #font => default_font
2558 @_, 2627 @_,
2559 2628
2560 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2561 par => [], 2630 par => [],
2562 height => 0, 2631 height => 0,
2563 children => [ 2632 children => [
2564 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2565 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2600 2669
2601 $self->reflow; 2670 $self->reflow;
2602 2671
2603 local $self->{children} = [$empty, $slider]; 2672 local $self->{children} = [$empty, $slider];
2604 $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
2605} 2684}
2606 2685
2607sub get_layout { 2686sub get_layout {
2608 my ($self, $para) = @_; 2687 my ($self, $para) = @_;
2609 2688
… …
2726 my $y0 = $top; 2805 my $y0 = $top;
2727 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2728 2807
2729 my $y = 0; 2808 my $y = 0;
2730 2809
2731 glEnable GL_BLEND;
2732 #TODO# not correct in windows where rgba is forced off
2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735 for my $para (@{$self->{par}}) { 2810 for my $para (@{$self->{par}}) {
2736 my $h = $para->{h}; 2811 my $h = $para->{h};
2737 2812
2738 if ($y0 < $y + $h && $y < $y1) { 2813 if ($y0 < $y + $h && $y < $y1) {
2739 2814
2740 my $layout = $self->get_layout ($para); 2815 my $layout = $self->get_layout ($para);
2741 2816
2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744 glRasterPos $para->{indent}, $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746 2818
2747 if (my @w = @{ $para->{widget} }) { 2819 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes; 2820 my @s = $layout->get_shapes;
2749 2821
2750 glDisable GL_BLEND;
2751 for (@w) { 2822 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, (); 2823 my ($dx, $dy) = splice @s, 0, 2, ();
2753 2824
2754 $_->{x} = $dx + $para->{indent}; 2825 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0; 2826 $_->{y} = $dy + $y - $y0;
2756 2827
2757 $_->draw; 2828 $_->draw;
2758 } 2829 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 } 2830 }
2762 } 2831 }
2763 2832
2764 $y += $h; 2833 $y += $h;
2765 } 2834 }
2766
2767 glDisable GL_BLEND;
2768 }; 2835 };
2769 }); 2836 });
2770} 2837}
2771 2838
2772sub reconfigure { 2839sub reconfigure {
… …
3068 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
3069 my ($widget, $cb, $tooltip) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
3070 3137
3071 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
3072 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 {
3073 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
3074 can_hover => 1, 3155 can_hover => 1,
3075 can_events => 1, 3156 can_events => 1,
3076 markup => $widget, 3157 markup => $widget,
3077 tooltip => $tooltip 3158 tooltip => $tooltip;
3159 }
3078 } 3160 }
3079 3161
3080 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
3081 3163
3082 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
3149 3231
3150 $self->SUPER::add (@widgets); 3232 $self->SUPER::add (@widgets);
3151 3233
3152 $self->{current} = $self->{children}[0] 3234 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} }; 3235 if @{ $self->{children} };
3236}
3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3154} 3242}
3155 3243
3156sub set_current_page { 3244sub set_current_page {
3157 my ($self, $page_or_widget) = @_; 3245 my ($self, $page_or_widget) = @_;
3158 3246
… …
3224 tooltip => $tooltip, 3312 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) }, 3313 on_activate => sub { $self->set_current_page ($widget) },
3226 ); 3314 );
3227 3315
3228 $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
3229} 3323}
3230 3324
3231sub set_current_page { 3325sub set_current_page {
3232 my ($self, $page) = @_; 3326 my ($self, $page) = @_;
3233 3327
… …
3438 3532
3439############################################################################# 3533#############################################################################
3440 3534
3441package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
3442 3536
3443our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
3444 3538
3445sub new { 3539sub new {
3446 my $class = shift; 3540 my $class = shift;
3447 3541
3448 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
3450 @_, 3544 @_,
3451 ); 3545 );
3452 3546
3453 $self 3547 $self
3454} 3548}
3455 3549
3456sub set_items { 3550sub set_items {
3457 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3458 3552
3459 $self->{child}->clear; 3553 $self->clear;
3460 return unless $items; 3554 return unless $items;
3461 3555
3462 my @items = sort { 3556 my @items = sort {
3463 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
… …
3468 3562
3469 my $row = 0; 3563 my $row = 0;
3470 for my $item (@items) { 3564 for my $item (@items) {
3471 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3472 3566
3473 $self->{child}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3476 3570
3477 $row++; 3571 $row++;
3478 } 3572 }
3479} 3573}
3480 3574
… …
3792 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793 3887
3794 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3795 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3796 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
3797 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3798 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3799 3899
3800 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}) {
3801 $widget->{old_w} = $widget->{w}; 3901 $widget->{old_w} = $widget->{w};

Diff Legend

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