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

Diff Legend

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