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.151 by root, Sun Apr 23 00:57:39 2006 UTC vs.
Revision 1.247 by root, Sun May 28 01:16:04 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
16sub check_tooltip { 39sub check_tooltip {
17 if (!$GRAB) { 40 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
20 43
21 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 45 $TOOLTIP->{owner} = $widget;
46
47 my $tip = $widget->{tooltip};
48
49 $tip = $tip->($widget) if CODE:: eq ref $tip;
50
23 $TOOLTIP->set_text ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $TOOLTIP->show; 52 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
26 } 62 }
27 63
28 return; 64 return;
29 } 65 }
30 } 66 }
… …
34 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
35} 71}
36 72
37# class methods for events 73# class methods for events
38sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_down => $_[0])
76 if $FOCUS;
40} 77}
41 78
42sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS;
44} 82}
45 83
46sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
47 my ($ev) = @_; 85 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 check_tooltip; 94 check_tooltip;
57 } 95 }
58 96
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 98
61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
100 if $GRAB;
62} 101}
63 102
64sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
65 my ($ev) = @_; 104 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
67 106
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 108
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 110
72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
112 if $GRAB;
73 113
74 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 116 $grab->update if $grab;
77 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 134
95 check_tooltip; 135 check_tooltip;
96 } 136 }
97 137
98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER;
99} 140}
100 141
101# convert position array to integers 142# convert position array to integers
102sub harmonize { 143sub harmonize {
103 my ($vals) = @_; 144 my ($vals) = @_;
… …
109 $rem += $_ - $i; 150 $rem += $_ - $i;
110 $_ = $i; 151 $_ = $i;
111 } 152 }
112} 153}
113 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
183 }
184 }
185
186 reconfigure_widgets;
187}
188
114############################################################################# 189#############################################################################
115 190
116package CFClient::UI::Base; 191package CFClient::UI::Base;
117 192
118use strict; 193use strict;
… …
121 196
122sub new { 197sub new {
123 my $class = shift; 198 my $class = shift;
124 199
125 my $self = bless { 200 my $self = bless {
126 x => 0, 201 x => 0,
127 y => 0, 202 y => 0,
128 z => 0, 203 z => 0,
129 can_events => 1, 204 can_events => 1,
130 @_ 205 @_
131 }, $class; 206 }, $class;
132 207
133 for (keys %$self) { 208 for (keys %$self) {
134 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
135 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
136 } 211 }
137 } 212 }
138 213
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
139 $self 223 $self
140} 224}
141 225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234}
235
236sub destroy {
237 my ($self) = @_;
238
239 $self->hide;
240 %$self = ();
241}
242
142sub show { 243sub show {
143 my ($self) = @_; 244 my ($self) = @_;
144
145 return if $self->{parent}; 245 return if $self->{parent};
146 246
147 $CFClient::UI::ROOT->add ($self); 247 $CFClient::UI::ROOT->add ($self);
148} 248}
149 249
250sub center {
251 my ($self) = @_;
252
253 $CFClient::UI::ROOT->on_post_alloc (
254 "center_$self" => sub {
255 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
256 },
257 );
258
259 $self->update;
260}
261
262sub set_visible {
263 my ($self) = @_;
264
265 return if $self->{visible};
266
267 $self->{root} = $self->{parent}{root};
268 $self->{visible} = $self->{parent}{visible} + 1;
269
270 $self->emit (visibility_change => 1)
271}
272
273sub set_invisible {
274 my ($self) = @_;
275
276 return unless $self->{visible};
277
278 # broken show/hide model
279
280 delete $self->{root};
281 delete $self->{visible};
282
283 undef $GRAB if $GRAB == $self;
284 undef $HOVER if $HOVER == $self;
285
286 CFClient::UI::check_tooltip
287 if $CFClient::UI::TOOLTIP->{owner} == $self;
288
289 $self->focus_out;
290
291 $self->emit (visibility_change => 0);
292}
293
150sub hide { 294sub hide {
151 my ($self) = @_; 295 my ($self) = @_;
152 296
153 return unless $self->{parent}; 297 $self->set_invisible;
154 298
155 $self->{parent}->remove ($self); 299 $self->{parent}->remove ($self)
300 if $self->{parent};
156} 301}
157 302
158sub move { 303sub move {
159 my ($self, $x, $y, $z) = @_; 304 my ($self, $x, $y, $z) = @_;
160 305
… …
163 $self->{z} = $z if defined $z; 308 $self->{z} = $z if defined $z;
164 309
165 $self->update; 310 $self->update;
166} 311}
167 312
168sub needs_redraw { 313sub set_size {
169 0 314 my ($self, $w, $h) = @_;
315
316 $self->{def_w} = $w;
317 $self->{def_h} = $h;
318
319 $self->check_size;
170} 320}
171 321
172sub size_request { 322sub size_request {
173 require Carp; 323 require Carp;
174 Carp::confess "size_request is abstract"; 324 Carp::confess "size_request is abstract";
… …
194 $self->{y} = $y; 344 $self->{y} = $y;
195 $self->update; 345 $self->update;
196 } 346 }
197 347
198 if ($self->{w} != $w || $self->{h} != $h) { 348 if ($self->{w} != $w || $self->{h} != $h) {
199 $self->{w} = $w; 349 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
200 $self->{h} = $h;
201
202 $self->size_allocate ($w, $h);
203 $self->update;
204 } 350 }
205} 351}
206 352
207sub size_allocate { 353sub size_allocate {
208 # nothing to be done 354 # nothing to be done
209} 355}
210 356
211# return top left coordinates 357sub reconfigure {
212sub _topleft { 358 my ($self) = @_;
359
360 $self->check_size (1);
361 $self->update;
362}
363
364sub children {
365}
366
367sub set_max_size {
213 my ($self, $x, $y) = @_; 368 my ($self, $w, $h) = @_;
214 369
215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 370 delete $self->{max_w}; $self->{max_w} = $w if $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h;
372}
373
374sub set_tooltip {
375 my ($self, $tooltip) = @_;
376
377 $tooltip =~ s/^\s+//;
378 $tooltip =~ s/\s+$//;
379
380 return if $self->{tooltip} eq $tooltip;
381
382 $self->{tooltip} = $tooltip;
383
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip;
387 }
216} 388}
217 389
218# translate global coordinates to local coordinate system 390# translate global coordinates to local coordinate system
219sub coord2local { 391sub coord2local {
220 my ($self, $x, $y) = @_; 392 my ($self, $x, $y) = @_;
221 393
222 my ($X, $Y) = $self->_topleft; 394 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
223 ($x - $X, $y - $Y)
224} 395}
225 396
226# translate local coordinates to global coordinate system 397# translate local coordinates to global coordinate system
227sub coord2global { 398sub coord2global {
228 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
229 400
230 my ($X, $Y) = $self->_topleft; 401 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
231 ($x + $X, $y + $Y)
232} 402}
233 403
234sub focus_in { 404sub focus_in {
235 my ($self) = @_; 405 my ($self) = @_;
236 406
237 return if $FOCUS == $self; 407 return if $FOCUS == $self;
238 return unless $self->{can_focus}; 408 return unless $self->{can_focus};
239 409
240 my $focus = $FOCUS; $FOCUS = $self; 410 my $focus = $FOCUS; $FOCUS = $self;
241 411
242 $self->emit (focus_in => $focus); 412 $self->_emit (focus_in => $focus);
243 413
244 $focus->update if $focus; 414 $focus->update if $focus;
245 $FOCUS->update; 415 $FOCUS->update;
246} 416}
247 417
… …
250 420
251 return unless $FOCUS == $self; 421 return unless $FOCUS == $self;
252 422
253 my $focus = $FOCUS; undef $FOCUS; 423 my $focus = $FOCUS; undef $FOCUS;
254 424
255 $self->emit (focus_out => $focus); 425 $self->_emit (focus_out => $focus);
256 426
257 $focus->update if $focus; #? 427 $focus->update if $focus; #?
428
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
430 unless $FOCUS;
258} 431}
259 432
260sub mouse_motion { } 433sub mouse_motion { }
261sub button_up { } 434sub button_up { }
262sub key_down { } 435sub key_down { }
263sub key_up { } 436sub key_up { }
264 437
265sub button_down { 438sub button_down {
266 my ($self, $ev, $x, $y) = @_; 439 my ($self, $ev, $x, $y) = @_;
267 440
268 $self->focus_in; 441 $self->focus_in;
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 469 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 470 glVertex $x , $y + $self->{h};
298 glEnd; 471 glEnd;
299 glDisable GL_BLEND; 472 glDisable GL_BLEND;
300 } 473 }
474
475 if ($ENV{PCLIENT_DEBUG}) {
476 glPushMatrix;
477 glColor 1, 1, 0, 1;
478 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
479 glBegin GL_LINE_LOOP;
480 glVertex 0 , 0;
481 glVertex $self->{w} - 1, 0;
482 glVertex $self->{w} - 1, $self->{h} - 1;
483 glVertex 0 , $self->{h} - 1;
484 glEnd;
485 glPopMatrix;
486 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
487 }
301} 488}
302 489
303sub _draw { 490sub _draw {
304 my ($self) = @_; 491 my ($self) = @_;
305 492
… …
320 507
321sub set_parent { 508sub set_parent {
322 my ($self, $parent) = @_; 509 my ($self, $parent) = @_;
323 510
324 Scalar::Util::weaken ($self->{parent} = $parent); 511 Scalar::Util::weaken ($self->{parent} = $parent);
512
513 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
515 $self->check_size;
325} 516}
326 517
327sub check_size { 518sub check_size {
328 my ($self) = @_; 519 my ($self, $forced) = @_;
329 520
330 return unless $self->{parent}; 521 $self->{force_alloc} = 1 if $forced;
331 522 $CFClient::UI::ROOT->{check_size}{$self} = $self;
332 my ($w, $h) = $self->size_request;
333
334 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w;
336 $self->{req_h} = $h;
337
338 $self->{parent}->check_size;
339 }
340} 523}
341 524
342sub update { 525sub update {
343 my ($self) = @_; 526 my ($self) = @_;
344 527
… …
350 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
351 534
352 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
353} 536}
354 537
538sub _emit {
539 my ($self, $signal, @args) = @_;
540
541 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
542}
543
355sub emit { 544sub emit {
356 my ($self, $signal, @args) = @_; 545 my ($self, $signal, @args) = @_;
357 546
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 547 $self->_emit ($signal, @args)
359 $cb->($self, @args); 548 || $self->$signal (@args);
360 } 549}
550
551sub visibility_change {
552 #my ($self, $visible) = @_;
361} 553}
362 554
363sub DESTROY { 555sub DESTROY {
364 my ($self) = @_; 556 my ($self) = @_;
365 557
558 delete $WIDGET{$self+0};
366 #$self->deactivate; 559 #$self->deactivate;
367} 560}
368 561
369############################################################################# 562#############################################################################
370 563
… …
379 my $class = shift; 572 my $class = shift;
380 573
381 # range [value, low, high, page] 574 # range [value, low, high, page]
382 575
383 $class->SUPER::new ( 576 $class->SUPER::new (
384 bg => [0, 0, 0, 0.2], 577 #bg => [0, 0, 0, 0.2],
385 active_bg => [1, 1, 1, 0.5], 578 #active_bg => [1, 1, 1, 0.5],
386 @_ 579 @_
387 ) 580 )
388} 581}
389 582
390sub _draw { 583sub _draw {
391 my ($self) = @_; 584 my ($self) = @_;
392 585
586 my $color = $FOCUS == $self && $self->{active_bg}
587 ? $self->{active_bg}
588 : $self->{bg};
589
590 if ($color && (@$color < 4 || $color->[3])) {
393 my ($w, $h) = @$self{qw(w h)}; 591 my ($w, $h) = @$self{qw(w h)};
394 592
395 glEnable GL_BLEND; 593 glEnable GL_BLEND;
396 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
397 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 595 glColor @$color;
398 596
399 glBegin GL_QUADS; 597 glBegin GL_QUADS;
400 glVertex 0 , 0; 598 glVertex 0 , 0;
401 glVertex 0 , $h; 599 glVertex 0 , $h;
402 glVertex $w, $h; 600 glVertex $w, $h;
403 glVertex $w, 0; 601 glVertex $w, 0;
404 glEnd; 602 glEnd;
405 603
406 glDisable GL_BLEND; 604 glDisable GL_BLEND;
605 }
407} 606}
408 607
409############################################################################# 608#############################################################################
410 609
411package CFClient::UI::Empty; 610package CFClient::UI::Empty;
… …
432sub new { 631sub new {
433 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
434 633
435 my $children = delete $arg{children} || []; 634 my $children = delete $arg{children} || [];
436 635
437 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 636 my $self = $class->SUPER::new (
637 children => [],
638 can_events => 0,
639 %arg,
640 );
438 $self->add ($_) for @$children; 641 $self->add ($_) for @$children;
439 642
440 $self 643 $self
441} 644}
442 645
443sub add { 646sub add {
444 my ($self, $child) = @_; 647 my ($self, @widgets) = @_;
445 648
446 $child->set_parent ($self); 649 $_->set_parent ($self)
650 for @widgets;
447 651
448 use sort 'stable'; 652 use sort 'stable';
449 653
450 $self->{children} = [ 654 $self->{children} = [
451 sort { $a->{z} <=> $b->{z} } 655 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 656 @{$self->{children}}, @widgets
453 ]; 657 ];
454 658
455 $child->check_size; 659 $self->check_size (1);
660 $self->update;
661}
662
663sub children {
664 @{ $_[0]{children} }
456} 665}
457 666
458sub remove { 667sub remove {
459 my ($self, $child) = @_; 668 my ($self, $child) = @_;
460 669
461 delete $child->{parent}; 670 delete $child->{parent};
671 $child->hide;
462 672
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 673 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
674
675 $self->check_size (1);
676 $self->update;
677}
678
679sub clear {
680 my ($self) = @_;
681
682 my $children = delete $self->{children};
683 $self->{children} = [];
684
685 for (@$children) {
686 delete $_->{parent};
687 $_->hide;
688 }
464 689
465 $self->check_size; 690 $self->check_size;
466 $self->update; 691 $self->update;
467} 692}
468 693
… …
546} 771}
547 772
548sub update { 773sub update {
549 my ($self) = @_; 774 my ($self) = @_;
550 775
551 # we want to do this delayed... 776 $ROOT->on_post_alloc ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 777 $self->SUPER::update;
554}
555
556sub render_chld {
557 my ($self) = @_;
558
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1;
561 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw;
563 };
564} 778}
565 779
566sub size_allocate { 780sub size_allocate {
567 my ($self, $w, $h) = @_; 781 my ($self, $w, $h) = @_;
568 782
569 $self->child->configure (0, 0, $w, $h); 783 $self->SUPER::size_allocate ($w, $h);
784 $self->update;
785}
570 786
787sub _render {
788 $_[0]{children}[0]->draw;
789}
790
791sub render_child {
792 my ($self) = @_;
793
794 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
795 glClearColor 0, 0, 0, 0;
796 glClear GL_COLOR_BUFFER_BIT;
797
571 $self->render_chld; 798 $self->_render;
799 };
572} 800}
573 801
574sub _draw { 802sub _draw {
575 my ($self) = @_; 803 my ($self) = @_;
576 804
577 my ($w, $h) = ($self->w, $self->h); 805 my ($w, $h) = ($self->w, $self->h);
578 806
579 my $tex = $self->{texture} 807 my $tex = $self->{texture}
580 or return; 808 or return;
581 809
582 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 810 glEnable GL_TEXTURE_2D;
585 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 glColor 1, 1, 1, 1;
586 813
587 $tex->draw_quad (0, 0, $w, $h); 814 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
588 815
589 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 816 glDisable GL_TEXTURE_2D;
591} 817}
592 818
593############################################################################# 819#############################################################################
594 820
595package CFClient::UI::ViewPort; 821package CFClient::UI::ViewPort;
596 822
597our @ISA = CFClient::UI::Window::; 823our @ISA = CFClient::UI::Window::;
598
599sub new { die }
600
601sub size_request {
602 my ($self) = @_;
603
604 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
606
607 @$self{qw(child_w child_h)}
608}
609
610sub _draw {
611 my ($self) = @_;
612
613 $self->{children}[1]->draw;
614}
615
616
617#############################################################################
618
619package CFClient::UI::Frame;
620
621our @ISA = CFClient::UI::Bin::;
622
623use CFClient::OpenGL;
624 824
625sub new { 825sub new {
626 my $class = shift; 826 my $class = shift;
627 827
628 my $self = $class->SUPER::new ( 828 $class->SUPER::new (
629 bg => [1, 1, 1, 1], 829 scroll_x => 0,
630 border_bg => [1, 1, 1, 1], 830 scroll_y => 1,
631 border => 0.8,
632 @_ 831 @_,
633 ); 832 )
634
635 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643} 833}
644 834
645sub size_request { 835sub size_request {
646 my ($self) = @_; 836 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h}) 837
838 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
839
840 $w = 10 if $self->{scroll_x};
841 $h = 10 if $self->{scroll_y};
842
843 ($w, $h)
648} 844}
649 845
650sub size_allocate { 846sub size_allocate {
651 my ($self, $w, $h) = @_; 847 my ($self, $w, $h) = @_;
652 $self->{w} = $w; 848
653 $self->{h} = $h; 849 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
850 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
851
654 $self->child->configure (0, 0, $w, $h); 852 $self->child->configure (0, 0, $w, $h);
853 $self->update;
854}
855
856sub set_offset {
857 my ($self, $x, $y) = @_;
858
859 $self->{view_x} = int $x;
860 $self->{view_y} = int $y;
861
862 $self->update;
863}
864
865# hmm, this does not work for topleft of $self... but we should not ask for that
866sub coord2local {
867 my ($self, $x, $y) = @_;
868
869 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
870}
871
872sub coord2global {
873 my ($self, $x, $y) = @_;
874
875 $x = List::Util::min $self->{w}, $x - $self->{view_x};
876 $y = List::Util::min $self->{h}, $y - $self->{view_y};
877
878 $self->SUPER::coord2global ($x, $y)
879}
880
881sub find_widget {
882 my ($self, $x, $y) = @_;
883
884 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
885 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
886 ) {
887 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
888 } else {
889 $self->CFClient::UI::Base::find_widget ($x, $y)
890 }
891}
892
893sub _render {
894 my ($self) = @_;
895
896 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
897
898 $self->SUPER::_render;
899}
900
901#############################################################################
902
903package CFClient::UI::ScrolledWindow;
904
905our @ISA = CFClient::UI::HBox::;
906
907sub new {
908 my $class = shift;
909
910 my $self;
911
912 my $slider = new CFClient::UI::Slider
913 vertical => 1,
914 range => [0, 0, 1, 0.01], # HACK fix
915 on_changed => sub {
916 $self->{vp}->set_offset (0, $_[1]);
917 },
918 ;
919
920 $self = $class->SUPER::new (
921 vp => (new CFClient::UI::ViewPort expand => 1),
922 slider => $slider,
923 @_,
924 );
925
926 $self->{vp}->add ($self->{scrolled});
927 $self->add ($self->{vp});
928 $self->add ($self->{slider});
929
930 $self
931}
932
933sub update {
934 my ($self) = @_;
935
936 $self->SUPER::update;
937
938 # todo: overwrite size_allocate of child
939 my $child = $self->{vp}->child;
940 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
941}
942
943sub size_allocate {
944 my ($self, $w, $h) = @_;
945
946 $self->SUPER::size_allocate ($w, $h);
947
948 my $child = $self->{vp}->child;
949 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
950}
951
952#TODO# update range on size_allocate depending on child
953# update viewport offset on scroll
954
955#############################################################################
956
957package CFClient::UI::Frame;
958
959our @ISA = CFClient::UI::Bin::;
960
961use CFClient::OpenGL;
962
963sub new {
964 my $class = shift;
965
966 $class->SUPER::new (
967 bg => undef,
968 @_,
969 )
655} 970}
656 971
657sub _draw { 972sub _draw {
658 my ($self) = @_; 973 my ($self) = @_;
659 974
660 my ($w, $h) = ($self->{w}, $self->{h}); 975 if ($self->{bg}) {
976 my ($w, $h) = @$self{qw(w h)};
661 977
662 glEnable GL_BLEND; 978 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 979 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 980 glColor @{ $self->{bg} };
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
666 981
667# glBegin GL_QUADS; 982 glBegin GL_QUADS;
668# glColor 0, 0, 0, 0;
669# glVertex 0 , 0; 983 glVertex 0 , 0;
670# glVertex 0 , $h; 984 glVertex 0 , $h;
671# glVertex $w, $h; 985 glVertex $w, $h;
672# glVertex $w, 0; 986 glVertex $w, 0;
673# glEnd; 987 glEnd;
674 988
675
676 $self->child->draw;
677 glDisable GL_BLEND; 989 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D; 990 }
991
992 $self->SUPER::_draw;
679} 993}
680 994
681############################################################################# 995#############################################################################
682 996
683package CFClient::UI::FancyFrame; 997package CFClient::UI::FancyFrame;
… …
691 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1005 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
692 1006
693sub new { 1007sub new {
694 my $class = shift; 1008 my $class = shift;
695 1009
696 # TODO: user_x, user_y, overwrite moveto?
697
698 my $self = $class->SUPER::new ( 1010 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 1011 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 1012 border_bg => [1, 1, 1, 1],
701 border => 0.8, 1013 border => 0.6,
1014 is_toplevel => 1,
702 can_events => 1, 1015 can_events => 1,
703 @_ 1016 @_
704 ); 1017 );
705 1018
706 $self->{title} &&= new CFClient::UI::Label 1019 $self->{title} &&= new CFClient::UI::Label
707 align => 0, 1020 align => 0,
708 valign => 1, 1021 valign => 1,
709 text => $self->{title}, 1022 text => $self->{title},
710 fontsize => 1; 1023 fontsize => $self->{border};
711 1024
712 $self 1025 $self
713} 1026}
714 1027
715sub border { 1028sub border {
716 int $_[0]{border} * $::FONTSIZE 1029 int $_[0]{border} * $::FONTSIZE
717} 1030}
718 1031
719sub size_request { 1032sub size_request {
720 my ($self) = @_; 1033 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723 1034
724 my ($w, $h) = $self->SUPER::size_request; 1035 my ($w, $h) = $self->SUPER::size_request;
725 1036
726 ( 1037 (
727 $w + $self->border * 2, 1038 $w + $self->border * 2,
… …
733 my ($self, $w, $h) = @_; 1044 my ($self, $w, $h) = @_;
734 1045
735 $h -= List::Util::max 0, $self->border * 2; 1046 $h -= List::Util::max 0, $self->border * 2;
736 $w -= List::Util::max 0, $self->border * 2; 1047 $w -= List::Util::max 0, $self->border * 2;
737 1048
738 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1049 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
739 if $self->{title}; 1050 if $self->{title};
740 1051
741 $self->child->configure ($self->border, $self->border, $w, $h); 1052 $self->child->configure ($self->border, $self->border, $w, $h);
742} 1053}
743 1054
744sub button_down { 1055sub button_down {
745 my ($self, $ev, $x, $y) = @_; 1056 my ($self, $ev, $x, $y) = @_;
746 1057
1058 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 1059 my $border = $self->border;
748 1060
749 if ($x < $self->{w} && $x >= $self->{w} - $border 1061 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 1062 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 1063
1064 if ($lr & $td) {
1065 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1066 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 1067 my ($bw, $bh) = ($self->{w}, $self->{h});
754 1068
1069 my $mx = $x < $border;
1070 my $my = $y < $border;
1071
755 $self->{motion} = sub { 1072 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 1073 my ($ev, $x, $y) = @_;
757 1074
758 ($x, $y) = ($ev->{x}, $ev->{y}); 1075 my $dx = $ev->{x} - $ox;
1076 my $dy = $ev->{y} - $oy;
759 1077
760 $self->{user_w} = $bw + $x - $ox; 1078 $self->{user_x} = $wx + $dx * $mx;
761 $self->{user_h} = $bh + $y - $oy; 1079 $self->{user_y} = $wy + $dy * $my;
1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1082 $self->move ($self->{user_x}, $self->{user_y});
762 $self->check_size; 1083 $self->check_size;
763 }; 1084 };
764 1085
765 } elsif ($x >= 0 && $x < $self->{w} 1086 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1087 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 1088 my ($bx, $by) = ($self->{x}, $self->{y});
770 1089
771 $self->{motion} = sub { 1090 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 1091 my ($ev, $x, $y) = @_;
773 1092
774 ($x, $y) = ($ev->{x}, $ev->{y}); 1093 ($x, $y) = ($ev->{x}, $ev->{y});
775 1094
776 $self->move ($bx + $x - $ox, $by + $y - $oy); 1095 $self->{user_x} = $bx + $x - $ox;
1096 $self->{user_y} = $by + $y - $oy;
1097
1098 $self->move ($self->{user_x}, $self->{user_y});
777 $self->update; 1099 $self->update;
778 }; 1100 };
779 } 1101 }
780} 1102}
781 1103
… …
795 my ($self) = @_; 1117 my ($self) = @_;
796 1118
797 my ($w, $h ) = ($self->{w}, $self->{h}); 1119 my ($w, $h ) = ($self->{w}, $self->{h});
798 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
799 1121
800 glEnable GL_BLEND;
801 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
802 glEnable GL_TEXTURE_2D; 1122 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
804 1124
805 my $border = $self->border; 1125 my $border = $self->border;
806 1126
807 glColor @{ $self->{border_bg} }; 1127 glColor @{ $self->{border_bg} };
808 $tex[1]->draw_quad (0, 0, $w, $border); 1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
812 1132
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
813 my $bg = $tex[0]; 1134 my $bg = $tex[0];
814 1135
815 # TODO: repeat texture not scale 1136 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 1137 my $rep_x = $cw / $bg->{w};
817 my $rep_y = $ch / $bg->{h}; 1138 my $rep_y = $ch / $bg->{h};
818 1139
819 glColor @{ $self->{bg} }; 1140 glColor @{ $self->{bg} };
820 1141
821 $bg->{s} = $rep_x; 1142 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y; 1143 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1; 1144 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 }
825 1147
826 glDisable GL_TEXTURE_2D; 1148 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND;
828 1149
829 $self->{title}->draw if $self->{title}; 1150 $self->{title}->draw if $self->{title};
1151
830 $self->child->draw; 1152 $self->child->draw;
831} 1153}
832 1154
833############################################################################# 1155#############################################################################
834 1156
… …
843sub new { 1165sub new {
844 my $class = shift; 1166 my $class = shift;
845 1167
846 $class->SUPER::new ( 1168 $class->SUPER::new (
847 col_expand => [], 1169 col_expand => [],
848 @_ 1170 @_,
849 ) 1171 )
1172}
1173
1174sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} }
850} 1176}
851 1177
852sub add { 1178sub add {
853 my ($self, $x, $y, $child) = @_; 1179 my ($self, $x, $y, $child) = @_;
854 1180
855 $child->set_parent ($self); 1181 $child->set_parent ($self);
856 $self->{children}[$y][$x] = $child; 1182 $self->{children}[$y][$x] = $child;
857 1183
858 $child->check_size; 1184 $self->check_size (1);
859} 1185}
860 1186
861# TODO: move to container class maybe? send childs a signal on removal? 1187# TODO: move to container class maybe? send children a signal on removal?
862sub clear { 1188sub clear {
863 my ($self) = @_; 1189 my ($self) = @_;
864 1190
1191 my @children = $self->children;
865 delete $self->{children}; 1192 delete $self->{children};
1193
1194 for (@children) {
1195 delete $_->{parent};
1196 $_->hide;
1197 }
1198
1199 $self->check_size (1);
866 $self->update; 1200 $self->update;
867} 1201}
868 1202
869sub get_wh { 1203sub get_wh {
870 my ($self) = @_; 1204 my ($self) = @_;
… …
902sub size_allocate { 1236sub size_allocate {
903 my ($self, $w, $h) = @_; 1237 my ($self, $w, $h) = @_;
904 1238
905 my ($ws, $hs) = $self->get_wh; 1239 my ($ws, $hs) = $self->get_wh;
906 1240
907 my $req_w = sum @$ws; 1241 my $req_w = (sum @$ws) || 1;
908 my $req_h = sum @$hs; 1242 my $req_h = (sum @$hs) || 1;
909 1243
910 # TODO: nicer code && do row_expand 1244 # TODO: nicer code && do row_expand
911 my @col_expand = @{$self->{col_expand}}; 1245 my @col_expand = @{$self->{col_expand}};
912 @col_expand = (1) x @$ws unless @col_expand; 1246 @col_expand = (1) x @$ws unless @col_expand;
913 my $col_expand = (sum @col_expand) || 1; 1247 my $col_expand = (sum @col_expand) || 1;
… …
967 } 1301 }
968} 1302}
969 1303
970############################################################################# 1304#############################################################################
971 1305
972package CFClient::UI::HBox; 1306package CFClient::UI::Box;
973
974# TODO: wrap into common Box base class
975 1307
976our @ISA = CFClient::UI::Container::; 1308our @ISA = CFClient::UI::Container::;
977 1309
978sub size_request { 1310sub size_request {
979 my ($self) = @_; 1311 my ($self) = @_;
980 1312
981 my @alloc = map [$_->size_request], @{$self->{children}}; 1313 $self->{vertical}
982 1314 ? (
983 ( 1315 (List::Util::max map $_->{req_w}, @{$self->{children}}),
984 (List::Util::sum map $_->[0], @alloc), 1316 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
985 (List::Util::max map $_->[1], @alloc), 1317 )
986 ) 1318 : (
1319 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1320 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1321 )
987} 1322}
988 1323
989sub size_allocate { 1324sub size_allocate {
990 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
991 1326
992 ($h, $w) = ($w, $h); 1327 my $space = $self->{vertical} ? $h : $w;
993
994 my $children = $self->{children}; 1328 my $children = $self->{children};
995 1329
996 my @h = map $_->{req_w}, @$children; 1330 my @req;
997 1331
998 my $req_h = List::Util::sum @h; 1332 if ($self->{homogeneous}) {
999 1333 @req = ($space / (@$children || 1)) x @$children;
1000 if ($req_h > $h) {
1001 # ah well, not enough space
1002 $_ *= $h / $req_h for @h;
1003 } else { 1334 } else {
1335 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1336 my $req = List::Util::sum @req;
1337
1338 if ($req > $space) {
1339 # ah well, not enough space
1340 $_ *= $space / $req for @req;
1341 } else {
1004 my $exp = List::Util::sum map $_->{expand}, @$children; 1342 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1005 $exp ||= 1;
1006 1343
1344 $space = ($space - $req) / $expand; # remaining space to give away
1345
1346 $req[$_] += $space * $children->[$_]{expand}
1007 for (0 .. $#$children) { 1347 for 0 .. $#$children;
1008 my $child = $children->[$_];
1009
1010 my $alloc_h = $h[$_];
1011 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1012 $h[$_] = $alloc_h;
1013 } 1348 }
1014 } 1349 }
1015 1350
1016 CFClient::UI::harmonize \@h; 1351 CFClient::UI::harmonize \@req;
1017 1352
1018 my $y = 0; 1353 my $pos = 0;
1019 for (0 .. $#$children) { 1354 for (0 .. $#$children) {
1020 my $child = $children->[$_];
1021 my $h = $h[$_]; 1355 my $alloc = $req[$_];
1022 $child->configure ($y, 0, $h, $w); 1356 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1023 1357
1024 $y += $h; 1358 $pos += $alloc;
1025 } 1359 }
1026 1360
1027 1 1361 1
1028} 1362}
1029 1363
1030############################################################################# 1364#############################################################################
1031 1365
1366package CFClient::UI::HBox;
1367
1368our @ISA = CFClient::UI::Box::;
1369
1370sub new {
1371 my $class = shift;
1372
1373 $class->SUPER::new (
1374 vertical => 0,
1375 @_,
1376 )
1377}
1378
1379#############################################################################
1380
1032package CFClient::UI::VBox; 1381package CFClient::UI::VBox;
1033 1382
1034# TODO: wrap into common Box base class
1035
1036our @ISA = CFClient::UI::Container::; 1383our @ISA = CFClient::UI::Box::;
1037 1384
1038sub size_request { 1385sub new {
1039 my ($self) = @_; 1386 my $class = shift;
1040 1387
1041 my @alloc = map [$_->size_request], @{$self->{children}}; 1388 $class->SUPER::new (
1042 1389 vertical => 1,
1043 ( 1390 @_,
1044 (List::Util::max map $_->[0], @alloc),
1045 (List::Util::sum map $_->[1], @alloc),
1046 ) 1391 )
1047} 1392}
1048 1393
1049sub size_allocate {
1050 my ($self, $w, $h) = @_;
1051
1052 my $children = $self->{children};
1053
1054 my @h = map $_->{req_h}, @$children;
1055
1056 my $req_h = List::Util::sum @h;
1057
1058 if ($req_h > $h) {
1059 # ah well, not enough space
1060 $_ *= $h / $req_h for @h;
1061 } else {
1062 my $exp = List::Util::sum map $_->{expand}, @$children;
1063 $exp ||= 1;
1064
1065 for (0 .. $#$children) {
1066 my $child = $children->[$_];
1067
1068 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1069 }
1070 }
1071
1072 CFClient::UI::harmonize \@h;
1073
1074 my $y = 0;
1075 for (0 .. $#$children) {
1076 my $child = $children->[$_];
1077 my $h = $h[$_];
1078 $child->configure (0, $y, $w, $h);
1079
1080 $y += $h;
1081 }
1082
1083 1
1084}
1085
1086############################################################################# 1394#############################################################################
1087 1395
1088package CFClient::UI::Label; 1396package CFClient::UI::Label;
1089 1397
1090our @ISA = CFClient::UI::Base::; 1398our @ISA = CFClient::UI::DrawBG::;
1091 1399
1092use CFClient::OpenGL; 1400use CFClient::OpenGL;
1093 1401
1094sub new { 1402sub new {
1095 my ($class, %arg) = @_; 1403 my ($class, %arg) = @_;
1096 1404
1097 my $self = $class->SUPER::new ( 1405 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1406 fg => [1, 1, 1],
1407 #bg => none
1408 #active_bg => none
1409 #font => default_font
1410 #text => initial text
1411 #markup => initial narkup
1412 #max_w => maximum pixel width
1413 ellipsise => 3, # end
1414 layout => (new CFClient::Layout),
1099 fontsize => 1, 1415 fontsize => 1,
1100 text => "",
1101 align => -1, 1416 align => -1,
1102 valign => -1, 1417 valign => -1,
1103 padding => 2, 1418 padding => 2,
1104 layout => new CFClient::Layout,
1105 can_events => 0, 1419 can_events => 0,
1106 %arg 1420 %arg
1107 ); 1421 );
1108 1422
1109 if (exists $self->{template}) { 1423 if (exists $self->{template}) {
1110 my $layout = new CFClient::Layout; 1424 my $layout = new CFClient::Layout;
1111 $layout->set_text (delete $self->{template}); 1425 $layout->set_text (delete $self->{template});
1112 $self->{template} = $layout; 1426 $self->{template} = $layout;
1113 } 1427 }
1114 1428
1115 $self->set_text (delete $self->{text}) if exists $self->{text}; 1429 if (exists $self->{markup}) {
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1430 $self->set_markup (delete $self->{markup});
1431 } else {
1432 $self->set_text (delete $self->{text});
1433 }
1117 1434
1118 $self 1435 $self
1119} 1436}
1120 1437
1121sub escape_text { 1438sub escape($) {
1122 local $_ = $_[1]; 1439 local $_ = $_[0];
1123 1440
1124 s/&/&amp;/g; 1441 s/&/&amp;/g;
1125 s/>/&gt;/g; 1442 s/>/&gt;/g;
1126 s/</&lt;/g; 1443 s/</&lt;/g;
1127 1444
1128 $_[1] 1445 $_
1446}
1447
1448sub update {
1449 my ($self) = @_;
1450
1451 delete $self->{texture};
1452 $self->SUPER::update;
1129} 1453}
1130 1454
1131sub set_text { 1455sub set_text {
1132 my ($self, $text) = @_; 1456 my ($self, $text) = @_;
1133 1457
1458 return if $self->{text} eq "T$text";
1459 $self->{text} = "T$text";
1460
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1134 $self->{layout}->set_text ($text); 1462 $self->{layout}->set_text ($text);
1135 1463
1136 delete $self->{texture}; 1464 $self->update;
1137 $self->check_size; 1465 $self->check_size;
1138 $self->update;
1139} 1466}
1140 1467
1141sub set_markup { 1468sub set_markup {
1142 my ($self, $markup) = @_; 1469 my ($self, $markup) = @_;
1143 1470
1471 return if $self->{text} eq "M$markup";
1472 $self->{text} = "M$markup";
1473
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475
1476 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1144 $self->{layout}->set_markup ($markup); 1477 $self->{layout}->set_markup ($markup);
1145 1478
1146 delete $self->{texture}; 1479 $self->update;
1147 $self->check_size; 1480 $self->check_size;
1148 $self->update;
1149} 1481}
1150 1482
1151sub size_request { 1483sub size_request {
1152 my ($self) = @_; 1484 my ($self) = @_;
1153 1485
1154 $self->{layout}->set_width; 1486 $self->{layout}->set_font ($self->{font}) if $self->{font};
1487 $self->{layout}->set_width ($self->{max_w} || -1);
1488 $self->{layout}->set_ellipsise ($self->{ellipsise});
1489 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1490 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1491
1157 my ($w, $h) = $self->{layout}->size; 1492 my ($w, $h) = $self->{layout}->size;
1158 1493
1159 if (exists $self->{template}) { 1494 if (exists $self->{template}) {
1495 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1496 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1497
1162 my ($w2, $h2) = $self->{template}->size; 1498 my ($w2, $h2) = $self->{template}->size;
1163 1499
1164 $w = List::Util::max $w, $w2; 1500 $w = List::Util::max $w, $w2;
… …
1179 1515
1180sub set_fontsize { 1516sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1517 my ($self, $fontsize) = @_;
1182 1518
1183 $self->{fontsize} = $fontsize; 1519 $self->{fontsize} = $fontsize;
1520 delete $self->{texture};
1521
1522 $self->update;
1184 $self->check_size; 1523 $self->check_size;
1185} 1524}
1186 1525
1187sub _draw { 1526sub _draw {
1188 my ($self) = @_; 1527 my ($self) = @_;
1189 1528
1529 $self->SUPER::_draw; # draw background, if applicable
1530
1190 my $tex = $self->{texture} ||= do { 1531 my $tex = $self->{texture} ||= do {
1532 $self->{layout}->set_foreground (@{$self->{fg}});
1533 $self->{layout}->set_font ($self->{font}) if $self->{font};
1191 $self->{layout}->set_width ($self->{w}); 1534 $self->{layout}->set_width ($self->{w});
1535 $self->{layout}->set_ellipsise ($self->{ellipsise});
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1192 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538
1193 new_from_layout CFClient::Texture $self->{layout} 1539 my $tex = new_from_layout CFClient::Texture $self->{layout};
1540
1541 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1542 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1543 : ($self->{w} - $tex->{w}) * 0.5);
1544
1545 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1546 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1547 : ($self->{h} - $tex->{h}) * 0.5);
1548
1549 $tex
1194 }; 1550 };
1195 1551
1196 glEnable GL_BLEND;
1197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1198 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1199 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1200 1554
1555 if ($tex->{format} == GL_ALPHA) {
1201 glColor @{$self->{fg}}; 1556 glColor @{$self->{fg}};
1202
1203 $self->{ox} = int (
1204 $self->{align} < 0 ? $self->{padding}
1205 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1206 : ($self->{w} - $tex->{w}) * 0.5
1207 );
1208
1209 $self->{oy} = int (
1210 $self->{valign} < 0 ? $self->{padding}
1211 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1212 : ($self->{h} - $tex->{h}) * 0.5
1213 );
1214
1215 $tex->draw_quad ($self->{ox}, $self->{oy}); 1557 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1558 } else {
1559 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1560 }
1216 1561
1217 glDisable GL_TEXTURE_2D; 1562 glDisable GL_TEXTURE_2D;
1218 glDisable GL_BLEND;
1219} 1563}
1220 1564
1221############################################################################# 1565#############################################################################
1222 1566
1223package CFClient::UI::EntryBase; 1567package CFClient::UI::EntryBase;
… …
1228 1572
1229sub new { 1573sub new {
1230 my $class = shift; 1574 my $class = shift;
1231 1575
1232 $class->SUPER::new ( 1576 $class->SUPER::new (
1233 fg => [1, 1, 1], 1577 fg => [1, 1, 1],
1234 bg => [0, 0, 0, 0.2], 1578 bg => [0, 0, 0, 0.2],
1235 active_bg => [1, 1, 1, 0.5], 1579 active_bg => [1, 1, 1, 0.5],
1236 active_fg => [0, 0, 0], 1580 active_fg => [0, 0, 0],
1237 can_hover => 1, 1581 can_hover => 1,
1238 can_focus => 1, 1582 can_focus => 1,
1239 valign => 0, 1583 valign => 0,
1240 can_events => 1, 1584 can_events => 1,
1585 #text => ...
1241 @_ 1586 @_
1242 ) 1587 )
1243} 1588}
1244 1589
1245sub _set_text { 1590sub _set_text {
… …
1255 $self->{text} = $text; 1600 $self->{text} = $text;
1256 1601
1257 $text =~ s/./*/g if $self->{hidden}; 1602 $text =~ s/./*/g if $self->{hidden};
1258 $self->{layout}->set_text ("$text "); 1603 $self->{layout}->set_text ("$text ");
1259 1604
1260 $self->emit (changed => $self->{text}); 1605 $self->_emit (changed => $self->{text});
1261}
1262
1263sub get_text {
1264 $_[0]{text}
1265}
1266
1267sub size_request {
1268 my ($self) = @_;
1269
1270 my ($w, $h) = $self->SUPER::size_request;
1271
1272 ($w + 1, $h) # add 1 for cursor
1273}
1274
1275sub size_allocate {
1276 my ($self, $w, $h) = @_;
1277
1278 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1279} 1606}
1280 1607
1281sub set_text { 1608sub set_text {
1282 my ($self, $text) = @_; 1609 my ($self, $text) = @_;
1283 1610
1284 $self->{cursor} = length $text; 1611 $self->{cursor} = length $text;
1285 $self->_set_text ($text); 1612 $self->_set_text ($text);
1286 $self->update; 1613 $self->update;
1614 $self->check_size;
1615}
1616
1617sub get_text {
1618 $_[0]{text}
1619}
1620
1621sub size_request {
1622 my ($self) = @_;
1623
1624 my ($w, $h) = $self->SUPER::size_request;
1625
1626 ($w + 1, $h) # add 1 for cursor
1287} 1627}
1288 1628
1289sub key_down { 1629sub key_down {
1290 my ($self, $ev) = @_; 1630 my ($self, $ev) = @_;
1291 1631
… …
1293 my $sym = $ev->{sym}; 1633 my $sym = $ev->{sym};
1294 my $uni = $ev->{unicode}; 1634 my $uni = $ev->{unicode};
1295 1635
1296 my $text = $self->get_text; 1636 my $text = $self->get_text;
1297 1637
1298 if ($sym == 8) { 1638 if ($uni == 8) {
1299 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1639 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1300 } elsif ($sym == 127) { 1640 } elsif ($uni == 127) {
1301 substr $text, $self->{cursor}, 1, ""; 1641 substr $text, $self->{cursor}, 1, "";
1302 } elsif ($sym == CFClient::SDLK_LEFT) { 1642 } elsif ($sym == CFClient::SDLK_LEFT) {
1303 --$self->{cursor} if $self->{cursor}; 1643 --$self->{cursor} if $self->{cursor};
1304 } elsif ($sym == CFClient::SDLK_RIGHT) { 1644 } elsif ($sym == CFClient::SDLK_RIGHT) {
1305 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1645 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1306 } elsif ($sym == CFClient::SDLK_HOME) { 1646 } elsif ($sym == CFClient::SDLK_HOME) {
1307 $self->{cursor} = 0; 1647 $self->{cursor} = 0;
1308 } elsif ($sym == CFClient::SDLK_END) { 1648 } elsif ($sym == CFClient::SDLK_END) {
1309 $self->{cursor} = length $text; 1649 $self->{cursor} = length $text;
1310 } elsif ($sym == 27) { 1650 } elsif ($uni == 27) {
1311 $self->emit ('escape'); 1651 $self->_emit ('escape');
1312 } elsif ($uni) { 1652 } elsif ($uni) {
1313 substr $text, $self->{cursor}++, 0, chr $uni; 1653 substr $text, $self->{cursor}++, 0, chr $uni;
1314 } 1654 }
1315 1655
1316 $self->_set_text ($text); 1656 $self->_set_text ($text);
1317 $self->update; 1657 $self->update;
1658 $self->check_size;
1318} 1659}
1319 1660
1320sub focus_in { 1661sub focus_in {
1321 my ($self) = @_; 1662 my ($self) = @_;
1322 1663
… …
1398 my ($self, $ev) = @_; 1739 my ($self, $ev) = @_;
1399 1740
1400 my $sym = $ev->{sym}; 1741 my $sym = $ev->{sym};
1401 1742
1402 if ($sym == 13) { 1743 if ($sym == 13) {
1744 unshift @{$self->{history}},
1745 my $txt = $self->get_text;
1746 $self->{history_pointer} = -1;
1747 $self->{history_saveback} = '';
1403 $self->emit (activate => $self->get_text); 1748 $self->_emit (activate => $txt);
1404 $self->update; 1749 $self->update;
1750
1751 } elsif ($sym == CFClient::SDLK_UP) {
1752 if ($self->{history_pointer} < 0) {
1753 $self->{history_saveback} = $self->get_text;
1754 }
1755 if (@{$self->{history} || []} > 0) {
1756 $self->{history_pointer}++;
1757 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1758 $self->{history_pointer} = @{$self->{history} || []} - 1;
1759 }
1760 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1761 }
1762
1763 } elsif ($sym == CFClient::SDLK_DOWN) {
1764 $self->{history_pointer}--;
1765 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1766
1767 if ($self->{history_pointer} >= 0) {
1768 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1769 } else {
1770 $self->set_text ($self->{history_saveback});
1771 }
1405 1772
1406 } else { 1773 } else {
1407 $self->SUPER::key_down ($ev); 1774 $self->SUPER::key_down ($ev);
1408 } 1775 }
1409 1776
… …
1423 1790
1424sub new { 1791sub new {
1425 my $class = shift; 1792 my $class = shift;
1426 1793
1427 $class->SUPER::new ( 1794 $class->SUPER::new (
1428 padding => 4, 1795 padding => 4,
1429 fg => [1, 1, 1], 1796 fg => [1, 1, 1],
1430 bg => [1, 1, 1, 0.2],
1431 active_fg => [0, 0, 1], 1797 active_fg => [0, 0, 1],
1432 can_hover => 1, 1798 can_hover => 1,
1433 align => 0, 1799 align => 0,
1434 valign => 0, 1800 valign => 0,
1435 can_events => 1, 1801 can_events => 1,
1436 @_ 1802 @_
1437 ) 1803 )
1438} 1804}
1439 1805
1806sub activate { }
1807
1440sub button_up { 1808sub button_up {
1441 my ($self, $ev, $x, $y) = @_; 1809 my ($self, $ev, $x, $y) = @_;
1442 1810
1811 $self->emit ("activate")
1443 if ($x >= 0 && $x < $self->{w} 1812 if $x >= 0 && $x < $self->{w}
1444 && $y >= 0 && $y < $self->{h}) { 1813 && $y >= 0 && $y < $self->{h};
1445 $self->emit ("activate");
1446 }
1447} 1814}
1448 1815
1449sub _draw { 1816sub _draw {
1450 my ($self) = @_; 1817 my ($self) = @_;
1451 1818
… …
1453 1820
1454 if ($GRAB == $self) { 1821 if ($GRAB == $self) {
1455 $self->{fg} = $self->{active_fg}; 1822 $self->{fg} = $self->{active_fg};
1456 } 1823 }
1457 1824
1458 glEnable GL_BLEND;
1459 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1460 glEnable GL_TEXTURE_2D; 1825 glEnable GL_TEXTURE_2D;
1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1826 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1462 glColor 0, 0, 0, 1; 1827 glColor 0, 0, 0, 1;
1463 1828
1464 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1829 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1465 1830
1466 glDisable GL_TEXTURE_2D; 1831 glDisable GL_TEXTURE_2D;
1467 glDisable GL_BLEND;
1468 1832
1469 $self->SUPER::_draw; 1833 $self->SUPER::_draw;
1470} 1834}
1471 1835
1472############################################################################# 1836#############################################################################
… …
1486 1850
1487 $class->SUPER::new ( 1851 $class->SUPER::new (
1488 padding => 2, 1852 padding => 2,
1489 fg => [1, 1, 1], 1853 fg => [1, 1, 1],
1490 active_fg => [1, 1, 0], 1854 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5],
1491 state => 0, 1857 state => 0,
1492 can_hover => 1, 1858 can_hover => 1,
1493 @_ 1859 @_
1494 ) 1860 )
1495} 1861}
… …
1504 my ($self, $ev, $x, $y) = @_; 1870 my ($self, $ev, $x, $y) = @_;
1505 1871
1506 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1507 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1508 $self->{state} = !$self->{state}; 1874 $self->{state} = !$self->{state};
1509 $self->emit (changed => $self->{state}); 1875 $self->_emit (changed => $self->{state});
1510 } 1876 }
1511} 1877}
1512 1878
1513sub _draw { 1879sub _draw {
1514 my ($self) = @_; 1880 my ($self) = @_;
… …
1519 1885
1520 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1886 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1521 1887
1522 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1523 1889
1524 glEnable GL_BLEND; 1890 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891
1525 glEnable GL_TEXTURE_2D; 1892 glEnable GL_TEXTURE_2D;
1526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1527
1528 my $tex = $self->{state} ? $tex[1] : $tex[0];
1529
1530 $tex->draw_quad (0, 0, $s, $s); 1893 $tex->draw_quad_alpha (0, 0, $s, $s);
1531
1532 glDisable GL_TEXTURE_2D; 1894 glDisable GL_TEXTURE_2D;
1533 glDisable GL_BLEND;
1534} 1895}
1535 1896
1536############################################################################# 1897#############################################################################
1537 1898
1538package CFClient::UI::Image; 1899package CFClient::UI::Image;
… …
1581 glTranslate 0, -$self->{w}, 0; 1942 glTranslate 0, -$self->{w}, 0;
1582 1943
1583 ($w, $h) = ($h, $w); 1944 ($w, $h) = ($h, $w);
1584 } 1945 }
1585 1946
1586 glEnable GL_BLEND;
1587 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1588 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1589 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1590 1949
1591 $tex->draw_quad (0, 0, $w, $h); 1950 $tex->draw_quad_alpha (0, 0, $w, $h);
1592 1951
1593 glDisable GL_BLEND;
1594 glDisable GL_TEXTURE_2D; 1952 glDisable GL_TEXTURE_2D;
1595} 1953}
1596 1954
1597############################################################################# 1955#############################################################################
1598 1956
1599package CFClient::UI::VGauge; 1957package CFClient::UI::VGauge;
1600 1958
1601our @ISA = CFClient::UI::Base::; 1959our @ISA = CFClient::UI::Base::;
1960
1961use List::Util qw(min max);
1602 1962
1603use CFClient::OpenGL; 1963use CFClient::OpenGL;
1604 1964
1605my %tex = ( 1965my %tex = (
1606 food => [ 1966 food => [
1607 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1967 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1608 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1968 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1609 ], 1969 ],
1610 grace => [ 1970 grace => [
1611 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1971 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1612 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1972 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1613 ], 1973 ],
1614 hp => [ 1974 hp => [
1615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1975 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1616 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1976 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1617 ], 1977 ],
1618 mana => [ 1978 mana => [
1619 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1979 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1620 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1980 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1621 ], 1981 ],
1622); 1982);
1623 1983
1624# eg. VGauge->new (gauge => 'food'), default gauge: food 1984# eg. VGauge->new (gauge => 'food'), default gauge: food
1625sub new { 1985sub new {
… …
1644} 2004}
1645 2005
1646sub set_max { 2006sub set_max {
1647 my ($self, $max) = @_; 2007 my ($self, $max) = @_;
1648 2008
2009 return if $self->{max_val} == $max;
2010
1649 $self->{max_val} = $max; 2011 $self->{max_val} = $max;
2012 $self->update;
1650} 2013}
1651 2014
1652sub set_value { 2015sub set_value {
1653 my ($self, $val, $max) = @_; 2016 my ($self, $val, $max) = @_;
1654 2017
1655 $self->set_max ($max) 2018 $self->set_max ($max)
1656 if defined $max; 2019 if defined $max;
1657 2020
1658 $max = $self->{max_val}; 2021 return if $self->{val} == $val;
2022
1659 $self->{val} = $val; 2023 $self->{val} = $val;
1660
1661 $self->update; 2024 $self->update;
1662} 2025}
1663 2026
1664sub _draw { 2027sub _draw {
1665 my ($self) = @_; 2028 my ($self) = @_;
1666 2029
1667 my $tex = $tex{$self->{type}}; 2030 my $tex = $tex{$self->{type}};
2031 my ($t1, $t2, $t3) = @$tex;
1668 2032
1669 my ($w, $h) = ($self->{w}, $self->{h}); 2033 my ($w, $h) = ($self->{w}, $self->{h});
1670 2034
1671 if ($self->{vertical}) { 2035 if ($self->{vertical}) {
1672 glRotate 90, 0, 0, 1; 2036 glRotate 90, 0, 0, 1;
… …
1674 2038
1675 ($w, $h) = ($h, $w); 2039 ($w, $h) = ($h, $w);
1676 } 2040 }
1677 2041
1678 my $ycut = $self->{val} / ($self->{max_val} || 1); 2042 my $ycut = $self->{val} / ($self->{max_val} || 1);
1679 $ycut = 1 if $self->{val} > $self->{max_val};
1680 2043
1681 my $t1 = $tex->[0]; 2044 my $ycut1 = max 0, min 1, $ycut;
1682 my $t2 = $tex->[1]; 2045 my $ycut2 = max 0, min 1, $ycut - 1;
2046
2047 my $h1 = $self->{h} * (1 - $ycut1);
2048 my $h2 = $self->{h} * (1 - $ycut2);
1683 2049
1684 glEnable GL_BLEND; 2050 glEnable GL_BLEND;
1685 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2051 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1686 glEnable GL_TEXTURE_2D; 2052 glEnable GL_TEXTURE_2D;
1687 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1688 2054
1689 my $h1 = $self->{h} - $ycut * $self->{h};
1690 my $h2 = $ycut * $self->{h};
1691
1692 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2055 glBindTexture GL_TEXTURE_2D, $t1->{name};
1693 glBegin GL_QUADS; 2056 glBegin GL_QUADS;
1694 glTexCoord 0 , 0; glVertex 0 , 0; 2057 glTexCoord 0 , 0; glVertex 0 , 0;
1695 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2058 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1696 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2059 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1697 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2060 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1698 glEnd; 2061 glEnd;
1699 2062
2063 my $ycut1 = List::Util::min 1, $ycut;
1700 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2064 glBindTexture GL_TEXTURE_2D, $t2->{name};
1701 glBegin GL_QUADS; 2065 glBegin GL_QUADS;
1702 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2066 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2067 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1704 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2068 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1705 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2069 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1706 glEnd; 2070 glEnd;
2071
2072 if ($t3) {
2073 glBindTexture GL_TEXTURE_2D, $t3->{name};
2074 glBegin GL_QUADS;
2075 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2076 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2077 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2078 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2079 glEnd;
2080 }
1707 2081
1708 glDisable GL_BLEND; 2082 glDisable GL_BLEND;
1709 glDisable GL_TEXTURE_2D; 2083 glDisable GL_TEXTURE_2D;
1710} 2084}
1711 2085
… …
1717 2091
1718sub new { 2092sub new {
1719 my ($class, %arg) = @_; 2093 my ($class, %arg) = @_;
1720 2094
1721 my $self = $class->SUPER::new ( 2095 my $self = $class->SUPER::new (
1722 tooltip => $arg{type}, 2096 tooltip => $arg{type},
2097 can_hover => 1,
2098 can_events => 1,
1723 %arg, 2099 %arg,
1724 ); 2100 );
1725 2101
1726 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2102 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1727 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2103 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1728 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2104 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1729 2105
1730 $self 2106 $self
1731} 2107}
1732 2108
… …
1735 2111
1736 $self->{value}->set_fontsize ($fsize); 2112 $self->{value}->set_fontsize ($fsize);
1737 $self->{max} ->set_fontsize ($fsize); 2113 $self->{max} ->set_fontsize ($fsize);
1738} 2114}
1739 2115
2116sub set_max {
2117 my ($self, $max) = @_;
2118
2119 $self->{gauge}->set_max ($max);
2120 $self->{max}->set_text ($max);
2121}
2122
1740sub set_value { 2123sub set_value {
1741 my ($self, $val, $max) = @_; 2124 my ($self, $val, $max) = @_;
1742 2125
1743 $self->set_max ($max) 2126 $self->set_max ($max)
1744 if defined $max; 2127 if defined $max;
1745 2128
1746 $self->{gauge}->set_value ($val, $max); 2129 $self->{gauge}->set_value ($val, $max);
1747 $self->{value}->set_text ($val); 2130 $self->{value}->set_text ($val);
1748}
1749
1750sub set_max {
1751 my ($self, $max) = @_;
1752
1753 $self->{gauge}->set_max ($max);
1754 $self->{max}->set_text ($max);
1755} 2131}
1756 2132
1757############################################################################# 2133#############################################################################
1758 2134
1759package CFClient::UI::Slider; 2135package CFClient::UI::Slider;
… …
1769 qw(s1_slider.png s1_slider_bg.png); 2145 qw(s1_slider.png s1_slider_bg.png);
1770 2146
1771sub new { 2147sub new {
1772 my $class = shift; 2148 my $class = shift;
1773 2149
1774 # range [value, low, high, page] 2150 # range [value, low, high, page, unit]
1775 2151
1776 # TODO: 0-width page 2152 # TODO: 0-width page
1777 # TODO: req_w/h are wrong with vertical 2153 # TODO: req_w/h are wrong with vertical
1778 # TODO: calculations are off 2154 # TODO: calculations are off
1779 my $self = $class->SUPER::new ( 2155 my $self = $class->SUPER::new (
1780 fg => [1, 1, 1], 2156 fg => [1, 1, 1],
1781 active_fg => [0, 0, 0], 2157 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5],
1782 range => [0, 0, 100, 10], 2160 range => [0, 0, 100, 10, 0],
1783 req_w => 20, 2161 req_w => $::WIDTH / 80,
1784 req_h => 20, 2162 req_h => $::WIDTH / 80,
1785 vertical => 0, 2163 vertical => 0,
1786 can_hover => 1, 2164 can_hover => 1,
1787 inner_pad => 5, 2165 inner_pad => 0.02,
1788 @_ 2166 @_
1789 ); 2167 );
1790 2168
2169 $self->set_value ($self->{range}[0]);
2170 $self->update;
2171
1791 $self 2172 $self
2173}
2174
2175sub set_range {
2176 my ($self, $range) = @_;
2177
2178 ($range, $self->{range}) = ($self->{range}, $range);
2179
2180 $self->update
2181 if "@$range" ne "@{$self->{range}}";
2182}
2183
2184sub set_value {
2185 my ($self, $value) = @_;
2186
2187 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2188
2189 $hi = $lo + 1 if $hi <= $lo;
2190
2191 $page = $hi - $lo if $page > $hi - $lo;
2192
2193 $value = $lo if $value < $lo;
2194 $value = $hi - $page if $value > $hi - $page;
2195
2196 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2197 if $unit;
2198
2199 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2200
2201 if ($value != $old_value) {
2202 $self->_emit (changed => $value);
2203 $self->update;
2204 }
1792} 2205}
1793 2206
1794sub size_request { 2207sub size_request {
1795 my ($self) = @_; 2208 my ($self) = @_;
1796 2209
… …
1802 2215
1803sub button_down { 2216sub button_down {
1804 my ($self, $ev, $x, $y) = @_; 2217 my ($self, $ev, $x, $y) = @_;
1805 2218
1806 $self->SUPER::button_down ($ev, $x, $y); 2219 $self->SUPER::button_down ($ev, $x, $y);
2220
2221 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222
1807 $self->mouse_motion ($ev, $x, $y); 2223 $self->mouse_motion ($ev, $x, $y);
1808} 2224}
1809 2225
1810sub mouse_motion { 2226sub mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
1812 2228
1813 if ($GRAB == $self) { 2229 if ($GRAB == $self) {
2230 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2231
2232 my (undef, $lo, $hi, $page) = @{$self->{range}};
2233
2234 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235
2236 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2237 }
2238}
2239
2240sub update {
2241 my ($self) = @_;
2242
2243 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2244 $self->set_value ($self->{range}[0]);
2245
1814 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2246 my ($value, $lo, $hi, $page) = @{$self->{range}};
2247 my $range = ($hi - $page - $lo) || 1e-100;
1815 2248
1816 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2249 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1817 2250
1818 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2251 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1819 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2252 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1820 2253
1821 $x -= $inner_pad_px; # substract the padding 2254 $value = ($value - $lo) / $range;
1822 $x = $x * ($hi - $lo) / $inner_w + $lo; 2255 $value = $value * $self->{scale} + $self->{offset};
1823 $x = $lo if $x < $lo;
1824 $x = $hi - $page if $x > $hi - $page;
1825 $self->{range}[0] = $x;
1826 2256
1827 $self->emit (changed => $x); 2257 $self->{knob_x} = $value - $knob_w * 0.5;
1828 $self->update; 2258 $self->{knob_w} = $knob_w;
1829 } 2259 });
1830}
1831 2260
1832# the inner_* stuff is for generating a padding for the slider handle, 2261 $self->SUPER::update;
1833# so that the handle doesn't leave the texture. This calculation isn't 100%
1834# correct propably, but it does the job for now
1835sub _calc_inner_pad_px {
1836 my ($self, $w) = @_;
1837 ($w / 100) * $self->{inner_pad} # % to pixels
1838} 2262}
1839 2263
1840sub _draw { 2264sub _draw {
1841 my ($self) = @_; 2265 my ($self) = @_;
1842 2266
1843 $self->SUPER::_draw (); 2267 $self->SUPER::_draw ();
1844 2268
1845 my ($w, $h) = @$self{qw(w h)}; 2269 glScale $self->{w}, $self->{h};
1846 2270
1847 if ($self->{vertical}) { 2271 if ($self->{vertical}) {
1848 # draw a vertical slider like a rotated horizontal slider 2272 # draw a vertical slider like a rotated horizontal slider
1849 2273
2274 glTranslate 1, 0, 0;
1850 glRotate 90, 0, 0, 1; 2275 glRotate 90, 0, 0, 1;
1851 glTranslate 0, -$self->{w}, 0;
1852
1853 ($w, $h) = ($h, $w);
1854 } 2276 }
1855 2277
1856 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2278 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1857 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2279 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1858 2280
1859 my ($value, $lo, $hi, $page) = @{$self->{range}};
1860
1861 $hi = $value + 1 if $lo == $hi;
1862
1863 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1864 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1865
1866 $page = int $page * $inner_w / ($hi - $lo);
1867 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1868
1869 $w -= $page;
1870 $page &= ~1;
1871 glTranslate $page * 0.5, 0, 0;
1872 $page ||= 2;
1873
1874 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1875 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1876
1877 glEnable GL_BLEND;
1878 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1879 glEnable GL_TEXTURE_2D; 2281 glEnable GL_TEXTURE_2D;
1880 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1881 2283
1882 # draw background 2284 # draw background
1883 $tex[1]->draw_quad (0, 0, $w, $h); 2285 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1884 2286
1885 # draw handle 2287 # draw handle
1886 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2288 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1887 2289
1888 glDisable GL_BLEND;
1889 glDisable GL_TEXTURE_2D; 2290 glDisable GL_TEXTURE_2D;
1890} 2291}
2292
2293#############################################################################
2294
2295package CFClient::UI::ValSlider;
2296
2297our @ISA = CFClient::UI::HBox::;
2298
2299sub new {
2300 my ($class, %arg) = @_;
2301
2302 my $range = delete $arg{range};
2303
2304 my $self = $class->SUPER::new (
2305 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2306 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2307 to_value => sub { shift },
2308 from_value => sub { shift },
2309 %arg,
2310 );
2311
2312 $self->{slider}->connect (changed => sub {
2313 my ($self, $value) = @_;
2314 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2315 $self->{parent}->emit (changed => $value);
2316 });
2317
2318# $self->{entry}->connect (changed => sub {
2319# my ($self, $value) = @_;
2320# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2321# $self->{parent}->emit (changed => $value);
2322# });
2323
2324 $self->add ($self->{slider}, $self->{entry});
2325
2326 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2327
2328 $self
2329}
2330
2331sub set_range { shift->{slider}->set_range (@_) }
2332sub set_value { shift->{slider}->set_value (@_) }
1891 2333
1892############################################################################# 2334#############################################################################
1893 2335
1894package CFClient::UI::TextView; 2336package CFClient::UI::TextView;
1895 2337
… …
1899 2341
1900sub new { 2342sub new {
1901 my $class = shift; 2343 my $class = shift;
1902 2344
1903 my $self = $class->SUPER::new ( 2345 my $self = $class->SUPER::new (
1904 fontsize => 1, 2346 fontsize => 1,
2347 can_events => 0,
2348 #font => default_font
1905 @_, 2349 @_,
1906 2350
1907 layout => (new CFClient::Layout), 2351 layout => (new CFClient::Layout 1),
1908 par => [], 2352 par => [],
1909 height => 0, 2353 height => 0,
1910 children => [ 2354 children => [
1911 (new CFClient::UI::Empty expand => 1), 2355 (new CFClient::UI::Empty expand => 1),
1912 (new CFClient::UI::Slider vertical => 1), 2356 (new CFClient::UI::Slider vertical => 1),
1913 ], 2357 ],
1914 ); 2358 );
1915 2359
1916 $self->{children}[1]->connect (changed => sub { 2360 $self->{children}[1]->connect (changed => sub { $self->update });
1917 $self->update;
1918 });
1919 2361
1920 $self 2362 $self
1921} 2363}
1922 2364
1923sub set_fontsize { 2365sub set_fontsize {
… …
1925 2367
1926 $self->{fontsize} = $fontsize; 2368 $self->{fontsize} = $fontsize;
1927 $self->reflow; 2369 $self->reflow;
1928} 2370}
1929 2371
2372sub size_allocate {
2373 my ($self, $w, $h) = @_;
2374
2375 $self->SUPER::size_allocate ($w, $h);
2376
2377 $self->{layout}->set_font ($self->{font}) if $self->{font};
2378 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2379 $self->{layout}->set_width ($self->{children}[0]{w});
2380
2381 $self->reflow;
2382}
2383
1930sub text_height { 2384sub text_size {
1931 my ($self, $text) = @_; 2385 my ($self, $text, $indent) = @_;
1932 2386
1933 my $layout = $self->{layout}; 2387 my $layout = $self->{layout};
1934 2388
1935 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1936 $layout->set_width ($self->{w}); 2390 $layout->set_width ($self->{children}[0]{w} - $indent);
1937 $layout->set_text ($text); 2391 $layout->set_markup ($text);
1938 2392
1939 ($layout->size)[1] 2393 $layout->size
1940} 2394}
1941 2395
1942sub reflow { 2396sub reflow {
1943 my ($self) = @_; 2397 my ($self) = @_;
1944 2398
1945 $self->{need_reflow}++; 2399 $self->{need_reflow}++;
1946 $self->update; 2400 $self->update;
1947} 2401}
1948 2402
1949sub size_allocate { 2403sub set_offset {
2404 my ($self, $offset) = @_;
2405
2406 # todo: base offset on lines or so, not on pixels
2407 $self->{children}[1]->set_value ($offset);
2408}
2409
2410sub clear {
1950 my ($self, $w, $h) = @_; 2411 my ($self) = @_;
1951 2412
1952 $self->SUPER::size_allocate ($w, $h); 2413 $self->{par} = [];
1953 2414 $self->{height} = 0;
1954 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2415 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1955 $self->{layout}->set_width ($self->{children}[0]{w});
1956
1957 $self->reflow;
1958} 2416}
1959 2417
1960sub add_paragraph { 2418sub add_paragraph {
1961 my ($self, $color, $text) = @_; 2419 my ($self, $color, $text, $indent) = @_;
1962 2420
1963 #TODO: intelligently "reformat" paragraph 2421 for my $line (split /\n/, $text) {
1964 2422 my ($w, $h) = $self->text_size ($line);
1965 my $height = $self->text_height ($text);
1966
1967 $self->{height} += $height; 2423 $self->{height} += $h;
2424 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2425 }
1968 2426
1969 push @{$self->{par}}, [$height, $color, $text];
1970
1971 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2427 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1972 $self->{children}[1]->update;
1973} 2428}
1974 2429
1975sub update { 2430sub update {
1976 my ($self) = @_; 2431 my ($self) = @_;
1977 2432
… …
1979 2434
1980 return unless $self->{h} > 0; 2435 return unless $self->{h} > 0;
1981 2436
1982 delete $self->{texture}; 2437 delete $self->{texture};
1983 2438
1984 $ROOT->on_refresh ($self, sub { 2439 $ROOT->on_post_alloc ($self, sub {
2440 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2441
1985 if (delete $self->{need_reflow}) { 2442 if (delete $self->{need_reflow}) {
1986 my $height = 0; 2443 my $height = 0;
1987 2444
1988 $height += $_->[0] = $self->text_height ($_->[2]) 2445 my $layout = $self->{layout};
2446
2447 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2448
1989 for @{$self->{par}}; 2449 for (@{$self->{par}}) {
2450 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2451 $layout->set_width ($W - $_->[3]);
2452 $layout->set_markup ($_->[4]);
2453 my ($w, $h) = $layout->size;
2454 $_->[0] = $w + $_->[3];
2455 $_->[1] = $h;
2456 }
2457
2458 $height += $_->[1];
2459 }
1990 2460
1991 $self->{height} = $height; 2461 $self->{height} = $height;
1992 2462
1993 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2463 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1994 2464
1995 delete $self->{texture}; 2465 delete $self->{texture};
1996 } 2466 }
1997 2467
1998 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2468 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1999 glClearColor 0, 0, 0, 1; 2469 glClearColor 0.5, 0.5, 0.5, 0;
2000 glClear GL_COLOR_BUFFER_BIT; 2470 glClear GL_COLOR_BUFFER_BIT;
2001 2471
2472 my $top = int $self->{children}[1]{range}[0];
2473
2474 my $y0 = $top;
2475 my $y1 = $top + $H;
2476
2477 my $y = 0;
2478
2479 my $layout = $self->{layout};
2480
2481 $layout->set_font ($self->{font}) if $self->{font};
2482
2002 glEnable GL_BLEND; 2483 glEnable GL_BLEND;
2484 #TODO# not correct in windows where rgba is forced off
2003 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2485 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2004 glEnable GL_TEXTURE_2D;
2005 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2006
2007 my $top = int $self->{children}[1]{range}[0];
2008
2009 my $y0 = $top;
2010 my $y1 = $top + $self->{h};
2011
2012 my $y = 0;
2013
2014 my $layout = $self->{layout};
2015 2486
2016 for my $par (@{$self->{par}}) { 2487 for my $par (@{$self->{par}}) {
2017 my $h = $par->[0]; 2488 my $h = $par->[1];
2018 2489
2019 if ($y0 < $y + $h && $y < $y1) { 2490 if ($y0 < $y + $h && $y < $y1) {
2491 $layout->set_foreground (@{ $par->[2] });
2492 $layout->set_width ($W - $par->[3]);
2020 $layout->set_text ($par->[2]); 2493 $layout->set_markup ($par->[4]);
2021 2494
2022 glColor @{ $par->[1] }; 2495 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2023 my ($W, $H) = $layout->size; 2496
2024 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2497 glRasterPos $par->[3], $y - $y0;
2498 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2025 } 2499 }
2026 2500
2027 $y += $h; 2501 $y += $h;
2028 } 2502 }
2029 2503
2030 glDisable GL_TEXTURE_2D;
2031 glDisable GL_BLEND; 2504 glDisable GL_BLEND;
2032 }; 2505 };
2033 }); 2506 });
2034} 2507}
2035 2508
2036sub _draw { 2509sub _draw {
2037 my ($self) = @_; 2510 my ($self) = @_;
2038 2511
2039 if ($self->{texture}) {
2040 glEnable GL_TEXTURE_2D; 2512 glEnable GL_TEXTURE_2D;
2041 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1;
2042 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2515 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2043 glDisable GL_TEXTURE_2D; 2516 glDisable GL_TEXTURE_2D;
2044 }
2045 2517
2046 $self->{children}[1]->draw; 2518 $self->{children}[1]->draw;
2047 2519
2048} 2520}
2049 2521
… …
2097 2569
2098sub new { 2570sub new {
2099 my $class = shift; 2571 my $class = shift;
2100 2572
2101 my $self = $class->SUPER::new ( 2573 my $self = $class->SUPER::new (
2102 state => 0, 2574 state => 0,
2103 connect_activate => \&toggle_flopper, 2575 on_activate => \&toggle_flopper,
2104 can_events => 1,
2105 @_ 2576 @_
2106 ); 2577 );
2107 2578
2108 if ($self->{state}) {
2109 $self->{state} = 0;
2110 $self->toggle_flopper;
2111 }
2112
2113 $self 2579 $self
2114} 2580}
2115 2581
2116sub toggle_flopper { 2582sub toggle_flopper {
2117 my ($self) = @_; 2583 my ($self) = @_;
2118 2584
2119 # TODO: use animation 2585 $self->{other}->toggle_visibility;
2120 if ($self->{state} = !$self->{state}) { 2586}
2121 $CFClient::UI::ROOT->add ($self->{other}); 2587
2122 $self->{other}->move ($self->coord2global (0, $self->{h})); 2588#############################################################################
2589
2590package CFClient::UI::Tooltip;
2591
2592our @ISA = CFClient::UI::Bin::;
2593
2594use CFClient::OpenGL;
2595
2596sub new {
2597 my $class = shift;
2598
2599 $class->SUPER::new (
2600 @_,
2601 can_events => 0,
2602 )
2603}
2604
2605sub set_tooltip_from {
2606 my ($self, $widget) = @_;
2607
2608 $self->add (new CFClient::UI::Label
2609 markup => $widget->{tooltip},
2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8,
2612 fg => [0, 0, 0, 1],
2613 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP),
2615 );
2616}
2617
2618sub size_request {
2619 my ($self) = @_;
2620
2621 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2622
2623 ($w + 4, $h + 4)
2624}
2625
2626sub size_allocate {
2627 my ($self, $w, $h) = @_;
2628
2629 $self->SUPER::size_allocate ($w - 4, $h - 4);
2630}
2631
2632sub _draw {
2633 my ($self) = @_;
2634
2635 glTranslate 0.375, 0.375;
2636
2637 my ($w, $h) = @$self{qw(w h)};
2638
2639 glColor 1, 0.8, 0.4;
2640 glBegin GL_QUADS;
2641 glVertex 0 , 0;
2642 glVertex 0 , $h;
2643 glVertex $w, $h;
2644 glVertex $w, 0;
2645 glEnd;
2646
2647 glColor 0, 0, 0;
2648 glBegin GL_LINE_LOOP;
2649 glVertex 0 , 0;
2650 glVertex 0 , $h;
2651 glVertex $w, $h;
2652 glVertex $w, 0;
2653 glEnd;
2654
2655 glTranslate 2 - 0.375, 2 - 0.375;
2656 $self->SUPER::_draw;
2657}
2658
2659#############################################################################
2660
2661package CFClient::UI::Face;
2662
2663our @ISA = CFClient::UI::Base::;
2664
2665use CFClient::OpenGL;
2666
2667sub new {
2668 my $class = shift;
2669
2670 my $self = $class->SUPER::new (
2671 aspect => 1,
2672 can_events => 0,
2673 @_,
2674 );
2675
2676 if ($self->{anim} && $self->{animspeed}) {
2677 Scalar::Util::weaken (my $widget = $self);
2678
2679 $self->{timer} = Event->timer (
2680 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2681 hard => 1,
2682 interval => $self->{animspeed},
2683 cb => sub {
2684 ++$widget->{frame};
2685 $widget->update;
2686 },
2687 );
2688 }
2689
2690 $self
2691}
2692
2693sub size_request {
2694 (32, 8)
2695}
2696
2697sub update {
2698 my ($self) = @_;
2699
2700 return unless $self->{visible};
2701
2702 $self->SUPER::update;
2703}
2704
2705sub _draw {
2706 my ($self) = @_;
2707
2708 return unless $::CONN;
2709
2710 my $face;
2711
2712 if ($self->{frame}) {
2713 my $anim = $::CONN->{anim}[$self->{anim}];
2714
2715 $face = $anim->[ $self->{frame} % @$anim ]
2716 if $anim && @$anim;
2717 }
2718
2719 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2720
2721 if ($tex) {
2722 glEnable GL_TEXTURE_2D;
2723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2724 glColor 1, 1, 1, 1;
2725 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2726 glDisable GL_TEXTURE_2D;
2727 }
2728}
2729
2730sub DESTROY {
2731 my ($self) = @_;
2732
2733 $self->{timer}->cancel
2734 if $self->{timer};
2735
2736 $self->SUPER::DESTROY;
2737}
2738
2739#############################################################################
2740
2741package CFClient::UI::Inventory;
2742
2743our @ISA = CFClient::UI::ScrolledWindow::;
2744
2745sub new {
2746 my $class = shift;
2747
2748 my $self = $class->SUPER::new (
2749 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2750 @_,
2751 );
2752
2753 $self
2754}
2755
2756sub set_items {
2757 my ($self, $items) = @_;
2758
2759 $self->{scrolled}->clear;
2760 return unless $items;
2761
2762 my @items = sort {
2763 ($a->{type} <=> $b->{type})
2764 or ($a->{name} cmp $b->{name})
2765 } @$items;
2766
2767 $self->{real_items} = \@items;
2768
2769 my $row = 0;
2770 for my $item (@items) {
2771 CFClient::Item::update_widgets $item;
2772
2773 $self->{scrolled}->add (0, $row, $item->{face_widget});
2774 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2775 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2776
2777 $row++;
2778 }
2779}
2780
2781#############################################################################
2782
2783package CFClient::UI::Menu;
2784
2785our @ISA = CFClient::UI::FancyFrame::;
2786
2787use CFClient::OpenGL;
2788
2789sub new {
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 items => [],
2794 z => 100,
2795 @_,
2796 );
2797
2798 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2799
2800 for my $item (@{ $self->{items} }) {
2801 my ($widget, $cb) = @$item;
2802
2803 # handle various types of items, only text for now
2804 if (!ref $widget) {
2805 $widget = new CFClient::UI::Label
2806 can_hover => 1,
2807 can_events => 1,
2808 text => $widget;
2809 }
2810
2811 $self->{item}{$widget} = $item;
2812
2813 $self->{vbox}->add ($widget);
2814 }
2815
2816 $self
2817}
2818
2819# popup given the event (must be a mouse button down event currently)
2820sub popup {
2821 my ($self, $ev) = @_;
2822
2823 $self->_emit ("popdown");
2824
2825 # maybe save $GRAB? must be careful about events...
2826 $GRAB = $self;
2827 $self->{button} = $ev->{button};
2828
2829 $self->show;
2830 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2831}
2832
2833sub mouse_motion {
2834 my ($self, $ev, $x, $y) = @_;
2835
2836 # TODO: should use vbox->find_widget or so
2837 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838 $self->{hover} = $self->{item}{$HOVER};
2839}
2840
2841sub button_up {
2842 my ($self, $ev, $x, $y) = @_;
2843
2844 if ($ev->{button} == $self->{button}) {
2845 undef $GRAB;
2846 $self->hide;
2847
2123 $self->emit ("open"); 2848 $self->_emit ("popdown");
2849 $self->{hover}[1]->() if $self->{hover};
2850 }
2851}
2852
2853#############################################################################
2854
2855package CFClient::UI::Statusbox;
2856
2857our @ISA = CFClient::UI::VBox::;
2858
2859sub new {
2860 my $class = shift;
2861
2862 $class->SUPER::new (
2863 fontsize => 0.8,
2864 @_,
2865 )
2866}
2867
2868sub reorder {
2869 my ($self) = @_;
2870 my $NOW = time;
2871
2872 while (my ($k, $v) = each %{ $self->{item} }) {
2873 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2874 }
2875
2876 my @widgets;
2877
2878 my @items = sort {
2879 $a->{pri} <=> $b->{pri}
2880 or $b->{id} <=> $a->{id}
2881 } values %{ $self->{item} };
2882
2883 my $count = 10 + 1;
2884 for my $item (@items) {
2885 last unless --$count;
2886
2887 push @widgets, $item->{label} ||= do {
2888 # TODO: doesn't handle markup well (read as: at all)
2889 my $short = $item->{count} > 1
2890 ? "<b>$item->{count} ×</b> $item->{text}"
2891 : $item->{text};
2892
2893 for ($short) {
2894 s/^\s+//;
2895 s/\s+/ /g;
2896 }
2897
2898 new CFClient::UI::Label
2899 markup => $short,
2900 tooltip => $item->{tooltip},
2901 tooltip_font => $::FONT_PROP,
2902 tooltip_width => 0.67,
2903 fontsize => $item->{fontsize} || $self->{fontsize},
2904 max_w => $::WIDTH * 0.44,
2905 fg => $item->{fg},
2906 can_events => 1,
2907 can_hover => 1
2908 };
2909 }
2910
2911 $self->clear;
2912 $self->SUPER::add (reverse @widgets);
2913}
2914
2915sub add {
2916 my ($self, $text, %arg) = @_;
2917
2918 $text =~ s/^\s+//;
2919 $text =~ s/\s+$//;
2920
2921 return unless $text;
2922
2923 my $timeout = time + ((delete $arg{timeout}) || 60);
2924
2925 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2926
2927 if (my $item = $self->{item}{$group}) {
2928 if ($item->{text} eq $text) {
2929 $item->{count}++;
2930 } else {
2931 $item->{count} = 1;
2932 $item->{text} = $item->{tooltip} = $text;
2933 }
2934 $item->{id} = ++$self->{id};
2935 $item->{timeout} = $timeout;
2936 delete $item->{label};
2124 } else { 2937 } else {
2125 $CFClient::UI::ROOT->remove ($self->{other}); 2938 $self->{item}{$group} = {
2126 $self->emit ("close"); 2939 id => ++$self->{id},
2940 text => $text,
2941 timeout => $timeout,
2942 tooltip => $text,
2943 fg => [0.8, 0.8, 0.8, 0.8],
2944 pri => 0,
2945 count => 1,
2946 %arg,
2947 };
2127 } 2948 }
2128 2949
2129 $self->emit (changed => $self->{state}); 2950 $self->reorder;
2951}
2952
2953sub reconfigure {
2954 my ($self) = @_;
2955
2956 delete $_->{label}
2957 for values %{ $self->{item} || {} };
2958
2959 $self->reorder;
2960 $self->SUPER::reconfigure;
2130} 2961}
2131 2962
2132############################################################################# 2963#############################################################################
2133 2964
2134package CFClient::UI::Root; 2965package CFClient::UI::Root;
2135 2966
2136our @ISA = CFClient::UI::Container::; 2967our @ISA = CFClient::UI::Container::;
2137 2968
2138use CFClient::OpenGL; 2969use CFClient::OpenGL;
2139 2970
2140sub check_size { 2971sub new {
2141 my ($self) = @_; 2972 my $class = shift;
2142 2973
2143 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2974 $class->SUPER::new (
2144} 2975 visible => 1,
2145 2976 @_,
2146sub size_request { 2977 )
2147 ($::WIDTH, $::HEIGHT)
2148} 2978}
2149 2979
2150sub configure { 2980sub configure {
2151 my ($self, $x, $y, $w, $h) = @_; 2981 my ($self, $x, $y, $w, $h) = @_;
2152 2982
2153 $self->SUPER::configure ($x, $y, $w, $h); 2983 $self->{w} = $w;
2984 $self->{h} = $h;
2985}
2154 2986
2987sub check_size {
2988 my ($self) = @_;
2989
2990 $self->size_allocate ($self->{w}, $self->{h})
2991 if $self->{w};
2992}
2993
2994sub size_request {
2995 my ($self) = @_;
2996
2997 ($self->{w}, $self->{h})
2998}
2999
3000sub size_allocate {
3001 my ($self, $w, $h) = @_;
3002
2155 for my $child (@{$self->{children}}) { 3003 for my $child ($self->children) {
2156 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3004 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2157 3005
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3007 if exists $child->{req_x};
3008
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3010 if exists $child->{req_y};
3011
3012 delete @$child{qw(req_x req_y)};
3013
2158 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3014 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2159 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3015 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3016
2160 $child->configure ($X, $Y, $W,$H); 3017 $child->configure ($X, $Y, $W, $H);
2161 } 3018 }
2162} 3019}
2163 3020
2164sub _topleft { 3021sub coord2local {
2165 my ($self, $x, $y) = @_; 3022 my ($self, $x, $y) = @_;
2166 3023
2167 ($x, $y) 3024 ($x, $y)
2168} 3025}
2169 3026
3027sub coord2global {
3028 my ($self, $x, $y) = @_;
3029
3030 ($x, $y)
3031}
3032
2170sub update { 3033sub update {
2171 my ($self) = @_; 3034 my ($self) = @_;
2172 3035
2173 $self->check_size; 3036 $self->check_size;
2174 ::refresh (); 3037 $::WANT_REFRESH++;
2175} 3038}
2176 3039
2177sub add { 3040sub add {
2178 my ($self, $child) = @_; 3041 my ($self, @children) = @_;
2179 3042
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1;
3045
2180 # integerize window positions 3046 # integerise window positions
2181 $child->{x} = int $child->{x}; 3047 $child->{x} = int $child->{x};
2182 $child->{y} = int $child->{y}; 3048 $child->{y} = int $child->{y};
3049 }
2183 3050
2184 $self->SUPER::add ($child); 3051 $self->SUPER::add (@children);
3052
3053 for (my @widgets = @children; my $w = pop @widgets; ) {
3054 push @widgets, $w->children;
3055 $w->set_visible;
3056 }
3057
3058}
3059
3060sub remove {
3061 my ($self, @children) = @_;
3062
3063 $self->SUPER::remove (@children);
3064
3065 while (@children) {
3066 my $w = pop @children;
3067 push @children, $w->children;
3068 $w->set_invisible;
3069 }
2185} 3070}
2186 3071
2187sub on_refresh { 3072sub on_refresh {
2188 my ($self, $id, $cb) = @_; 3073 my ($self, $id, $cb) = @_;
2189 3074
2190 $self->{refresh_hook}{$id} = $cb; 3075 $self->{refresh_hook}{$id} = $cb;
2191} 3076}
2192 3077
3078sub on_post_alloc {
3079 my ($self, $id, $cb) = @_;
3080
3081 $self->{post_alloc_hook}{$id} = $cb;
3082}
3083
2193sub draw { 3084sub draw {
2194 my ($self) = @_; 3085 my ($self) = @_;
2195 3086
2196 while (my $rcb = delete $self->{refresh_hook}) { 3087 while ($self->{refresh_hook}) {
2197 $_->() for values %$rcb; 3088 $_->()
3089 for values %{delete $self->{refresh_hook}};
3090 }
3091
3092 if ($self->{check_size}) {
3093 my @queue;
3094
3095 for (;;) {
3096 if ($self->{check_size}) {
3097 #TODO use array-of-depth approach
3098
3099 @queue = sort { $a->{visible} <=> $b->{visible} }
3100 @queue, values %{delete $self->{check_size}};
3101 }
3102
3103 my $widget = pop @queue || last;
3104
3105 defined $widget->{visible} or last; # do not resize invisible widgets
3106
3107 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3108 ? @$widget{qw(def_w def_h)}
3109 : $widget->size_request;
3110
3111 if (delete $widget->{force_alloc}
3112 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3113 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3114
3115 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h;
3117
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3119
3120 $widget->{parent}->check_size
3121 if $widget->{parent};
3122 }
3123 }
3124 }
3125
3126 while ($self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) {
3128 my ($widget, $w, $h) = @$_;
3129
3130 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0;
3132
3133 $widget->{w} = $w;
3134 $widget->{h} = $h;
3135 $widget->emit (size_allocate => $w, $h);
3136 }
3137 }
3138
3139 while ($self->{post_alloc_hook}) {
3140 $_->()
3141 for values %{delete $self->{post_alloc_hook}};
2198 } 3142 }
2199 3143
2200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3144 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2202 glClear GL_COLOR_BUFFER_BIT; 3146 glClear GL_COLOR_BUFFER_BIT;
2203 3147
2204 glMatrixMode GL_PROJECTION; 3148 glMatrixMode GL_PROJECTION;
2205 glLoadIdentity; 3149 glLoadIdentity;
2206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3150 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2207 glMatrixMode GL_MODELVIEW; 3151 glMatrixMode GL_MODELVIEW;
2208 glLoadIdentity; 3152 glLoadIdentity;
2209 3153
2210 $self->_draw; 3154 $self->_draw;
2211} 3155}
… …
2213############################################################################# 3157#############################################################################
2214 3158
2215package CFClient::UI; 3159package CFClient::UI;
2216 3160
2217$ROOT = new CFClient::UI::Root; 3161$ROOT = new CFClient::UI::Root;
2218$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 3162$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2219 3163
22201 31641
2221 3165

Diff Legend

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