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.170 by root, Mon Apr 24 11:45:17 2006 UTC vs.
Revision 1.244 by root, Sat May 27 21:06:09 2006 UTC

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

Diff Legend

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