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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.172 by root, Tue Apr 25 09:52:04 2006 UTC

… …
23 23
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31 } 31 }
32 32
33 return; 33 return;
… …
39 delete $TOOLTIP->{owner}; 39 delete $TOOLTIP->{owner};
40} 40}
41 41
42# class methods for events 42# class methods for events
43sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
45} 46}
46 47
47sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
49} 51}
50 52
51sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
52 my ($ev) = @_; 54 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 63 check_tooltip;
62 } 64 }
63 65
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 67
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
67} 72}
68 73
69sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
70 my ($ev) = @_; 75 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
72 77
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 79
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 81
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
78 86
79 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 89 $grab->update if $grab;
82 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 107
100 check_tooltip; 108 check_tooltip;
101 } 109 }
102 110
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
104} 115}
105 116
106# convert position array to integers 117# convert position array to integers
107sub harmonize { 118sub harmonize {
108 my ($vals) = @_; 119 my ($vals) = @_;
… …
126 137
127sub new { 138sub new {
128 my $class = shift; 139 my $class = shift;
129 140
130 my $self = bless { 141 my $self = bless {
131 x => 0, 142 x => 0,
132 y => 0, 143 y => 0,
133 z => 0, 144 z => 0,
134 can_events => 1, 145 can_events => 1,
135 @_ 146 @_
136 }, $class; 147 }, $class;
137 148
138 for (keys %$self) { 149 for (keys %$self) {
… …
160} 171}
161 172
162sub hide { 173sub hide {
163 my ($self) = @_; 174 my ($self) = @_;
164 175
165 return unless $self->{parent}; 176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
166 178
167 $self->{parent}->remove ($self); 179 $self->{parent}->remove ($self)
180 if $self->{parent};
168} 181}
169 182
170sub move { 183sub move {
171 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
172 185
… …
223 236
224sub size_allocate { 237sub size_allocate {
225 # nothing to be done 238 # nothing to be done
226} 239}
227 240
241sub children {
242}
243
228sub set_max_size { 244sub set_max_size {
229 my ($self, $w, $h) = @_; 245 my ($self, $w, $h) = @_;
230 246
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 247 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 248 delete $self->{max_h}; $self->{max_h} = $h if $h;
233} 249}
234 250
235# return top left coordinates 251# return top left coordinates
236sub _topleft { 252sub _topleft {
237 my ($self, $x, $y) = @_; 253 my ($self, $x, $y) = @_;
254
255 $self->{parent}
256 or Carp::confess "no parent widget in _topleft\n";#d#
238 257
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240} 259}
241 260
242# translate global coordinates to local coordinate system 261# translate global coordinates to local coordinate system
… …
320 glVertex $x + $self->{w}, $y + $self->{h}; 339 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h}; 340 glVertex $x , $y + $self->{h};
322 glEnd; 341 glEnd;
323 glDisable GL_BLEND; 342 glDisable GL_BLEND;
324 } 343 }
344
345 if ($ENV{PCLIENT_DEBUG}) {
346 glPushMatrix;
347 glColor 1, 1, 0, 1;
348 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
349 glBegin GL_LINE_LOOP;
350 glVertex 0 , 0;
351 glVertex $self->{w}, 0;
352 glVertex $self->{w}, $self->{h};
353 glVertex 0 , $self->{h};
354 glEnd;
355 glPopMatrix;
356 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
357 }
325} 358}
326 359
327sub _draw { 360sub _draw {
328 my ($self) = @_; 361 my ($self) = @_;
329 362
… …
388} 421}
389 422
390sub emit { 423sub emit {
391 my ($self, $signal, @args) = @_; 424 my ($self, $signal, @args) = @_;
392 425
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394 $cb->($self, @args);
395 }
396} 427}
397 428
398sub DESTROY { 429sub DESTROY {
399 my ($self) = @_; 430 my ($self) = @_;
400 431
… …
467sub new { 498sub new {
468 my ($class, %arg) = @_; 499 my ($class, %arg) = @_;
469 500
470 my $children = delete $arg{children} || []; 501 my $children = delete $arg{children} || [];
471 502
472 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 503 my $self = $class->SUPER::new (
504 children => [],
505 can_events => 0,
506 %arg,
507 );
473 $self->add ($_) for @$children; 508 $self->add ($_) for @$children;
474 509
475 $self 510 $self
476} 511}
477 512
… …
488 ]; 523 ];
489 524
490 $child->check_size; 525 $child->check_size;
491} 526}
492 527
528sub children {
529 @{ $_[0]{children} }
530}
531
493sub remove { 532sub remove {
494 my ($self, $child) = @_; 533 my ($self, $child) = @_;
495 534
496 delete $child->{parent}; 535 delete $child->{parent};
536 $child->hide;
497 537
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 538 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
499 539
500 $self->check_size; 540 $self->check_size;
501 $self->update; 541 $self->update;
542}
543
544sub clear {
545 my ($self) = @_;
546
547 my $children = delete $self->{children};
548 $self->{children} = [];
549
550 for (@$children) {
551 delete $_->{parent};
552 $_->hide;
553 }
502} 554}
503 555
504sub find_widget { 556sub find_widget {
505 my ($self, $x, $y) = @_; 557 my ($self, $x, $y) = @_;
506 558
… …
710 my $class = shift; 762 my $class = shift;
711 763
712 # TODO: user_x, user_y, overwrite moveto? 764 # TODO: user_x, user_y, overwrite moveto?
713 765
714 my $self = $class->SUPER::new ( 766 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 767 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 768 border_bg => [1, 1, 1, 1],
717 border => 0.8, 769 border => 0.8,
718 can_events => 1, 770 can_events => 1,
719 @_ 771 @_
720 ); 772 );
721 773
722 $self->{title} &&= new CFClient::UI::Label 774 $self->{title} &&= new CFClient::UI::Label
… …
870 $self->{children}[$y][$x] = $child; 922 $self->{children}[$y][$x] = $child;
871 923
872 $child->check_size; 924 $child->check_size;
873} 925}
874 926
927sub children {
928 grep $_, map @$_, grep $_, @{ $_[0]{children} }
929}
930
875# TODO: move to container class maybe? send childs a signal on removal? 931# TODO: move to container class maybe? send childs a signal on removal?
876sub clear { 932sub clear {
877 my ($self) = @_; 933 my ($self) = @_;
878 934
935 my @children = $self->children;
879 delete $self->{children}; 936 delete $self->{children};
937
938 for (@children) {
939 delete $_->{parent};
940 $_->hide;
941 }
942
880 $self->update; 943 $self->update;
881} 944}
882 945
883sub get_wh { 946sub get_wh {
884 my ($self) = @_; 947 my ($self) = @_;
… …
1107 1170
1108sub new { 1171sub new {
1109 my ($class, %arg) = @_; 1172 my ($class, %arg) = @_;
1110 1173
1111 my $self = $class->SUPER::new ( 1174 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1175 fg => [1, 1, 1],
1113 #font => default_font 1176 #font => default_font
1114 fontsize => 1, 1177 fontsize => 1,
1115 text => "", 1178 text => "",
1116 align => -1, 1179 align => -1,
1117 valign => -1, 1180 valign => -1,
1118 padding => 2, 1181 padding => 2,
1119 layout => new CFClient::Layout, 1182 layout => new CFClient::Layout,
1120 can_events => 0, 1183 can_events => 0,
1121 %arg 1184 %arg
1122 ); 1185 );
1123 1186
1124 if (exists $self->{template}) { 1187 if (exists $self->{template}) {
… …
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1194 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1132 1195
1133 $self 1196 $self
1134} 1197}
1135 1198
1136sub escape_text { 1199sub escape {
1137 local $_ = $_[1]; 1200 local $_ = $_[1];
1138 1201
1139 s/&/&amp;/g; 1202 s/&/&amp;/g;
1140 s/>/&gt;/g; 1203 s/>/&gt;/g;
1141 s/</&lt;/g; 1204 s/</&lt;/g;
… …
1248 1311
1249sub new { 1312sub new {
1250 my $class = shift; 1313 my $class = shift;
1251 1314
1252 $class->SUPER::new ( 1315 $class->SUPER::new (
1253 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1317 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1318 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1319 active_fg => [0, 0, 0],
1257 can_hover => 1, 1320 can_hover => 1,
1258 can_focus => 1, 1321 can_focus => 1,
1259 valign => 0, 1322 valign => 0,
1260 can_events => 1, 1323 can_events => 1,
1261 @_ 1324 @_
1262 ) 1325 )
1263} 1326}
1264 1327
… …
1418 my ($self, $ev) = @_; 1481 my ($self, $ev) = @_;
1419 1482
1420 my $sym = $ev->{sym}; 1483 my $sym = $ev->{sym};
1421 1484
1422 if ($sym == 13) { 1485 if ($sym == 13) {
1486 unshift @{$self->{history}},
1487 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = '';
1423 $self->emit (activate => $self->get_text); 1490 $self->emit (activate => $txt);
1424 $self->update; 1491 $self->update;
1492
1493 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text;
1496 }
1497 if (@{$self->{history} || []} > 0) {
1498 $self->{history_pointer}++;
1499 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1500 $self->{history_pointer} = @{$self->{history} || []} - 1;
1501 }
1502 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1503 }
1504
1505 } elsif ($sym == CFClient::SDLK_DOWN) {
1506 $self->{history_pointer}--;
1507 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1508
1509 if ($self->{history_pointer} >= 0) {
1510 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1511 } else {
1512 $self->set_text ($self->{history_saveback});
1513 }
1425 1514
1426 } else { 1515 } else {
1427 $self->SUPER::key_down ($ev); 1516 $self->SUPER::key_down ($ev);
1428 } 1517 }
1429 1518
… …
1443 1532
1444sub new { 1533sub new {
1445 my $class = shift; 1534 my $class = shift;
1446 1535
1447 $class->SUPER::new ( 1536 $class->SUPER::new (
1448 padding => 4, 1537 padding => 4,
1449 fg => [1, 1, 1], 1538 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2], 1539 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1540 active_fg => [0, 0, 1],
1452 can_hover => 1, 1541 can_hover => 1,
1453 align => 0, 1542 align => 0,
1454 valign => 0, 1543 valign => 0,
1455 can_events => 1, 1544 can_events => 1,
1456 @_ 1545 @_
1457 ) 1546 )
1458} 1547}
1459 1548
… …
1750 1839
1751sub new { 1840sub new {
1752 my ($class, %arg) = @_; 1841 my ($class, %arg) = @_;
1753 1842
1754 my $self = $class->SUPER::new ( 1843 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 1844 tooltip => $arg{type},
1845 can_hover => 1,
1756 can_events => 1, 1846 can_events => 1,
1757 can_hover => 1,
1758 %arg, 1847 %arg,
1759 ); 1848 );
1760 1849
1761 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1850 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1762 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1851 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1934 2023
1935sub new { 2024sub new {
1936 my $class = shift; 2025 my $class = shift;
1937 2026
1938 my $self = $class->SUPER::new ( 2027 my $self = $class->SUPER::new (
1939 fontsize => 1, 2028 fontsize => 1,
2029 can_events => 0,
1940 #font => default_font 2030 #font => default_font
1941 @_, 2031 @_,
1942 2032
1943 layout => (new CFClient::Layout), 2033 layout => (new CFClient::Layout),
1944 par => [], 2034 par => [],
1945 height => 0, 2035 height => 0,
1946 children => [ 2036 children => [
1947 (new CFClient::UI::Empty expand => 1), 2037 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2038 (new CFClient::UI::Slider vertical => 1),
1949 ], 2039 ],
1950 ); 2040 );
1951 2041
… …
2076 my ($self) = @_; 2166 my ($self) = @_;
2077 2167
2078 if ($self->{texture}) { 2168 if ($self->{texture}) {
2079 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2080 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1;
2081 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2082 glDisable GL_TEXTURE_2D; 2173 glDisable GL_TEXTURE_2D;
2083 } 2174 }
2084 2175
2085 $self->{children}[1]->draw; 2176 $self->{children}[1]->draw;
… …
2136 2227
2137sub new { 2228sub new {
2138 my $class = shift; 2229 my $class = shift;
2139 2230
2140 my $self = $class->SUPER::new ( 2231 my $self = $class->SUPER::new (
2141 state => 0, 2232 state => 0,
2142 connect_activate => \&toggle_flopper, 2233 connect_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2234 @_
2145 ); 2235 );
2146 2236
2147 if ($self->{state}) { 2237 if ($self->{state}) {
2148 $self->{state} = 0; 2238 $self->{state} = 0;
… …
2183 @_, 2273 @_,
2184 can_events => 0, 2274 can_events => 0,
2185 ) 2275 )
2186} 2276}
2187 2277
2188sub set_text { 2278sub set_markup {
2189 my ($self, $text) = @_; 2279 my ($self, $text) = @_;
2190 2280
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2192 $self->{label}->set_text ($text); 2282 $self->{label}->set_markup ($text);
2193 $self->add ($self->{label}); 2283 $self->add ($self->{label});
2194} 2284}
2195 2285
2196sub size_request { 2286sub size_request {
2197 my ($self) = @_; 2287 my ($self) = @_;
… …
2199 $self->child->set_max_size ($::WIDTH * 0.3); 2289 $self->child->set_max_size ($::WIDTH * 0.3);
2200 2290
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2292
2203 ($w + 4, $h + 4) 2293 ($w + 4, $h + 4)
2294}
2295
2296sub size_allocate {
2297 my ($self, $w, $h) = @_;
2298
2299 $self->SUPER::size_allocate ($w - 4, $h - 4);
2204} 2300}
2205 2301
2206sub _draw { 2302sub _draw {
2207 my ($self) = @_; 2303 my ($self) = @_;
2208 2304
… …
2233 $self->SUPER::_draw; 2329 $self->SUPER::_draw;
2234} 2330}
2235 2331
2236############################################################################# 2332#############################################################################
2237 2333
2334package CFClient::UI::Face;
2335
2336our @ISA = CFClient::UI::Base::;
2337
2338use CFClient::OpenGL;
2339
2340sub new {
2341 my $class = shift;
2342
2343 $class->SUPER::new (
2344 aspect => 1,
2345 @_,
2346 )
2347}
2348
2349sub size_request {
2350 (32, 8)
2351}
2352
2353sub draw {
2354 my ($self) = @_;
2355
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357
2358 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 }
2368}
2369
2370#############################################################################
2371
2238package CFClient::UI::Root; 2372package CFClient::UI::Root;
2239 2373
2240our @ISA = CFClient::UI::Container::; 2374our @ISA = CFClient::UI::Container::;
2241 2375
2242use CFClient::OpenGL; 2376use CFClient::OpenGL;

Diff Legend

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