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

Diff Legend

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