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.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 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
30 $TOOLTIP->show; 52 $TOOLTIP->show;
31 53
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 55
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 57 if $x + $TOOLTIP->{w} > $::WIDTH;
37 58
38 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
39 } 62 }
40 63
41 return; 64 return;
42 } 65 }
43 } 66 }
… …
47 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
48} 71}
49 72
50# class methods for events 73# class methods for events
51sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 76 if $FOCUS;
54} 77}
55 78
56sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 81 if $FOCUS;
59} 82}
60 83
61sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
62 my ($ev) = @_; 85 my ($ev) = @_;
… …
71 check_tooltip; 94 check_tooltip;
72 } 95 }
73 96
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 98
76 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 101}
81 102
82sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
83 my ($ev) = @_; 104 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
85 106
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 108
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 110
90 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 113
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 check_tooltip;
117 } 136 }
118 137
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 139 if $HOVER;
123} 140}
124 141
125# convert position array to integers 142# convert position array to integers
126sub harmonize { 143sub harmonize {
127 my ($vals) = @_; 144 my ($vals) = @_;
… …
131 for (@$vals) { 148 for (@$vals) {
132 my $i = int $_ + $rem; 149 my $i = int $_ + $rem;
133 $rem += $_ - $i; 150 $rem += $_ - $i;
134 $_ = $i; 151 $_ = $i;
135 } 152 }
153}
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;
136} 187}
137 188
138############################################################################# 189#############################################################################
139 190
140package CFClient::UI::Base; 191package CFClient::UI::Base;
… …
153 can_events => 1, 204 can_events => 1,
154 @_ 205 @_
155 }, $class; 206 }, $class;
156 207
157 for (keys %$self) { 208 for (keys %$self) {
158 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
160 } 211 }
161 } 212 }
162 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
163 $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 }
164} 234}
165 235
166sub destroy { 236sub destroy {
167 my ($self) = @_; 237 my ($self) = @_;
168 238
… …
170 %$self = (); 240 %$self = ();
171} 241}
172 242
173sub show { 243sub show {
174 my ($self) = @_; 244 my ($self) = @_;
175
176 return if $self->{parent}; 245 return if $self->{parent};
177 246
178 $CFClient::UI::ROOT->add ($self); 247 $CFClient::UI::ROOT->add ($self);
179} 248}
180 249
181sub hide { 250sub show_centered {
182 my ($self) = @_; 251 my ($self) = @_;
252 return if $self->{parent};
253
254 $self->show;
255
256 $CFClient::UI::ROOT->on_post_alloc (
257 "centered $self" => sub {
258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
259 },
260 );
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};
183 283
184 undef $GRAB if $GRAB == $self; 284 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $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
295sub hide {
296 my ($self) = @_;
297
298 $self->set_invisible;
186 299
187 $self->{parent}->remove ($self) 300 $self->{parent}->remove ($self)
188 if $self->{parent}; 301 if $self->{parent};
189} 302}
190 303
… …
199} 312}
200 313
201sub set_size { 314sub set_size {
202 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
203 316
204 $self->{user_w} = $w; 317 $self->{def_w} = $w;
205 $self->{user_h} = $h; 318 $self->{def_h} = $h;
206 319
207 $self->check_size; 320 $self->check_size;
208} 321}
209 322
210sub size_request { 323sub size_request {
… …
240 353
241sub size_allocate { 354sub size_allocate {
242 # nothing to be done 355 # nothing to be done
243} 356}
244 357
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363}
364
245sub children { 365sub children {
246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
258} 366}
259 367
260sub set_max_size { 368sub set_max_size {
261 my ($self, $w, $h) = @_; 369 my ($self, $w, $h) = @_;
262 370
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 371 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 372 delete $self->{max_h}; $self->{max_h} = $h if $h;
373}
374
375sub set_tooltip {
376 my ($self, $tooltip) = @_;
377
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 }
265} 389}
266 390
267# translate global coordinates to local coordinate system 391# translate global coordinates to local coordinate system
268sub coord2local { 392sub coord2local {
269 my ($self, $x, $y) = @_; 393 my ($self, $x, $y) = @_;
… …
284 return if $FOCUS == $self; 408 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 409 return unless $self->{can_focus};
286 410
287 my $focus = $FOCUS; $FOCUS = $self; 411 my $focus = $FOCUS; $FOCUS = $self;
288 412
289 $self->emit (focus_in => $focus); 413 $self->_emit (focus_in => $focus);
290 414
291 $focus->update if $focus; 415 $focus->update if $focus;
292 $FOCUS->update; 416 $FOCUS->update;
293} 417}
294 418
… …
297 421
298 return unless $FOCUS == $self; 422 return unless $FOCUS == $self;
299 423
300 my $focus = $FOCUS; undef $FOCUS; 424 my $focus = $FOCUS; undef $FOCUS;
301 425
302 $self->emit (focus_out => $focus); 426 $self->_emit (focus_out => $focus);
303 427
304 $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;
305} 432}
306 433
307sub mouse_motion { } 434sub mouse_motion { }
308sub button_up { } 435sub button_up { }
309sub key_down { } 436sub key_down { }
310sub key_up { } 437sub key_up { }
311 438
312sub button_down { 439sub button_down {
313 my ($self, $ev, $x, $y) = @_; 440 my ($self, $ev, $x, $y) = @_;
314 441
315 $self->focus_in; 442 $self->focus_in;
… …
349 if ($ENV{PCLIENT_DEBUG}) { 476 if ($ENV{PCLIENT_DEBUG}) {
350 glPushMatrix; 477 glPushMatrix;
351 glColor 1, 1, 0, 1; 478 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP; 480 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 481 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 482 glVertex $self->{w} - 1, 0;
356 glVertex $self->{w}, $self->{h}; 483 glVertex $self->{w} - 1, $self->{h} - 1;
357 glVertex 0 , $self->{h}; 484 glVertex 0 , $self->{h} - 1;
358 glEnd; 485 glEnd;
359 glPopMatrix; 486 glPopMatrix;
360 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;
361 } 488 }
362} 489}
363 490
364sub _draw { 491sub _draw {
365 my ($self) = @_; 492 my ($self) = @_;
… …
380} 507}
381 508
382sub set_parent { 509sub set_parent {
383 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
384 511
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
386 Scalar::Util::weaken ($self->{parent} = $parent); 512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible;
515
516 $self->check_size;
517 $self->show;
387} 518}
388 519
389sub check_size { 520sub check_size {
390 my ($self) = @_; 521 my ($self, $forced) = @_;
391 522
523 $self->{force_alloc} = 1 if $forced;
392 $CFClient::UI::ROOT->{check_size}{$self} = $self; 524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
393} 525}
394 526
395sub update { 527sub update {
396 my ($self) = @_; 528 my ($self) = @_;
… …
403 my ($self, $signal, $cb) = @_; 535 my ($self, $signal, $cb) = @_;
404 536
405 push @{ $self->{signal_cb}{$signal} }, $cb; 537 push @{ $self->{signal_cb}{$signal} }, $cb;
406} 538}
407 539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
408sub emit { 546sub emit {
409 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
410 548
411 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
412} 555}
413 556
414sub DESTROY { 557sub DESTROY {
415 my ($self) = @_; 558 my ($self) = @_;
416 559
560 delete $WIDGET{$self+0};
417 #$self->deactivate; 561 #$self->deactivate;
418} 562}
419 563
420############################################################################# 564#############################################################################
421 565
… …
430 my $class = shift; 574 my $class = shift;
431 575
432 # range [value, low, high, page] 576 # range [value, low, high, page]
433 577
434 $class->SUPER::new ( 578 $class->SUPER::new (
435 bg => [0, 0, 0, 0.2], 579 #bg => [0, 0, 0, 0.2],
436 active_bg => [1, 1, 1, 0.5], 580 #active_bg => [1, 1, 1, 0.5],
437 @_ 581 @_
438 ) 582 )
439} 583}
440 584
441sub _draw { 585sub _draw {
442 my ($self) = @_; 586 my ($self) = @_;
443 587
588 my $color = $FOCUS == $self && $self->{active_bg}
589 ? $self->{active_bg}
590 : $self->{bg};
591
592 if ($color && (@$color < 4 || $color->[3])) {
444 my ($w, $h) = @$self{qw(w h)}; 593 my ($w, $h) = @$self{qw(w h)};
445 594
446 glEnable GL_BLEND; 595 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 597 glColor @$color;
449 598
450 glBegin GL_QUADS; 599 glBegin GL_QUADS;
451 glVertex 0 , 0; 600 glVertex 0 , 0;
452 glVertex 0 , $h; 601 glVertex 0 , $h;
453 glVertex $w, $h; 602 glVertex $w, $h;
454 glVertex $w, 0; 603 glVertex $w, 0;
455 glEnd; 604 glEnd;
456 605
457 glDisable GL_BLEND; 606 glDisable GL_BLEND;
607 }
458} 608}
459 609
460############################################################################# 610#############################################################################
461 611
462package CFClient::UI::Empty; 612package CFClient::UI::Empty;
… …
506 $self->{children} = [ 656 $self->{children} = [
507 sort { $a->{z} <=> $b->{z} } 657 sort { $a->{z} <=> $b->{z} }
508 @{$self->{children}}, @widgets 658 @{$self->{children}}, @widgets
509 ]; 659 ];
510 660
511 $_->check_size 661 $self->check_size (1);
512 for @widgets;
513
514 $self->update; 662 $self->update;
515} 663}
516 664
517sub children { 665sub children {
518 @{ $_[0]{children} } 666 @{ $_[0]{children} }
… …
524 delete $child->{parent}; 672 delete $child->{parent};
525 $child->hide; 673 $child->hide;
526 674
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 676
529 $self->check_size; 677 $self->check_size (1);
530 $self->update; 678 $self->update;
531} 679}
532 680
533sub clear { 681sub clear {
534 my ($self) = @_; 682 my ($self) = @_;
… …
625} 773}
626 774
627sub update { 775sub update {
628 my ($self) = @_; 776 my ($self) = @_;
629 777
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 778 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 779 $self->SUPER::update;
632} 780}
633 781
634sub size_allocate { 782sub size_allocate {
635 my ($self, $w, $h) = @_; 783 my ($self, $w, $h) = @_;
… …
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 797 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 798 glClear GL_COLOR_BUFFER_BIT;
651 799
652 $self->_render; 800 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 801 };
661} 802}
662 803
663sub _draw { 804sub _draw {
664 my ($self) = @_; 805 my ($self) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 807 my ($w, $h) = ($self->w, $self->h);
667 808
668 my $tex = $self->{texture} 809 my $tex = $self->{texture}
669 or return; 810 or return;
670 811
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 812 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 814 glColor 1, 1, 1, 1;
676 815
677 $tex->draw_quad (0, 0, $w, $h); 816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 817
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 818 glDisable GL_TEXTURE_2D;
681} 819}
682 820
683############################################################################# 821#############################################################################
684 822
685package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
686 824
687our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
688 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
689sub size_request { 837sub size_request {
690 my ($self) = @_; 838 my ($self) = @_;
691 839
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 841
695 @$self{qw(child_w child_h)} 842 @$self{qw(child_w child_h)}
696} 843}
697 844
698sub size_allocate { 845sub size_allocate {
699 my ($self, $w, $h) = @_; 846 my ($self, $w, $h) = @_;
700 847
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850
851 $self->child->configure (0, 0, $w, $h);
701 $self->update; 852 $self->update;
702} 853}
703 854
704sub set_offset { 855sub set_offset {
705 my ($self, $x, $y) = @_; 856 my ($self, $x, $y) = @_;
… …
756 my $class = shift; 907 my $class = shift;
757 908
758 my $self; 909 my $self;
759 910
760 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
761 vertical => 1, 912 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 914 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 915 $self->{vp}->set_offset (0, $_[1]);
765 }, 916 },
766 ; 917 ;
767 918
768 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 920 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 921 slider => $slider,
771 @_, 922 @_,
772 ); 923 );
773 924
774 $self->{vp}->add ($self->{scrolled}); 925 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 927 $self->add ($self->{slider});
777 928
778 $self 929 $self
779} 930}
780 931
932sub update {
933 my ($self) = @_;
934
935 $self->SUPER::update;
936
937 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940}
941
942sub size_allocate {
943 my ($self, $w, $h) = @_;
944
945 $self->SUPER::size_allocate ($w, $h);
946
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949}
950
781#TODO# update range on size_allocate depeneing on child 951#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 952# update viewport offset on scroll
783 953
784############################################################################# 954#############################################################################
785 955
786package CFClient::UI::Frame; 956package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 960use CFClient::OpenGL;
791 961
792sub new { 962sub new {
793 my $class = shift; 963 my $class = shift;
794 964
795 my $self = $class->SUPER::new ( 965 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 966 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 967 @_,
800 ); 968 )
801
802 $self
803} 969}
804 970
805sub _draw { 971sub _draw {
806 my ($self) = @_; 972 my ($self) = @_;
807 973
808 my ($w, $h) = ($self->{w}, $self->{h}); 974 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)};
809 976
810 glEnable GL_BLEND; 977 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 979 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 980
815# glBegin GL_QUADS; 981 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 982 glVertex 0 , 0;
818# glVertex 0 , $h; 983 glVertex 0 , $h;
819# glVertex $w, $h; 984 glVertex $w, $h;
820# glVertex $w, 0; 985 glVertex $w, 0;
821# glEnd; 986 glEnd;
822 987
823
824 $self->child->draw;
825 glDisable GL_BLEND; 988 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 989 }
990
991 $self->SUPER::_draw;
827} 992}
828 993
829############################################################################# 994#############################################################################
830 995
831package CFClient::UI::FancyFrame; 996package CFClient::UI::FancyFrame;
… …
839 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
840 1005
841sub new { 1006sub new {
842 my $class = shift; 1007 my $class = shift;
843 1008
844 # TODO: user_x, user_y, overwrite moveto?
845
846 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 1010 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 1011 border_bg => [1, 1, 1, 1],
849 border => 0.6, 1012 border => 0.6,
1013 is_toplevel => 1,
850 can_events => 1, 1014 can_events => 1,
851 @_ 1015 @_
852 ); 1016 );
853 1017
854 $self->{title} &&= new CFClient::UI::Label 1018 $self->{title} &&= new CFClient::UI::Label
855 align => 0, 1019 align => 0,
… …
879 my ($self, $w, $h) = @_; 1043 my ($self, $w, $h) = @_;
880 1044
881 $h -= List::Util::max 0, $self->border * 2; 1045 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 1046 $w -= List::Util::max 0, $self->border * 2;
883 1047
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1048 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885 if $self->{title}; 1049 if $self->{title};
886 1050
887 $self->child->configure ($self->border, $self->border, $w, $h); 1051 $self->child->configure ($self->border, $self->border, $w, $h);
888} 1052}
889 1053
… …
908 my ($ev, $x, $y) = @_; 1072 my ($ev, $x, $y) = @_;
909 1073
910 my $dx = $ev->{x} - $ox; 1074 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy; 1075 my $dy = $ev->{y} - $oy;
912 1076
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1081 $self->move ($self->{user_x}, $self->{user_y});
916 $self->check_size; 1082 $self->check_size;
917 }; 1083 };
918 1084
919 } elsif ($lr ^ $td) { 1085 } elsif ($lr ^ $td) {
920 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1086 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
923 $self->{motion} = sub { 1089 $self->{motion} = sub {
924 my ($ev, $x, $y) = @_; 1090 my ($ev, $x, $y) = @_;
925 1091
926 ($x, $y) = ($ev->{x}, $ev->{y}); 1092 ($x, $y) = ($ev->{x}, $ev->{y});
927 1093
928 $self->move ($bx + $x - $ox, $by + $y - $oy); 1094 $self->{user_x} = $bx + $x - $ox;
1095 $self->{user_y} = $by + $y - $oy;
1096
1097 $self->move ($self->{user_x}, $self->{user_y});
929 $self->update; 1098 $self->update;
930 }; 1099 };
931 } 1100 }
932} 1101}
933 1102
… …
947 my ($self) = @_; 1116 my ($self) = @_;
948 1117
949 my ($w, $h ) = ($self->{w}, $self->{h}); 1118 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1119 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 1120
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 1121 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1122 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 1123
957 my $border = $self->border; 1124 my $border = $self->border;
958 1125
959 glColor @{ $self->{border_bg} }; 1126 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 1127 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 1128 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1129 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1130 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1131
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1132 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1133 my $bg = $tex[0];
967 1134
968 # TODO: repeat texture not scale 1135 # TODO: repeat texture not scale
… …
972 glColor @{ $self->{bg} }; 1139 glColor @{ $self->{bg} };
973 1140
974 $bg->{s} = $rep_x; 1141 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y; 1142 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1; 1143 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1144 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145 }
978 1146
979 glDisable GL_TEXTURE_2D; 1147 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1148
983 $self->{title}->draw if $self->{title}; 1149 $self->{title}->draw if $self->{title};
984 1150
985 $self->child->draw; 1151 $self->child->draw;
986} 1152}
… …
998sub new { 1164sub new {
999 my $class = shift; 1165 my $class = shift;
1000 1166
1001 $class->SUPER::new ( 1167 $class->SUPER::new (
1002 col_expand => [], 1168 col_expand => [],
1003 @_ 1169 @_,
1004 ) 1170 )
1171}
1172
1173sub children {
1174 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005} 1175}
1006 1176
1007sub add { 1177sub add {
1008 my ($self, $x, $y, $child) = @_; 1178 my ($self, $x, $y, $child) = @_;
1009 1179
1010 $child->set_parent ($self); 1180 $child->set_parent ($self);
1011 $self->{children}[$y][$x] = $child; 1181 $self->{children}[$y][$x] = $child;
1012 1182
1013 $child->check_size; 1183 $self->check_size (1);
1014} 1184}
1015 1185
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
1020# TODO: move to container class maybe? send childs a signal on removal? 1186# TODO: move to container class maybe? send children a signal on removal?
1021sub clear { 1187sub clear {
1022 my ($self) = @_; 1188 my ($self) = @_;
1023 1189
1024 my @children = $self->children; 1190 my @children = $self->children;
1025 delete $self->{children}; 1191 delete $self->{children};
… …
1027 for (@children) { 1193 for (@children) {
1028 delete $_->{parent}; 1194 delete $_->{parent};
1029 $_->hide; 1195 $_->hide;
1030 } 1196 }
1031 1197
1198 $self->check_size (1);
1032 $self->update; 1199 $self->update;
1033} 1200}
1034 1201
1035sub get_wh { 1202sub get_wh {
1036 my ($self) = @_; 1203 my ($self) = @_;
… …
1068sub size_allocate { 1235sub size_allocate {
1069 my ($self, $w, $h) = @_; 1236 my ($self, $w, $h) = @_;
1070 1237
1071 my ($ws, $hs) = $self->get_wh; 1238 my ($ws, $hs) = $self->get_wh;
1072 1239
1073 my $req_w = sum @$ws; 1240 my $req_w = (sum @$ws) || 1;
1074 my $req_h = sum @$hs; 1241 my $req_h = (sum @$hs) || 1;
1075 1242
1076 # TODO: nicer code && do row_expand 1243 # TODO: nicer code && do row_expand
1077 my @col_expand = @{$self->{col_expand}}; 1244 my @col_expand = @{$self->{col_expand}};
1078 @col_expand = (1) x @$ws unless @col_expand; 1245 @col_expand = (1) x @$ws unless @col_expand;
1079 my $col_expand = (sum @col_expand) || 1; 1246 my $col_expand = (sum @col_expand) || 1;
… …
1133 } 1300 }
1134} 1301}
1135 1302
1136############################################################################# 1303#############################################################################
1137 1304
1138package CFClient::UI::HBox; 1305package CFClient::UI::Box;
1139
1140# TODO: wrap into common Box base class
1141 1306
1142our @ISA = CFClient::UI::Container::; 1307our @ISA = CFClient::UI::Container::;
1143 1308
1144sub size_request { 1309sub size_request {
1145 my ($self) = @_; 1310 my ($self) = @_;
1146 1311
1147 my @alloc = map [$_->size_request], @{$self->{children}}; 1312 $self->{vertical}
1148 1313 ? (
1149 ( 1314 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1150 (List::Util::sum map $_->[0], @alloc), 1315 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1151 (List::Util::max map $_->[1], @alloc), 1316 )
1152 ) 1317 : (
1318 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1320 )
1153} 1321}
1154 1322
1155sub size_allocate { 1323sub size_allocate {
1156 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1157 1325
1158 ($h, $w) = ($w, $h); 1326 my $space = $self->{vertical} ? $h : $w;
1159
1160 my $children = $self->{children}; 1327 my $children = $self->{children};
1161 1328
1162 my @h = map $_->{req_w}, @$children; 1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1163
1164 my $req_h = List::Util::sum @h; 1330 my $req = List::Util::sum @req;
1165 1331
1166 if ($req_h > $h) { 1332 if ($req > $space) {
1167 # ah well, not enough space 1333 # ah well, not enough space
1168 $_ *= $h / $req_h for @h; 1334 $_ *= $space / $req for @req;
1169 } else { 1335 } else {
1170 my $exp = List::Util::sum map $_->{expand}, @$children; 1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1171 $exp ||= 1;
1172 1337
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1173 for (0 .. $#$children) { 1339 for 0 .. $#$children;
1174 my $child = $children->[$_];
1175
1176 my $alloc_h = $h[$_];
1177 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1178 $h[$_] = $alloc_h;
1179 }
1180 } 1340 }
1181 1341
1182 CFClient::UI::harmonize \@h; 1342 CFClient::UI::harmonize \@req;
1183 1343
1184 my $y = 0; 1344 my $pos = 0;
1185 for (0 .. $#$children) { 1345 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_]; 1346 my $alloc = $req[$_];
1188 $child->configure ($y, 0, $h, $w); 1347 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1189 1348
1190 $y += $h; 1349 $pos += $alloc;
1191 } 1350 }
1192 1351
1193 1 1352 1
1194} 1353}
1195 1354
1196############################################################################# 1355#############################################################################
1197 1356
1357package CFClient::UI::HBox;
1358
1359our @ISA = CFClient::UI::Box::;
1360
1361sub new {
1362 my $class = shift;
1363
1364 $class->SUPER::new (
1365 vertical => 0,
1366 @_,
1367 )
1368}
1369
1370#############################################################################
1371
1198package CFClient::UI::VBox; 1372package CFClient::UI::VBox;
1199 1373
1200# TODO: wrap into common Box base class
1201
1202our @ISA = CFClient::UI::Container::; 1374our @ISA = CFClient::UI::Box::;
1203 1375
1204sub size_request { 1376sub new {
1205 my ($self) = @_; 1377 my $class = shift;
1206 1378
1207 my @alloc = map [$_->size_request], @{$self->{children}}; 1379 $class->SUPER::new (
1208 1380 vertical => 1,
1209 ( 1381 @_,
1210 (List::Util::max map $_->[0], @alloc),
1211 (List::Util::sum map $_->[1], @alloc),
1212 ) 1382 )
1213} 1383}
1214 1384
1215sub size_allocate {
1216 my ($self, $w, $h) = @_;
1217
1218 my $children = $self->{children};
1219
1220 my @h = map $_->{req_h}, @$children;
1221
1222 my $req_h = List::Util::sum @h;
1223
1224 if ($req_h > $h) {
1225 # ah well, not enough space
1226 $_ *= $h / $req_h for @h;
1227 } else {
1228 my $exp = List::Util::sum map $_->{expand}, @$children;
1229 $exp ||= 1;
1230
1231 for (0 .. $#$children) {
1232 my $child = $children->[$_];
1233
1234 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1235 }
1236 }
1237
1238 CFClient::UI::harmonize \@h;
1239
1240 my $y = 0;
1241 for (0 .. $#$children) {
1242 my $child = $children->[$_];
1243 my $h = $h[$_];
1244 $child->configure (0, $y, $w, $h);
1245
1246 $y += $h;
1247 }
1248
1249 1
1250}
1251
1252############################################################################# 1385#############################################################################
1253 1386
1254package CFClient::UI::Label; 1387package CFClient::UI::Label;
1255 1388
1256our @ISA = CFClient::UI::Base::; 1389our @ISA = CFClient::UI::DrawBG::;
1257 1390
1258use CFClient::OpenGL; 1391use CFClient::OpenGL;
1259 1392
1260sub new { 1393sub new {
1261 my ($class, %arg) = @_; 1394 my ($class, %arg) = @_;
1262 1395
1263 my $self = $class->SUPER::new ( 1396 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1397 fg => [1, 1, 1],
1398 #bg => none
1399 #active_bg => none
1265 #font => default_font 1400 #font => default_font
1401 #text => initial text
1402 #markup => initial narkup
1403 #max_w => maximum pixel width
1404 ellipsise => 3, # end
1405 layout => (new CFClient::Layout),
1266 fontsize => 1, 1406 fontsize => 1,
1267 text => "",
1268 align => -1, 1407 align => -1,
1269 valign => -1, 1408 valign => -1,
1270 padding => 2, 1409 padding => 2,
1271 layout => new CFClient::Layout,
1272 can_events => 0, 1410 can_events => 0,
1273 %arg 1411 %arg
1274 ); 1412 );
1275 1413
1276 if (exists $self->{template}) { 1414 if (exists $self->{template}) {
1277 my $layout = new CFClient::Layout; 1415 my $layout = new CFClient::Layout;
1278 $layout->set_text (delete $self->{template}); 1416 $layout->set_text (delete $self->{template});
1279 $self->{template} = $layout; 1417 $self->{template} = $layout;
1280 } 1418 }
1281 1419
1282 $self->set_text (delete $self->{text}) if exists $self->{text}; 1420 if (exists $self->{markup}) {
1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1421 $self->set_markup (delete $self->{markup});
1422 } else {
1423 $self->set_text (delete $self->{text});
1424 }
1284 1425
1285 $self 1426 $self
1286} 1427}
1287 1428
1288sub escape { 1429sub escape($) {
1289 local $_ = $_[1]; 1430 local $_ = $_[0];
1290 1431
1291 s/&/&amp;/g; 1432 s/&/&amp;/g;
1292 s/>/&gt;/g; 1433 s/>/&gt;/g;
1293 s/</&lt;/g; 1434 s/</&lt;/g;
1294 1435
1295 $_[1] 1436 $_
1296} 1437}
1297 1438
1298sub update { 1439sub update {
1299 my ($self) = @_; 1440 my ($self) = @_;
1300 1441
… …
1306 my ($self, $text) = @_; 1447 my ($self, $text) = @_;
1307 1448
1308 return if $self->{text} eq "T$text"; 1449 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text"; 1450 $self->{text} = "T$text";
1310 1451
1452 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311 $self->{layout}->set_text ($text); 1453 $self->{layout}->set_text ($text);
1312 1454
1313 $self->update; 1455 $self->update;
1314 $self->check_size; 1456 $self->check_size;
1315} 1457}
… …
1318 my ($self, $markup) = @_; 1460 my ($self, $markup) = @_;
1319 1461
1320 return if $self->{text} eq "M$markup"; 1462 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup"; 1463 $self->{text} = "M$markup";
1322 1464
1465 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466
1467 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323 $self->{layout}->set_markup ($markup); 1468 $self->{layout}->set_markup ($markup);
1324 1469
1325 $self->update; 1470 $self->update;
1326 $self->check_size; 1471 $self->check_size;
1327} 1472}
… …
1329sub size_request { 1474sub size_request {
1330 my ($self) = @_; 1475 my ($self) = @_;
1331 1476
1332 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1477 $self->{layout}->set_font ($self->{font}) if $self->{font};
1333 $self->{layout}->set_width ($self->{max_w} || -1); 1478 $self->{layout}->set_width ($self->{max_w} || -1);
1479 $self->{layout}->set_ellipsise ($self->{ellipsise});
1480 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1334 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1481 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335 1482
1336 my ($w, $h) = $self->{layout}->size; 1483 my ($w, $h) = $self->{layout}->size;
1337 1484
1338 if (exists $self->{template}) { 1485 if (exists $self->{template}) {
… …
1368} 1515}
1369 1516
1370sub _draw { 1517sub _draw {
1371 my ($self) = @_; 1518 my ($self) = @_;
1372 1519
1520 $self->SUPER::_draw; # draw background, if applicable
1521
1373 my $tex = $self->{texture} ||= do { 1522 my $tex = $self->{texture} ||= do {
1523 $self->{layout}->set_foreground (@{$self->{fg}});
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1524 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{w}); 1525 $self->{layout}->set_width ($self->{w});
1526 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529
1377 new_from_layout CFClient::Texture $self->{layout} 1530 my $tex = new_from_layout CFClient::Texture $self->{layout};
1531
1532 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1533 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1534 : ($self->{w} - $tex->{w}) * 0.5);
1535
1536 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1537 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1538 : ($self->{h} - $tex->{h}) * 0.5);
1539
1540 $tex
1378 }; 1541 };
1379 1542
1380 glEnable GL_BLEND;
1381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382 glEnable GL_TEXTURE_2D; 1543 glEnable GL_TEXTURE_2D;
1383 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384 1545
1546 if ($tex->{format} == GL_ALPHA) {
1385 glColor @{$self->{fg}}; 1547 glColor @{$self->{fg}};
1386
1387 $self->{ox} = int (
1388 $self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5
1391 );
1392
1393 $self->{oy} = int (
1394 $self->{valign} < 0 ? $self->{padding}
1395 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1396 : ($self->{h} - $tex->{h}) * 0.5
1397 );
1398
1399 $tex->draw_quad ($self->{ox}, $self->{oy}); 1548 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1549 } else {
1550 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1551 }
1400 1552
1401 glDisable GL_TEXTURE_2D; 1553 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403} 1554}
1404 1555
1405############################################################################# 1556#############################################################################
1406 1557
1407package CFClient::UI::EntryBase; 1558package CFClient::UI::EntryBase;
… …
1420 active_fg => [0, 0, 0], 1571 active_fg => [0, 0, 0],
1421 can_hover => 1, 1572 can_hover => 1,
1422 can_focus => 1, 1573 can_focus => 1,
1423 valign => 0, 1574 valign => 0,
1424 can_events => 1, 1575 can_events => 1,
1576 #text => ...
1425 @_ 1577 @_
1426 ) 1578 )
1427} 1579}
1428 1580
1429sub _set_text { 1581sub _set_text {
… …
1439 $self->{text} = $text; 1591 $self->{text} = $text;
1440 1592
1441 $text =~ s/./*/g if $self->{hidden}; 1593 $text =~ s/./*/g if $self->{hidden};
1442 $self->{layout}->set_text ("$text "); 1594 $self->{layout}->set_text ("$text ");
1443 1595
1444 $self->emit (changed => $self->{text}); 1596 $self->_emit (changed => $self->{text});
1445}
1446
1447sub get_text {
1448 $_[0]{text}
1449}
1450
1451sub size_request {
1452 my ($self) = @_;
1453
1454 my ($w, $h) = $self->SUPER::size_request;
1455
1456 ($w + 1, $h) # add 1 for cursor
1457}
1458
1459sub size_allocate {
1460 my ($self, $w, $h) = @_;
1461
1462 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1463} 1597}
1464 1598
1465sub set_text { 1599sub set_text {
1466 my ($self, $text) = @_; 1600 my ($self, $text) = @_;
1467 1601
1468 $self->{cursor} = length $text; 1602 $self->{cursor} = length $text;
1469 $self->_set_text ($text); 1603 $self->_set_text ($text);
1470 $self->update; 1604 $self->update;
1605 $self->check_size;
1606}
1607
1608sub get_text {
1609 $_[0]{text}
1610}
1611
1612sub size_request {
1613 my ($self) = @_;
1614
1615 my ($w, $h) = $self->SUPER::size_request;
1616
1617 ($w + 1, $h) # add 1 for cursor
1471} 1618}
1472 1619
1473sub key_down { 1620sub key_down {
1474 my ($self, $ev) = @_; 1621 my ($self, $ev) = @_;
1475 1622
… …
1477 my $sym = $ev->{sym}; 1624 my $sym = $ev->{sym};
1478 my $uni = $ev->{unicode}; 1625 my $uni = $ev->{unicode};
1479 1626
1480 my $text = $self->get_text; 1627 my $text = $self->get_text;
1481 1628
1482 if ($sym == 8) { 1629 if ($uni == 8) {
1483 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1630 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484 } elsif ($sym == 127) { 1631 } elsif ($uni == 127) {
1485 substr $text, $self->{cursor}, 1, ""; 1632 substr $text, $self->{cursor}, 1, "";
1486 } elsif ($sym == CFClient::SDLK_LEFT) { 1633 } elsif ($sym == CFClient::SDLK_LEFT) {
1487 --$self->{cursor} if $self->{cursor}; 1634 --$self->{cursor} if $self->{cursor};
1488 } elsif ($sym == CFClient::SDLK_RIGHT) { 1635 } elsif ($sym == CFClient::SDLK_RIGHT) {
1489 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1636 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1490 } elsif ($sym == CFClient::SDLK_HOME) { 1637 } elsif ($sym == CFClient::SDLK_HOME) {
1491 $self->{cursor} = 0; 1638 $self->{cursor} = 0;
1492 } elsif ($sym == CFClient::SDLK_END) { 1639 } elsif ($sym == CFClient::SDLK_END) {
1493 $self->{cursor} = length $text; 1640 $self->{cursor} = length $text;
1494 } elsif ($sym == 27) { 1641 } elsif ($uni == 27) {
1495 $self->emit ('escape'); 1642 $self->_emit ('escape');
1496 } elsif ($uni) { 1643 } elsif ($uni) {
1497 substr $text, $self->{cursor}++, 0, chr $uni; 1644 substr $text, $self->{cursor}++, 0, chr $uni;
1498 } 1645 }
1499 1646
1500 $self->_set_text ($text); 1647 $self->_set_text ($text);
1501 $self->update; 1648 $self->update;
1649 $self->check_size;
1502} 1650}
1503 1651
1504sub focus_in { 1652sub focus_in {
1505 my ($self) = @_; 1653 my ($self) = @_;
1506 1654
… …
1586 if ($sym == 13) { 1734 if ($sym == 13) {
1587 unshift @{$self->{history}}, 1735 unshift @{$self->{history}},
1588 my $txt = $self->get_text; 1736 my $txt = $self->get_text;
1589 $self->{history_pointer} = -1; 1737 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = ''; 1738 $self->{history_saveback} = '';
1591 $self->emit (activate => $txt); 1739 $self->_emit (activate => $txt);
1592 $self->update; 1740 $self->update;
1593 1741
1594 } elsif ($sym == CFClient::SDLK_UP) { 1742 } elsif ($sym == CFClient::SDLK_UP) {
1595 if ($self->{history_pointer} < 0) { 1743 if ($self->{history_pointer} < 0) {
1596 $self->{history_saveback} = $self->get_text; 1744 $self->{history_saveback} = $self->get_text;
… …
1635 my $class = shift; 1783 my $class = shift;
1636 1784
1637 $class->SUPER::new ( 1785 $class->SUPER::new (
1638 padding => 4, 1786 padding => 4,
1639 fg => [1, 1, 1], 1787 fg => [1, 1, 1],
1640 bg => [1, 1, 1, 0.2],
1641 active_fg => [0, 0, 1], 1788 active_fg => [0, 0, 1],
1642 can_hover => 1, 1789 can_hover => 1,
1643 align => 0, 1790 align => 0,
1644 valign => 0, 1791 valign => 0,
1645 can_events => 1, 1792 can_events => 1,
1646 @_ 1793 @_
1647 ) 1794 )
1648} 1795}
1649 1796
1797sub activate { }
1798
1650sub button_up { 1799sub button_up {
1651 my ($self, $ev, $x, $y) = @_; 1800 my ($self, $ev, $x, $y) = @_;
1652 1801
1802 $self->emit ("activate")
1653 if ($x >= 0 && $x < $self->{w} 1803 if $x >= 0 && $x < $self->{w}
1654 && $y >= 0 && $y < $self->{h}) { 1804 && $y >= 0 && $y < $self->{h};
1655 $self->emit ("activate");
1656 }
1657} 1805}
1658 1806
1659sub _draw { 1807sub _draw {
1660 my ($self) = @_; 1808 my ($self) = @_;
1661 1809
… …
1663 1811
1664 if ($GRAB == $self) { 1812 if ($GRAB == $self) {
1665 $self->{fg} = $self->{active_fg}; 1813 $self->{fg} = $self->{active_fg};
1666 } 1814 }
1667 1815
1668 glEnable GL_BLEND;
1669 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670 glEnable GL_TEXTURE_2D; 1816 glEnable GL_TEXTURE_2D;
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 glColor 0, 0, 0, 1; 1818 glColor 0, 0, 0, 1;
1673 1819
1674 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1820 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675 1821
1676 glDisable GL_TEXTURE_2D; 1822 glDisable GL_TEXTURE_2D;
1677 glDisable GL_BLEND;
1678 1823
1679 $self->SUPER::_draw; 1824 $self->SUPER::_draw;
1680} 1825}
1681 1826
1682############################################################################# 1827#############################################################################
… …
1696 1841
1697 $class->SUPER::new ( 1842 $class->SUPER::new (
1698 padding => 2, 1843 padding => 2,
1699 fg => [1, 1, 1], 1844 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0], 1845 active_fg => [1, 1, 0],
1846 bg => [0, 0, 0, 0.2],
1847 active_bg => [1, 1, 1, 0.5],
1701 state => 0, 1848 state => 0,
1702 can_hover => 1, 1849 can_hover => 1,
1703 @_ 1850 @_
1704 ) 1851 )
1705} 1852}
… …
1714 my ($self, $ev, $x, $y) = @_; 1861 my ($self, $ev, $x, $y) = @_;
1715 1862
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1863 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1864 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718 $self->{state} = !$self->{state}; 1865 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 1866 $self->_emit (changed => $self->{state});
1720 } 1867 }
1721} 1868}
1722 1869
1723sub _draw { 1870sub _draw {
1724 my ($self) = @_; 1871 my ($self) = @_;
… …
1729 1876
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1877 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731 1878
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1879 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 1880
1734 glEnable GL_BLEND; 1881 my $tex = $self->{state} ? $tex[1] : $tex[0];
1882
1735 glEnable GL_TEXTURE_2D; 1883 glEnable GL_TEXTURE_2D;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1737
1738 my $tex = $self->{state} ? $tex[1] : $tex[0];
1739
1740 $tex->draw_quad (0, 0, $s, $s); 1884 $tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742 glDisable GL_TEXTURE_2D; 1885 glDisable GL_TEXTURE_2D;
1743 glDisable GL_BLEND;
1744} 1886}
1745 1887
1746############################################################################# 1888#############################################################################
1747 1889
1748package CFClient::UI::Image; 1890package CFClient::UI::Image;
… …
1791 glTranslate 0, -$self->{w}, 0; 1933 glTranslate 0, -$self->{w}, 0;
1792 1934
1793 ($w, $h) = ($h, $w); 1935 ($w, $h) = ($h, $w);
1794 } 1936 }
1795 1937
1796 glEnable GL_BLEND;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798 glEnable GL_TEXTURE_2D; 1938 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1939 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 1940
1801 $tex->draw_quad (0, 0, $w, $h); 1941 $tex->draw_quad_alpha (0, 0, $w, $h);
1802 1942
1803 glDisable GL_BLEND;
1804 glDisable GL_TEXTURE_2D; 1943 glDisable GL_TEXTURE_2D;
1805} 1944}
1806 1945
1807############################################################################# 1946#############################################################################
1808 1947
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2136 qw(s1_slider.png s1_slider_bg.png);
1998 2137
1999sub new { 2138sub new {
2000 my $class = shift; 2139 my $class = shift;
2001 2140
2002 # range [value, low, high, page] 2141 # range [value, low, high, page, unit]
2003 2142
2004 # TODO: 0-width page 2143 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2144 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2145 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2146 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2147 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2148 active_fg => [0, 0, 0],
2149 bg => [0, 0, 0, 0.2],
2150 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2151 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2152 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2153 req_h => $::WIDTH / 80,
2013 vertical => 0, 2154 vertical => 0,
2014 can_hover => 1, 2155 can_hover => 1,
2015 inner_pad => 5, 2156 inner_pad => 0.02,
2016 @_ 2157 @_
2017 ); 2158 );
2018 2159
2160 $self->set_value ($self->{range}[0]);
2161 $self->update;
2162
2019 $self 2163 $self
2164}
2165
2166sub set_range {
2167 my ($self, $range) = @_;
2168
2169 ($range, $self->{range}) = ($self->{range}, $range);
2170
2171 $self->update
2172 if "@$range" ne "@{$self->{range}}";
2173}
2174
2175sub set_value {
2176 my ($self, $value) = @_;
2177
2178 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2179
2180 $hi = $lo + 1 if $hi <= $lo;
2181
2182 $page = $hi - $lo if $page > $hi - $lo;
2183
2184 $value = $lo if $value < $lo;
2185 $value = $hi - $page if $value > $hi - $page;
2186
2187 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2188 if $unit;
2189
2190 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2191
2192 if ($value != $old_value) {
2193 $self->_emit (changed => $value);
2194 $self->update;
2195 }
2020} 2196}
2021 2197
2022sub size_request { 2198sub size_request {
2023 my ($self) = @_; 2199 my ($self) = @_;
2024 2200
… …
2030 2206
2031sub button_down { 2207sub button_down {
2032 my ($self, $ev, $x, $y) = @_; 2208 my ($self, $ev, $x, $y) = @_;
2033 2209
2034 $self->SUPER::button_down ($ev, $x, $y); 2210 $self->SUPER::button_down ($ev, $x, $y);
2211
2212 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2213
2035 $self->mouse_motion ($ev, $x, $y); 2214 $self->mouse_motion ($ev, $x, $y);
2036} 2215}
2037 2216
2038sub mouse_motion { 2217sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
2040 2219
2041 if ($GRAB == $self) { 2220 if ($GRAB == $self) {
2221 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2222
2223 my (undef, $lo, $hi, $page) = @{$self->{range}};
2224
2225 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2226
2227 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2228 }
2229}
2230
2231sub update {
2232 my ($self) = @_;
2233
2234 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2235 $self->set_value ($self->{range}[0]);
2236
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2237 my ($value, $lo, $hi, $page) = @{$self->{range}};
2238 my $range = ($hi - $page - $lo) || 1e-100;
2043 2239
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2240 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2241
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2242 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2243 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2244
2049 $x -= $inner_pad_px; # substract the padding 2245 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2246 $value = $value * $self->{scale} + $self->{offset};
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2247
2055 $self->emit (changed => $x); 2248 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2249 $self->{knob_w} = $knob_w;
2057 } 2250 });
2058}
2059 2251
2060# the inner_* stuff is for generating a padding for the slider handle, 2252 $self->SUPER::update;
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066} 2253}
2067 2254
2068sub _draw { 2255sub _draw {
2069 my ($self) = @_; 2256 my ($self) = @_;
2070 2257
2071 $self->SUPER::_draw (); 2258 $self->SUPER::_draw ();
2072 2259
2073 my ($w, $h) = @$self{qw(w h)}; 2260 glScale $self->{w}, $self->{h};
2074 2261
2075 if ($self->{vertical}) { 2262 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2263 # draw a vertical slider like a rotated horizontal slider
2077 2264
2265 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2266 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2267 }
2083 2268
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2269 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2270 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2271
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_BLEND;
2106 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2107 glEnable GL_TEXTURE_2D; 2272 glEnable GL_TEXTURE_2D;
2108 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109 2274
2110 # draw background 2275 # draw background
2111 $tex[1]->draw_quad (0, 0, $w, $h); 2276 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112 2277
2113 # draw handle 2278 # draw handle
2114 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2279 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115 2280
2116 glDisable GL_BLEND;
2117 glDisable GL_TEXTURE_2D; 2281 glDisable GL_TEXTURE_2D;
2118} 2282}
2283
2284#############################################################################
2285
2286package CFClient::UI::ValSlider;
2287
2288our @ISA = CFClient::UI::HBox::;
2289
2290sub new {
2291 my ($class, %arg) = @_;
2292
2293 my $range = delete $arg{range};
2294
2295 my $self = $class->SUPER::new (
2296 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2297 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2298 to_value => sub { shift },
2299 from_value => sub { shift },
2300 %arg,
2301 );
2302
2303 $self->{slider}->connect (changed => sub {
2304 my ($self, $value) = @_;
2305 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2306 $self->{parent}->emit (changed => $value);
2307 });
2308
2309# $self->{entry}->connect (changed => sub {
2310# my ($self, $value) = @_;
2311# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2312# $self->{parent}->emit (changed => $value);
2313# });
2314
2315 $self->add ($self->{slider}, $self->{entry});
2316
2317 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2318
2319 $self
2320}
2321
2322sub set_range { shift->{slider}->set_range (@_) }
2323sub set_value { shift->{slider}->set_value (@_) }
2119 2324
2120############################################################################# 2325#############################################################################
2121 2326
2122package CFClient::UI::TextView; 2327package CFClient::UI::TextView;
2123 2328
… …
2132 fontsize => 1, 2337 fontsize => 1,
2133 can_events => 0, 2338 can_events => 0,
2134 #font => default_font 2339 #font => default_font
2135 @_, 2340 @_,
2136 2341
2137 layout => (new CFClient::Layout), 2342 layout => (new CFClient::Layout 1),
2138 par => [], 2343 par => [],
2139 height => 0, 2344 height => 0,
2140 children => [ 2345 children => [
2141 (new CFClient::UI::Empty expand => 1), 2346 (new CFClient::UI::Empty expand => 1),
2142 (new CFClient::UI::Slider vertical => 1), 2347 (new CFClient::UI::Slider vertical => 1),
… …
2153 2358
2154 $self->{fontsize} = $fontsize; 2359 $self->{fontsize} = $fontsize;
2155 $self->reflow; 2360 $self->reflow;
2156} 2361}
2157 2362
2158sub text_height {
2159 my ($self, $text) = @_;
2160
2161 my $layout = $self->{layout};
2162
2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2164 $layout->set_width ($self->{children}[0]{w});
2165 $layout->set_text ($text);
2166
2167 ($layout->size)[1]
2168}
2169
2170sub reflow {
2171 my ($self) = @_;
2172
2173 $self->{need_reflow}++;
2174 $self->update;
2175}
2176
2177sub size_allocate { 2363sub size_allocate {
2178 my ($self, $w, $h) = @_; 2364 my ($self, $w, $h) = @_;
2179 2365
2180 $self->SUPER::size_allocate ($w, $h); 2366 $self->SUPER::size_allocate ($w, $h);
2181 2367
… …
2184 $self->{layout}->set_width ($self->{children}[0]{w}); 2370 $self->{layout}->set_width ($self->{children}[0]{w});
2185 2371
2186 $self->reflow; 2372 $self->reflow;
2187} 2373}
2188 2374
2375sub text_size {
2376 my ($self, $text, $indent) = @_;
2377
2378 my $layout = $self->{layout};
2379
2380 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2381 $layout->set_width ($self->{children}[0]{w} - $indent);
2382 $layout->set_markup ($text);
2383
2384 $layout->size
2385}
2386
2387sub reflow {
2388 my ($self) = @_;
2389
2390 $self->{need_reflow}++;
2391 $self->update;
2392}
2393
2394sub set_offset {
2395 my ($self, $offset) = @_;
2396
2397 # todo: base offset on lines or so, not on pixels
2398 $self->{children}[1]->set_value ($offset);
2399}
2400
2401sub clear {
2402 my ($self) = @_;
2403
2404 $self->{par} = [];
2405 $self->{height} = 0;
2406 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2407}
2408
2189sub add_paragraph { 2409sub add_paragraph {
2190 my ($self, $color, $text) = @_; 2410 my ($self, $color, $text, $indent) = @_;
2191 2411
2192 #TODO: intelligently "reformat" paragraph 2412 for my $line (split /\n/, $text) {
2193 2413 my ($w, $h) = $self->text_size ($line);
2194 my $height = $self->text_height ($text);
2195
2196 $self->{height} += $height; 2414 $self->{height} += $h;
2415 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2416 }
2197 2417
2198 push @{$self->{par}}, [$height, $color, $text];
2199
2200 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2418 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2201 $self->{children}[1]->update;
2202} 2419}
2203 2420
2204sub update { 2421sub update {
2205 my ($self) = @_; 2422 my ($self) = @_;
2206 2423
… …
2208 2425
2209 return unless $self->{h} > 0; 2426 return unless $self->{h} > 0;
2210 2427
2211 delete $self->{texture}; 2428 delete $self->{texture};
2212 2429
2213 $ROOT->on_refresh ($self, sub { 2430 $ROOT->on_post_alloc ($self, sub {
2431 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2432
2214 if (delete $self->{need_reflow}) { 2433 if (delete $self->{need_reflow}) {
2215 my $height = 0; 2434 my $height = 0;
2216 2435
2217 $height += $_->[0] = $self->text_height ($_->[2]) 2436 my $layout = $self->{layout};
2437
2438 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2439
2218 for @{$self->{par}}; 2440 for (@{$self->{par}}) {
2441 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2442 $layout->set_width ($W - $_->[3]);
2443 $layout->set_markup ($_->[4]);
2444 my ($w, $h) = $layout->size;
2445 $_->[0] = $w + $_->[3];
2446 $_->[1] = $h;
2447 }
2448
2449 $height += $_->[1];
2450 }
2219 2451
2220 $self->{height} = $height; 2452 $self->{height} = $height;
2221 2453
2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2454 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2223 2455
2224 delete $self->{texture}; 2456 delete $self->{texture};
2225 } 2457 }
2226 2458
2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2459 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2228 glClearColor 0, 0, 0, 0; 2460 glClearColor 0.5, 0.5, 0.5, 0;
2229 glClear GL_COLOR_BUFFER_BIT; 2461 glClear GL_COLOR_BUFFER_BIT;
2230 2462
2463 my $top = int $self->{children}[1]{range}[0];
2464
2465 my $y0 = $top;
2466 my $y1 = $top + $H;
2467
2468 my $y = 0;
2469
2470 my $layout = $self->{layout};
2471
2472 $layout->set_font ($self->{font}) if $self->{font};
2473
2231 glEnable GL_BLEND; 2474 glEnable GL_BLEND;
2475 #TODO# not correct in windows where rgba is forced off
2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2476 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2233 glEnable GL_TEXTURE_2D;
2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235
2236 my $top = int $self->{children}[1]{range}[0];
2237
2238 my $y0 = $top;
2239 my $y1 = $top + $self->{h};
2240
2241 my $y = 0;
2242
2243 my $layout = $self->{layout};
2244
2245 $layout->set_font ($self->{font}) if $self->{font};
2246 2477
2247 for my $par (@{$self->{par}}) { 2478 for my $par (@{$self->{par}}) {
2248 my $h = $par->[0]; 2479 my $h = $par->[1];
2249 2480
2250 if ($y0 < $y + $h && $y < $y1) { 2481 if ($y0 < $y + $h && $y < $y1) {
2482 $layout->set_foreground (@{ $par->[2] });
2483 $layout->set_width ($W - $par->[3]);
2251 $layout->set_text ($par->[2]); 2484 $layout->set_markup ($par->[4]);
2252 2485
2253 glColor @{ $par->[1] }; 2486 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2254 my ($W, $H) = $layout->size; 2487
2255 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2488 glRasterPos $par->[3], $y - $y0;
2489 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2256 } 2490 }
2257 2491
2258 $y += $h; 2492 $y += $h;
2259 } 2493 }
2260 2494
2261 glDisable GL_TEXTURE_2D;
2262 glDisable GL_BLEND; 2495 glDisable GL_BLEND;
2263 }; 2496 };
2264 }); 2497 });
2265} 2498}
2266 2499
2267sub _draw { 2500sub _draw {
2268 my ($self) = @_; 2501 my ($self) = @_;
2269 2502
2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272 glEnable GL_TEXTURE_2D; 2503 glEnable GL_TEXTURE_2D;
2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1; 2505 glColor 1, 1, 1, 1;
2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2506 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276 glDisable GL_TEXTURE_2D; 2507 glDisable GL_TEXTURE_2D;
2277 glDisable GL_BLEND;
2278 2508
2279 $self->{children}[1]->draw; 2509 $self->{children}[1]->draw;
2280 2510
2281} 2511}
2282 2512
… …
2330 2560
2331sub new { 2561sub new {
2332 my $class = shift; 2562 my $class = shift;
2333 2563
2334 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2335 state => 0, 2565 state => 0,
2336 connect_activate => \&toggle_flopper, 2566 on_activate => \&toggle_flopper,
2337 @_ 2567 @_
2338 ); 2568 );
2339 2569
2340 if ($self->{state}) {
2341 $self->{state} = 0;
2342 $self->toggle_flopper;
2343 }
2344
2345 $self 2570 $self
2346} 2571}
2347 2572
2348sub toggle_flopper { 2573sub toggle_flopper {
2349 my ($self) = @_; 2574 my ($self) = @_;
2350 2575
2351 # TODO: use animation 2576 $self->{other}->toggle_visibility;
2352 if ($self->{state} = !$self->{state}) {
2353 $CFClient::UI::ROOT->add ($self->{other});
2354 $self->{other}->move ($self->coord2global (0, $self->{h}));
2355 $self->emit ("open");
2356 } else {
2357 $CFClient::UI::ROOT->remove ($self->{other});
2358 $self->emit ("close");
2359 }
2360
2361 $self->emit (changed => $self->{state});
2362} 2577}
2363 2578
2364############################################################################# 2579#############################################################################
2365 2580
2366package CFClient::UI::Tooltip; 2581package CFClient::UI::Tooltip;
… …
2376 @_, 2591 @_,
2377 can_events => 0, 2592 can_events => 0,
2378 ) 2593 )
2379} 2594}
2380 2595
2381sub set_markup { 2596sub set_tooltip_from {
2382 my ($self, $text) = @_; 2597 my ($self, $widget) = @_;
2383 2598
2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2599 $self->add (new CFClient::UI::Label
2385 $self->{label}->set_markup ($text); 2600 markup => $widget->{tooltip},
2386 $self->add ($self->{label}); 2601 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602 fontsize => 0.8,
2603 fg => [0, 0, 0, 1],
2604 ellipsise => 0,
2605 font => ($widget->{tooltip_font} || $::FONT_PROP),
2606 );
2387} 2607}
2388 2608
2389sub size_request { 2609sub size_request {
2390 my ($self) = @_; 2610 my ($self) = @_;
2391
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393 2611
2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2612 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395 2613
2396 ($w + 4, $h + 4) 2614 ($w + 4, $h + 4)
2397} 2615}
… …
2403} 2621}
2404 2622
2405sub _draw { 2623sub _draw {
2406 my ($self) = @_; 2624 my ($self) = @_;
2407 2625
2408 glPushMatrix;
2409 glTranslate 0.375, 0.375; 2626 glTranslate 0.375, 0.375;
2410 2627
2411 my ($w, $h) = @$self{qw(w h)}; 2628 my ($w, $h) = @$self{qw(w h)};
2412 2629
2413 glColor 1, 0.8, 0.4; 2630 glColor 1, 0.8, 0.4;
… …
2424 glVertex 0 , $h; 2641 glVertex 0 , $h;
2425 glVertex $w, $h; 2642 glVertex $w, $h;
2426 glVertex $w, 0; 2643 glVertex $w, 0;
2427 glEnd; 2644 glEnd;
2428 2645
2429 glPopMatrix; 2646 glTranslate 2 - 0.375, 2 - 0.375;
2430
2431 glTranslate 2, 2;
2432 $self->SUPER::_draw; 2647 $self->SUPER::_draw;
2433} 2648}
2434 2649
2435############################################################################# 2650#############################################################################
2436 2651
… …
2441use CFClient::OpenGL; 2656use CFClient::OpenGL;
2442 2657
2443sub new { 2658sub new {
2444 my $class = shift; 2659 my $class = shift;
2445 2660
2446 $class->SUPER::new ( 2661 my $self = $class->SUPER::new (
2447 aspect => 1, 2662 aspect => 1,
2663 can_events => 0,
2448 @_, 2664 @_,
2449 ) 2665 );
2666
2667 if ($self->{anim} && $self->{animspeed}) {
2668 Scalar::Util::weaken (my $widget = $self);
2669
2670 $self->{timer} = Event->timer (
2671 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2672 hard => 1,
2673 interval => $self->{animspeed},
2674 cb => sub {
2675 ++$widget->{frame};
2676 $widget->update;
2677 },
2678 );
2679 }
2680
2681 $self
2450} 2682}
2451 2683
2452sub size_request { 2684sub size_request {
2453 (32, 8) 2685 (32, 8)
2454} 2686}
2455 2687
2688sub update {
2689 my ($self) = @_;
2690
2691 return unless $self->{visible};
2692
2693 $self->SUPER::update;
2694}
2695
2456sub _draw { 2696sub _draw {
2457 my ($self) = @_; 2697 my ($self) = @_;
2458 2698
2459 return unless $::CONN;#d# manage and cache textures differently 2699 return unless $::CONN;
2700
2701 my $face;
2702
2703 if ($self->{frame}) {
2704 my $anim = $::CONN->{anim}[$self->{anim}];
2705
2706 $face = $anim->[ $self->{frame} % @$anim ]
2707 if $anim && @$anim;
2708 }
2709
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2710 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461 2711
2462 # TODO animation
2463 if ($tex) { 2712 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D; 2713 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1; 2715 glColor 1, 1, 1, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2716 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 } 2718 }
2473} 2719}
2474 2720
2475############################################################################# 2721sub DESTROY {
2722 my ($self) = @_;
2476 2723
2724 $self->{timer}->cancel
2725 if $self->{timer};
2726
2727 $self->SUPER::DESTROY;
2728}
2729
2730#############################################################################
2731
2477package CFClient::UI::InventoryItem; 2732package CFClient::UI::Inventory;
2478 2733
2479our @ISA = CFClient::UI::HBox::; 2734our @ISA = CFClient::UI::ScrolledWindow::;
2480 2735
2481sub new { 2736sub new {
2482 my $class = shift; 2737 my $class = shift;
2483 2738
2484 my %args = @_;
2485
2486 my $item = $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new ( 2739 my $self = $class->SUPER::new (
2494 can_hover => 1, 2740 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525 $self->add(new CFClient::UI::Face
2526 can_events => 0,
2527 face => $item->{face},
2528 anim => $item->{anim},
2529 animspeed => $item->{animspeed});
2530 $self->add(new CFClient::UI::Label
2531 can_events => 0,
2532 text => $desc);
2533
2534 $self
2535}
2536
2537#############################################################################
2538
2539package CFClient::UI::Inventory;
2540
2541our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543sub new {
2544 my $class = shift;
2545
2546 my $self = $class->SUPER::new (
2547 scrolled => (new CFClient::UI::VBox),
2548 @_, 2741 @_,
2549 ); 2742 );
2550 2743
2551 $self 2744 $self
2552} 2745}
… …
2555 my ($self, $items) = @_; 2748 my ($self, $items) = @_;
2556 2749
2557 $self->{scrolled}->clear; 2750 $self->{scrolled}->clear;
2558 return unless $items; 2751 return unless $items;
2559 2752
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2753 my @items = sort {
2754 ($a->{type} <=> $b->{type})
2755 or ($a->{name} cmp $b->{name})
2756 } @$items;
2561 2757
2562 $self->{real_items} = \@items; 2758 $self->{real_items} = \@items;
2563 2759
2760 my $row = 0;
2564 for my $item (@items) { 2761 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2 2762 CFClient::Item::update_widgets $item;
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568 2763
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2764 $self->{scrolled}->add (0, $row, $item->{face_widget});
2570 } 2765 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2766 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2571 2767
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2768 $row++;
2573} 2769 }
2574
2575sub size_request {
2576 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h});
2578} 2770}
2579 2771
2580############################################################################# 2772#############################################################################
2581 2773
2582package CFClient::UI::Menu; 2774package CFClient::UI::Menu;
… …
2617 2809
2618# popup given the event (must be a mouse button down event currently) 2810# popup given the event (must be a mouse button down event currently)
2619sub popup { 2811sub popup {
2620 my ($self, $ev) = @_; 2812 my ($self, $ev) = @_;
2621 2813
2622 $self->emit ("popdown"); 2814 $self->_emit ("popdown");
2623 2815
2624 # maybe save $GRAB? must be careful about events... 2816 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self; 2817 $GRAB = $self;
2626 $self->{button} = $ev->{button}; 2818 $self->{button} = $ev->{button};
2627 2819
… …
2642 2834
2643 if ($ev->{button} == $self->{button}) { 2835 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB; 2836 undef $GRAB;
2645 $self->hide; 2837 $self->hide;
2646 2838
2647 $self->emit ("popdown"); 2839 $self->_emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover}; 2840 $self->{hover}[1]->() if $self->{hover};
2649 } 2841 }
2650} 2842}
2651 2843
2652############################################################################# 2844#############################################################################
2653 2845
2654package CFClient::UI::Root; 2846package CFClient::UI::Statusbox;
2655 2847
2656our @ISA = CFClient::UI::Container::; 2848our @ISA = CFClient::UI::VBox::;
2657
2658use CFClient::OpenGL;
2659 2849
2660sub new { 2850sub new {
2661 my $class = shift; 2851 my $class = shift;
2662 2852
2663 $class->SUPER::new ( 2853 $class->SUPER::new (
2854 fontsize => 0.8,
2664 @_, 2855 @_,
2665 ) 2856 )
2666} 2857}
2667 2858
2859sub reorder {
2860 my ($self) = @_;
2861 my $NOW = time;
2862
2863 while (my ($k, $v) = each %{ $self->{item} }) {
2864 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2865 }
2866
2867 my @widgets;
2868
2869 my @items = sort {
2870 $a->{pri} <=> $b->{pri}
2871 or $b->{id} <=> $a->{id}
2872 } values %{ $self->{item} };
2873
2874 my $count = 10 + 1;
2875 for my $item (@items) {
2876 last unless --$count;
2877
2878 push @widgets, $item->{label} ||= do {
2879 # TODO: doesn't handle markup well (read as: at all)
2880 my $short = $item->{count} > 1
2881 ? "<b>$item->{count} ×</b> $item->{text}"
2882 : $item->{text};
2883
2884 for ($short) {
2885 s/^\s+//;
2886 s/\s+/ /g;
2887 }
2888
2889 new CFClient::UI::Label
2890 markup => $short,
2891 tooltip => $item->{tooltip},
2892 tooltip_font => $::FONT_PROP,
2893 tooltip_width => 0.67,
2894 fontsize => $item->{fontsize} || $self->{fontsize},
2895 max_w => $::WIDTH * 0.44,
2896 fg => $item->{fg},
2897 can_events => 1,
2898 can_hover => 1
2899 };
2900 }
2901
2902 $self->clear;
2903 $self->SUPER::add (reverse @widgets);
2904}
2905
2906sub add {
2907 my ($self, $text, %arg) = @_;
2908
2909 $text =~ s/^\s+//;
2910 $text =~ s/\s+$//;
2911
2912 return unless $text;
2913
2914 my $timeout = time + ((delete $arg{timeout}) || 60);
2915
2916 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2917
2918 if (my $item = $self->{item}{$group}) {
2919 if ($item->{text} eq $text) {
2920 $item->{count}++;
2921 } else {
2922 $item->{count} = 1;
2923 $item->{text} = $item->{tooltip} = $text;
2924 }
2925 $item->{id} = ++$self->{id};
2926 $item->{timeout} = $timeout;
2927 delete $item->{label};
2928 } else {
2929 $self->{item}{$group} = {
2930 id => ++$self->{id},
2931 text => $text,
2932 timeout => $timeout,
2933 tooltip => $text,
2934 fg => [0.8, 0.8, 0.8, 0.8],
2935 pri => 0,
2936 count => 1,
2937 %arg,
2938 };
2939 }
2940
2941 $self->reorder;
2942}
2943
2944sub reconfigure {
2945 my ($self) = @_;
2946
2947 delete $_->{label}
2948 for values %{ $self->{item} || {} };
2949
2950 $self->reorder;
2951 $self->SUPER::reconfigure;
2952}
2953
2954#############################################################################
2955
2956package CFClient::UI::Root;
2957
2958our @ISA = CFClient::UI::Container::;
2959
2960use CFClient::OpenGL;
2961
2962sub new {
2963 my $class = shift;
2964
2965 $class->SUPER::new (
2966 visible => 1,
2967 @_,
2968 )
2969}
2970
2668sub configure { 2971sub configure {
2669 my ($self, $x, $y, $w, $h) = @_; 2972 my ($self, $x, $y, $w, $h) = @_;
2670 2973
2671 $self->{w} = $w; 2974 $self->{w} = $w;
2672 $self->{h} = $h; 2975 $self->{h} = $h;
… …
2686} 2989}
2687 2990
2688sub size_allocate { 2991sub size_allocate {
2689 my ($self, $w, $h) = @_; 2992 my ($self, $w, $h) = @_;
2690 2993
2691 my $old_w = $self->{old_w};
2692 my $old_h = $self->{old_h};
2693
2694 if ($old_w && $old_h) {
2695 for my $child ($self->children) {
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706
2707 for my $child ($self->children) { 2994 for my $child ($self->children) {
2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2995 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709 2996
2997 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2998 if exists $child->{req_x};
2999
3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3001 if exists $child->{req_y};
3002
3003 delete @$child{qw(req_x req_y)};
3004
2710 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007
2712 $child->configure ($X, $Y, $W, $H); 3008 $child->configure ($X, $Y, $W, $H);
2713 } 3009 }
2714
2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717} 3010}
2718 3011
2719sub coord2local { 3012sub coord2local {
2720 my ($self, $x, $y) = @_; 3013 my ($self, $x, $y) = @_;
2721 3014
… …
2734 $self->check_size; 3027 $self->check_size;
2735 $::WANT_REFRESH++; 3028 $::WANT_REFRESH++;
2736} 3029}
2737 3030
2738sub add { 3031sub add {
2739 my ($self, $child) = @_; 3032 my ($self, @children) = @_;
2740 3033
3034 for my $child (@children) {
3035 $child->{is_toplevel} = 1;
3036
2741 # integerise window positions 3037 # integerise window positions
2742 $child->{x} = int $child->{x}; 3038 $child->{x} = int $child->{x};
2743 $child->{y} = int $child->{y}; 3039 $child->{y} = int $child->{y};
3040 }
2744 3041
2745 $self->SUPER::add ($child); 3042 $self->SUPER::add (@children);
3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3049}
3050
3051sub remove {
3052 my ($self, @children) = @_;
3053
3054 $self->SUPER::remove (@children);
3055
3056 while (@children) {
3057 my $w = pop @children;
3058 push @children, $w->children;
3059 $w->set_invisible;
3060 }
2746} 3061}
2747 3062
2748sub on_refresh { 3063sub on_refresh {
2749 my ($self, $id, $cb) = @_; 3064 my ($self, $id, $cb) = @_;
2750 3065
2751 $self->{refresh_hook}{$id} = $cb; 3066 $self->{refresh_hook}{$id} = $cb;
2752} 3067}
2753 3068
3069sub on_post_alloc {
3070 my ($self, $id, $cb) = @_;
3071
3072 $self->{post_alloc_hook}{$id} = $cb;
3073}
3074
2754sub draw { 3075sub draw {
2755 my ($self) = @_; 3076 my ($self) = @_;
2756 3077
3078 while ($self->{refresh_hook}) {
3079 $_->()
3080 for values %{delete $self->{refresh_hook}};
3081 }
3082
2757 if ($self->{check_size}) { 3083 if ($self->{check_size}) {
2758 my @queue = ([], []); 3084 my @queue;
2759 3085
2760 for (;;) { 3086 for (;;) {
2761 if ($self->{check_size}) { 3087 if ($self->{check_size}) {
2762 # heuristic: check containers last 3088 #TODO use array-of-depth approach
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3089
3090 @queue = sort { $a->{visible} <=> $b->{visible} }
2764 for values %{delete $self->{check_size}} 3091 @queue, values %{delete $self->{check_size}};
2765 } 3092 }
2766 3093
2767 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3094 my $widget = pop @queue || last;
2768 3095
3096 defined $widget->{visible} or last; # do not resize invisible widgets
3097
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2770 ? @$widget{qw(user_w user_h)} 3099 ? @$widget{qw(def_w def_h)}
2771 : $widget->size_request; 3100 : $widget->size_request;
2772 3101
3102 if (delete $widget->{force_alloc}
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105
2774 $widget->{req_w} = $w; 3106 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h; 3107 $widget->{req_h} = $h;
2776 3108
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3109 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2778 3110
2779 $widget->{parent}->check_size 3111 $widget->{parent}->check_size
2780 if $widget->{parent}; 3112 if $widget->{parent};
2781 } 3113 }
2782 } 3114 }
… …
2784 3116
2785 while ($self->{size_alloc}) { 3117 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) { 3118 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_; 3119 my ($widget, $w, $h) = @$_;
2788 3120
3121 $w = 0 if $w < 0;
3122 $h = 0 if $h < 0;
3123
2789 $widget->{w} = $w; 3124 $widget->{w} = $w;
2790 $widget->{h} = $h; 3125 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h); 3126 $widget->emit (size_allocate => $w, $h);
2793 } 3127 }
2794 } 3128 }
2795 3129
2796 while ($self->{refresh_hook}) { 3130 while ($self->{post_alloc_hook}) {
2797 $_->() 3131 $_->()
2798 for values %{delete $self->{refresh_hook}}; 3132 for values %{delete $self->{post_alloc_hook}};
2799 } 3133 }
2800 3134
2801 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3135 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3136 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803 glClear GL_COLOR_BUFFER_BIT; 3137 glClear GL_COLOR_BUFFER_BIT;
2804 3138
2805 glMatrixMode GL_PROJECTION; 3139 glMatrixMode GL_PROJECTION;
2806 glLoadIdentity; 3140 glLoadIdentity;
2807 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3141 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2808 glMatrixMode GL_MODELVIEW; 3142 glMatrixMode GL_MODELVIEW;
2809 glLoadIdentity; 3143 glLoadIdentity;
2810 3144
2811 $self->_draw; 3145 $self->_draw;
2812} 3146}
… …
2814############################################################################# 3148#############################################################################
2815 3149
2816package CFClient::UI; 3150package CFClient::UI;
2817 3151
2818$ROOT = new CFClient::UI::Root; 3152$ROOT = new CFClient::UI::Root;
2819$TOOLTIP = new CFClient::UI::Tooltip; 3153$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820 3154
28211 31551
2822 3156

Diff Legend

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