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

Diff Legend

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