ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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