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.173 by root, Tue Apr 25 10:30:48 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
241sub children { 356sub children {
242}
243
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252} 357}
253 358
254sub set_max_size { 359sub set_max_size {
255 my ($self, $w, $h) = @_; 360 my ($self, $w, $h) = @_;
256 361
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 362 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 363 delete $self->{max_h}; $self->{max_h} = $h if $h;
259} 364}
260 365
261# return top left coordinates 366sub set_tooltip {
262sub _topleft {
263 my ($self, $x, $y) = @_; 367 my ($self, $tooltip) = @_;
264 368
265 $self->{parent} 369 $tooltip =~ s/^\s+//;
266 or Carp::confess "no parent widget in _topleft\n";#d# 370 $tooltip =~ s/\s+$//;
267 371
268 $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 }
269} 380}
270 381
271# translate global coordinates to local coordinate system 382# translate global coordinates to local coordinate system
272sub coord2local { 383sub coord2local {
273 my ($self, $x, $y) = @_; 384 my ($self, $x, $y) = @_;
274 385
275 my ($X, $Y) = $self->_topleft; 386 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 387}
278 388
279# translate local coordinates to global coordinate system 389# translate local coordinates to global coordinate system
280sub coord2global { 390sub coord2global {
281 my ($self, $x, $y) = @_; 391 my ($self, $x, $y) = @_;
282 392
283 my ($X, $Y) = $self->_topleft; 393 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 394}
286 395
287sub focus_in { 396sub focus_in {
288 my ($self) = @_; 397 my ($self) = @_;
289 398
290 return if $FOCUS == $self; 399 return if $FOCUS == $self;
291 return unless $self->{can_focus}; 400 return unless $self->{can_focus};
292 401
293 my $focus = $FOCUS; $FOCUS = $self; 402 my $focus = $FOCUS; $FOCUS = $self;
294 403
295 $self->emit (focus_in => $focus); 404 $self->_emit (focus_in => $focus);
296 405
297 $focus->update if $focus; 406 $focus->update if $focus;
298 $FOCUS->update; 407 $FOCUS->update;
299} 408}
300 409
… …
303 412
304 return unless $FOCUS == $self; 413 return unless $FOCUS == $self;
305 414
306 my $focus = $FOCUS; undef $FOCUS; 415 my $focus = $FOCUS; undef $FOCUS;
307 416
308 $self->emit (focus_out => $focus); 417 $self->_emit (focus_out => $focus);
309 418
310 $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;
311} 423}
312 424
313sub mouse_motion { } 425sub mouse_motion { }
314sub button_up { } 426sub button_up { }
315sub key_down { } 427sub key_down { }
316sub key_up { } 428sub key_up { }
317 429
318sub button_down { 430sub button_down {
319 my ($self, $ev, $x, $y) = @_; 431 my ($self, $ev, $x, $y) = @_;
320 432
321 $self->focus_in; 433 $self->focus_in;
… …
355 if ($ENV{PCLIENT_DEBUG}) { 467 if ($ENV{PCLIENT_DEBUG}) {
356 glPushMatrix; 468 glPushMatrix;
357 glColor 1, 1, 0, 1; 469 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP; 471 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0; 472 glVertex 0 , 0;
361 glVertex $self->{w}, 0; 473 glVertex $self->{w} - 1, 0;
362 glVertex $self->{w}, $self->{h}; 474 glVertex $self->{w} - 1, $self->{h} - 1;
363 glVertex 0 , $self->{h}; 475 glVertex 0 , $self->{h} - 1;
364 glEnd; 476 glEnd;
365 glPopMatrix; 477 glPopMatrix;
366 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;
367 } 479 }
368} 480}
369 481
370sub _draw { 482sub _draw {
371 my ($self) = @_; 483 my ($self) = @_;
… …
387 499
388sub set_parent { 500sub set_parent {
389 my ($self, $parent) = @_; 501 my ($self, $parent) = @_;
390 502
391 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;
392} 518}
393 519
394sub check_size { 520sub check_size {
395 my ($self) = @_; 521 my ($self, $forced) = @_;
396 522
397 $self->{parent} 523 $self->{force_alloc} = 1 if $forced;
398 or return 1; 524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418} 525}
419 526
420sub update { 527sub update {
421 my ($self) = @_; 528 my ($self) = @_;
422 529
… …
428 my ($self, $signal, $cb) = @_; 535 my ($self, $signal, $cb) = @_;
429 536
430 push @{ $self->{signal_cb}{$signal} }, $cb; 537 push @{ $self->{signal_cb}{$signal} }, $cb;
431} 538}
432 539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
433sub emit { 546sub emit {
434 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
435 548
436 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) = @_;
437} 555}
438 556
439sub DESTROY { 557sub DESTROY {
440 my ($self) = @_; 558 my ($self) = @_;
441 559
560 delete $WIDGET{$self+0};
442 #$self->deactivate; 561 #$self->deactivate;
443} 562}
444 563
445############################################################################# 564#############################################################################
446 565
… …
455 my $class = shift; 574 my $class = shift;
456 575
457 # range [value, low, high, page] 576 # range [value, low, high, page]
458 577
459 $class->SUPER::new ( 578 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 579 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 580 #active_bg => [1, 1, 1, 0.5],
462 @_ 581 @_
463 ) 582 )
464} 583}
465 584
466sub _draw { 585sub _draw {
467 my ($self) = @_; 586 my ($self) = @_;
468 587
588 my $color = $FOCUS == $self && $self->{active_bg}
589 ? $self->{active_bg}
590 : $self->{bg};
591
592 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 593 my ($w, $h) = @$self{qw(w h)};
470 594
471 glEnable GL_BLEND; 595 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 597 glColor @$color;
474 598
475 glBegin GL_QUADS; 599 glBegin GL_QUADS;
476 glVertex 0 , 0; 600 glVertex 0 , 0;
477 glVertex 0 , $h; 601 glVertex 0 , $h;
478 glVertex $w, $h; 602 glVertex $w, $h;
479 glVertex $w, 0; 603 glVertex $w, 0;
480 glEnd; 604 glEnd;
481 605
482 glDisable GL_BLEND; 606 glDisable GL_BLEND;
607 }
483} 608}
484 609
485############################################################################# 610#############################################################################
486 611
487package CFClient::UI::Empty; 612package CFClient::UI::Empty;
… …
519 644
520 $self 645 $self
521} 646}
522 647
523sub add { 648sub add {
524 my ($self, $child) = @_; 649 my ($self, @widgets) = @_;
525 650
526 $child->set_parent ($self); 651 $_->set_parent ($self)
652 for @widgets;
527 653
528 use sort 'stable'; 654 use sort 'stable';
529 655
530 $self->{children} = [ 656 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 657 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 658 @{$self->{children}}, @widgets
533 ]; 659 ];
534 660
535 $child->check_size; 661 $self->check_size (1);
662 $self->update;
536} 663}
537 664
538sub children { 665sub children {
539 @{ $_[0]{children} } 666 @{ $_[0]{children} }
540} 667}
… …
545 delete $child->{parent}; 672 delete $child->{parent};
546 $child->hide; 673 $child->hide;
547 674
548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
549 676
550 $self->check_size; 677 $self->check_size (1);
551 $self->update; 678 $self->update;
552} 679}
553 680
554sub clear { 681sub clear {
555 my ($self) = @_; 682 my ($self) = @_;
… …
559 686
560 for (@$children) { 687 for (@$children) {
561 delete $_->{parent}; 688 delete $_->{parent};
562 $_->hide; 689 $_->hide;
563 } 690 }
691
692 $self->check_size;
693 $self->update;
564} 694}
565 695
566sub find_widget { 696sub find_widget {
567 my ($self, $x, $y) = @_; 697 my ($self, $x, $y) = @_;
568 698
… …
643} 773}
644 774
645sub update { 775sub update {
646 my ($self) = @_; 776 my ($self) = @_;
647 777
648 # we want to do this delayed... 778 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 779 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 780}
662 781
663sub size_allocate { 782sub size_allocate {
664 my ($self, $w, $h) = @_; 783 my ($self, $w, $h) = @_;
665 784
666 $self->child->configure (0, 0, $w, $h); 785 $self->SUPER::size_allocate ($w, $h);
786 $self->update;
787}
667 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
668 $self->render_chld; 800 $self->_render;
801 };
669} 802}
670 803
671sub _draw { 804sub _draw {
672 my ($self) = @_; 805 my ($self) = @_;
673 806
674 my ($w, $h) = ($self->w, $self->h); 807 my ($w, $h) = ($self->w, $self->h);
675 808
676 my $tex = $self->{texture} 809 my $tex = $self->{texture}
677 or return; 810 or return;
678 811
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 812 glEnable GL_TEXTURE_2D;
682 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;
683 815
684 $tex->draw_quad (0, 0, $w, $h); 816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 817
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 818 glDisable GL_TEXTURE_2D;
688} 819}
689 820
690############################################################################# 821#############################################################################
691 822
692package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
693 824
694our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
695
696sub new { die }
697
698sub size_request {
699 my ($self) = @_;
700
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
703
704 @$self{qw(child_w child_h)}
705}
706
707sub _draw {
708 my ($self) = @_;
709
710 $self->{children}[1]->draw;
711}
712
713
714#############################################################################
715
716package CFClient::UI::Frame;
717
718our @ISA = CFClient::UI::Bin::;
719
720use CFClient::OpenGL;
721 826
722sub new { 827sub new {
723 my $class = shift; 828 my $class = shift;
724 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
725 my $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
726 bg => [1, 1, 1, 1], 920 vp => (new CFClient::UI::ViewPort expand => 1),
727 border_bg => [1, 1, 1, 1], 921 slider => $slider,
728 border => 0.8,
729 @_ 922 @_,
730 ); 923 );
731 924
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider});
928
732 $self 929 $self
733} 930}
734 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
735sub _draw { 971sub _draw {
736 my ($self) = @_; 972 my ($self) = @_;
737 973
738 my ($w, $h) = ($self->{w}, $self->{h}); 974 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)};
739 976
740 glEnable GL_BLEND; 977 glEnable GL_BLEND;
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D; 979 glColor @{ $self->{bg} };
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 980
745# glBegin GL_QUADS; 981 glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0; 982 glVertex 0 , 0;
748# glVertex 0 , $h; 983 glVertex 0 , $h;
749# glVertex $w, $h; 984 glVertex $w, $h;
750# glVertex $w, 0; 985 glVertex $w, 0;
751# glEnd; 986 glEnd;
752 987
753
754 $self->child->draw;
755 glDisable GL_BLEND; 988 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D; 989 }
990
991 $self->SUPER::_draw;
757} 992}
758 993
759############################################################################# 994#############################################################################
760 995
761package CFClient::UI::FancyFrame; 996package CFClient::UI::FancyFrame;
… …
772 my $class = shift; 1007 my $class = shift;
773 1008
774 # TODO: user_x, user_y, overwrite moveto? 1009 # TODO: user_x, user_y, overwrite moveto?
775 1010
776 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
779 border => 0.8, 1014 border => 0.6,
1015 is_toplevel => 1,
780 can_events => 1, 1016 can_events => 1,
781 @_ 1017 @_
782 ); 1018 );
783 1019
784 $self->{title} &&= new CFClient::UI::Label 1020 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 1021 align => 0,
786 valign => 1, 1022 valign => 1,
787 text => $self->{title}, 1023 text => $self->{title},
788 fontsize => 1; 1024 fontsize => $self->{border};
789 1025
790 $self 1026 $self
791} 1027}
792 1028
793sub border { 1029sub border {
… …
809 my ($self, $w, $h) = @_; 1045 my ($self, $w, $h) = @_;
810 1046
811 $h -= List::Util::max 0, $self->border * 2; 1047 $h -= List::Util::max 0, $self->border * 2;
812 $w -= List::Util::max 0, $self->border * 2; 1048 $w -= List::Util::max 0, $self->border * 2;
813 1049
814 $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)
815 if $self->{title}; 1051 if $self->{title};
816 1052
817 $self->child->configure ($self->border, $self->border, $w, $h); 1053 $self->child->configure ($self->border, $self->border, $w, $h);
818} 1054}
819 1055
820sub button_down { 1056sub button_down {
821 my ($self, $ev, $x, $y) = @_; 1057 my ($self, $ev, $x, $y) = @_;
822 1058
1059 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 1060 my $border = $self->border;
824 1061
825 if ($x < $self->{w} && $x >= $self->{w} - $border 1062 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 1063 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 1064
1065 if ($lr & $td) {
1066 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1067 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 1068 my ($bw, $bh) = ($self->{w}, $self->{h});
830 1069
1070 my $mx = $x < $border;
1071 my $my = $y < $border;
1072
831 $self->{motion} = sub { 1073 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
833 1075
834 ($x, $y) = ($ev->{x}, $ev->{y}); 1076 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy;
835 1078
836 $self->{user_w} = $bw + $x - $ox; 1079 $self->{user_x} = $wx + $dx * $mx;
837 $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});
838 $self->check_size; 1084 $self->check_size;
839 }; 1085 };
840 1086
841 } elsif ($x >= 0 && $x < $self->{w} 1087 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 1089 my ($bx, $by) = ($self->{x}, $self->{y});
846 1090
847 $self->{motion} = sub { 1091 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
849 1093
850 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
851 1095
852 $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});
853 $self->update; 1099 $self->update;
854 }; 1100 };
855 } 1101 }
856} 1102}
857 1103
… …
871 my ($self) = @_; 1117 my ($self) = @_;
872 1118
873 my ($w, $h ) = ($self->{w}, $self->{h}); 1119 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
875 1121
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 1122 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 1124
881 my $border = $self->border; 1125 my $border = $self->border;
882 1126
883 glColor @{ $self->{border_bg} }; 1127 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
888 1132
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
889 my $bg = $tex[0]; 1134 my $bg = $tex[0];
890 1135
891 # TODO: repeat texture not scale 1136 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 1137 my $rep_x = $cw / $bg->{w};
893 my $rep_y = $ch / $bg->{h}; 1138 my $rep_y = $ch / $bg->{h};
894 1139
895 glColor @{ $self->{bg} }; 1140 glColor @{ $self->{bg} };
896 1141
897 $bg->{s} = $rep_x; 1142 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y; 1143 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1; 1144 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 }
901 1147
902 glDisable GL_TEXTURE_2D; 1148 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 1149
905 $self->{title}->draw if $self->{title}; 1150 $self->{title}->draw if $self->{title};
1151
906 $self->child->draw; 1152 $self->child->draw;
907} 1153}
908 1154
909############################################################################# 1155#############################################################################
910 1156
… …
919sub new { 1165sub new {
920 my $class = shift; 1166 my $class = shift;
921 1167
922 $class->SUPER::new ( 1168 $class->SUPER::new (
923 col_expand => [], 1169 col_expand => [],
924 @_ 1170 @_,
925 ) 1171 )
1172}
1173
1174sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} }
926} 1176}
927 1177
928sub add { 1178sub add {
929 my ($self, $x, $y, $child) = @_; 1179 my ($self, $x, $y, $child) = @_;
930 1180
931 $child->set_parent ($self); 1181 $child->set_parent ($self);
932 $self->{children}[$y][$x] = $child; 1182 $self->{children}[$y][$x] = $child;
933 1183
934 $child->check_size; 1184 $self->check_size (1);
935} 1185}
936 1186
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
941# 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?
942sub clear { 1188sub clear {
943 my ($self) = @_; 1189 my ($self) = @_;
944 1190
945 my @children = $self->children; 1191 my @children = $self->children;
946 delete $self->{children}; 1192 delete $self->{children};
… …
948 for (@children) { 1194 for (@children) {
949 delete $_->{parent}; 1195 delete $_->{parent};
950 $_->hide; 1196 $_->hide;
951 } 1197 }
952 1198
1199 $self->check_size (1);
953 $self->update; 1200 $self->update;
954} 1201}
955 1202
956sub get_wh { 1203sub get_wh {
957 my ($self) = @_; 1204 my ($self) = @_;
… …
989sub size_allocate { 1236sub size_allocate {
990 my ($self, $w, $h) = @_; 1237 my ($self, $w, $h) = @_;
991 1238
992 my ($ws, $hs) = $self->get_wh; 1239 my ($ws, $hs) = $self->get_wh;
993 1240
994 my $req_w = sum @$ws; 1241 my $req_w = (sum @$ws) || 1;
995 my $req_h = sum @$hs; 1242 my $req_h = (sum @$hs) || 1;
996 1243
997 # TODO: nicer code && do row_expand 1244 # TODO: nicer code && do row_expand
998 my @col_expand = @{$self->{col_expand}}; 1245 my @col_expand = @{$self->{col_expand}};
999 @col_expand = (1) x @$ws unless @col_expand; 1246 @col_expand = (1) x @$ws unless @col_expand;
1000 my $col_expand = (sum @col_expand) || 1; 1247 my $col_expand = (sum @col_expand) || 1;
… …
1134} 1381}
1135 1382
1136sub size_allocate { 1383sub size_allocate {
1137 my ($self, $w, $h) = @_; 1384 my ($self, $w, $h) = @_;
1138 1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1139 my $children = $self->{children}; 1388 my $children = $self->{children};
1140 1389
1141 my @h = map $_->{req_h}, @$children; 1390 my @h = map $_->{req_h}, @$children;
1142 1391
1143 my $req_h = List::Util::sum @h; 1392 my $req_h = List::Util::sum @h;
… …
1172 1421
1173############################################################################# 1422#############################################################################
1174 1423
1175package CFClient::UI::Label; 1424package CFClient::UI::Label;
1176 1425
1177our @ISA = CFClient::UI::Base::; 1426our @ISA = CFClient::UI::DrawBG::;
1178 1427
1179use CFClient::OpenGL; 1428use CFClient::OpenGL;
1180 1429
1181sub new { 1430sub new {
1182 my ($class, %arg) = @_; 1431 my ($class, %arg) = @_;
1183 1432
1184 my $self = $class->SUPER::new ( 1433 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1434 fg => [1, 1, 1],
1435 #bg => none
1436 #active_bg => none
1186 #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),
1187 fontsize => 1, 1443 fontsize => 1,
1188 text => "",
1189 align => -1, 1444 align => -1,
1190 valign => -1, 1445 valign => -1,
1191 padding => 2, 1446 padding => 2,
1192 layout => new CFClient::Layout,
1193 can_events => 0, 1447 can_events => 0,
1194 %arg 1448 %arg
1195 ); 1449 );
1196 1450
1197 if (exists $self->{template}) { 1451 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1452 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1453 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1454 $self->{template} = $layout;
1201 } 1455 }
1202 1456
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1457 if (exists $self->{markup}) {
1204 $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 }
1205 1462
1206 $self 1463 $self
1207} 1464}
1208 1465
1209sub escape { 1466sub escape($) {
1210 local $_ = $_[1]; 1467 local $_ = $_[0];
1211 1468
1212 s/&/&amp;/g; 1469 s/&/&amp;/g;
1213 s/>/&gt;/g; 1470 s/>/&gt;/g;
1214 s/</&lt;/g; 1471 s/</&lt;/g;
1215 1472
1216 $_[1] 1473 $_
1217} 1474}
1218 1475
1219sub update { 1476sub update {
1220 my ($self) = @_; 1477 my ($self) = @_;
1221 1478
1222 delete $self->{texture}; 1479 delete $self->{texture};
1223 $self->SUPER::update; 1480 $self->SUPER::update;
1224} 1481}
1225 1482
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1483sub set_text {
1233 my ($self, $text) = @_; 1484 my ($self, $text) = @_;
1234 1485
1235 return if $self->{text} eq "T$text"; 1486 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1487 $self->{text} = "T$text";
1237 1488
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1490 $self->{layout}->set_text ($text);
1239 1491
1240 delete $self->{texture};
1241 $self->update; 1492 $self->update;
1242 $self->check_size; 1493 $self->check_size;
1243} 1494}
1244 1495
1245sub set_markup { 1496sub set_markup {
1246 my ($self, $markup) = @_; 1497 my ($self, $markup) = @_;
1247 1498
1248 return if $self->{text} eq "M$markup"; 1499 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1500 $self->{text} = "M$markup";
1250 1501
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503
1504 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1505 $self->{layout}->set_markup ($markup);
1252 1506
1253 delete $self->{texture};
1254 $self->update; 1507 $self->update;
1255 $self->check_size; 1508 $self->check_size;
1256} 1509}
1257 1510
1258sub size_request { 1511sub size_request {
1259 my ($self) = @_; 1512 my ($self) = @_;
1260 1513
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1514 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $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});
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1518 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264 1519
1265 my ($w, $h) = $self->{layout}->size; 1520 my ($w, $h) = $self->{layout}->size;
1266 1521
1267 if (exists $self->{template}) { 1522 if (exists $self->{template}) {
… …
1289sub set_fontsize { 1544sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1545 my ($self, $fontsize) = @_;
1291 1546
1292 $self->{fontsize} = $fontsize; 1547 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1548 delete $self->{texture};
1549
1550 $self->update;
1294 $self->check_size; 1551 $self->check_size;
1295 $self->update;
1296} 1552}
1297 1553
1298sub _draw { 1554sub _draw {
1299 my ($self) = @_; 1555 my ($self) = @_;
1300 1556
1557 $self->SUPER::_draw; # draw background, if applicable
1558
1301 my $tex = $self->{texture} ||= do { 1559 my $tex = $self->{texture} ||= do {
1560 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1561 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $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});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566
1305 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
1306 }; 1578 };
1307 1579
1308 glEnable GL_BLEND;
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D; 1580 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1582
1583 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1584 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $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 }
1328 1589
1329 glDisable GL_TEXTURE_2D; 1590 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1591}
1332 1592
1333############################################################################# 1593#############################################################################
1334 1594
1335package CFClient::UI::EntryBase; 1595package CFClient::UI::EntryBase;
… …
1348 active_fg => [0, 0, 0], 1608 active_fg => [0, 0, 0],
1349 can_hover => 1, 1609 can_hover => 1,
1350 can_focus => 1, 1610 can_focus => 1,
1351 valign => 0, 1611 valign => 0,
1352 can_events => 1, 1612 can_events => 1,
1613 #text => ...
1353 @_ 1614 @_
1354 ) 1615 )
1355} 1616}
1356 1617
1357sub _set_text { 1618sub _set_text {
… …
1367 $self->{text} = $text; 1628 $self->{text} = $text;
1368 1629
1369 $text =~ s/./*/g if $self->{hidden}; 1630 $text =~ s/./*/g if $self->{hidden};
1370 $self->{layout}->set_text ("$text "); 1631 $self->{layout}->set_text ("$text ");
1371 1632
1372 $self->emit (changed => $self->{text}); 1633 $self->_emit (changed => $self->{text});
1373}
1374
1375sub get_text {
1376 $_[0]{text}
1377}
1378
1379sub size_request {
1380 my ($self) = @_;
1381
1382 my ($w, $h) = $self->SUPER::size_request;
1383
1384 ($w + 1, $h) # add 1 for cursor
1385}
1386
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391} 1634}
1392 1635
1393sub set_text { 1636sub set_text {
1394 my ($self, $text) = @_; 1637 my ($self, $text) = @_;
1395 1638
1396 $self->{cursor} = length $text; 1639 $self->{cursor} = length $text;
1397 $self->_set_text ($text); 1640 $self->_set_text ($text);
1398 $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
1399} 1655}
1400 1656
1401sub key_down { 1657sub key_down {
1402 my ($self, $ev) = @_; 1658 my ($self, $ev) = @_;
1403 1659
… …
1405 my $sym = $ev->{sym}; 1661 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 1662 my $uni = $ev->{unicode};
1407 1663
1408 my $text = $self->get_text; 1664 my $text = $self->get_text;
1409 1665
1410 if ($sym == 8) { 1666 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1667 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 1668 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 1669 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 1670 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 1671 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 1672 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1673 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 1674 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0; 1675 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) { 1676 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text; 1677 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 1678 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 1679 $self->_emit ('escape');
1424 } elsif ($uni) { 1680 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 1681 substr $text, $self->{cursor}++, 0, chr $uni;
1426 } 1682 }
1427 1683
1428 $self->_set_text ($text); 1684 $self->_set_text ($text);
1429 $self->update; 1685 $self->update;
1686 $self->check_size;
1430} 1687}
1431 1688
1432sub focus_in { 1689sub focus_in {
1433 my ($self) = @_; 1690 my ($self) = @_;
1434 1691
… …
1514 if ($sym == 13) { 1771 if ($sym == 13) {
1515 unshift @{$self->{history}}, 1772 unshift @{$self->{history}},
1516 my $txt = $self->get_text; 1773 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1; 1774 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = ''; 1775 $self->{history_saveback} = '';
1519 $self->emit (activate => $txt); 1776 $self->_emit (activate => $txt);
1520 $self->update; 1777 $self->update;
1521 1778
1522 } elsif ($sym == CFClient::SDLK_UP) { 1779 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) { 1780 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text; 1781 $self->{history_saveback} = $self->get_text;
… …
1563 my $class = shift; 1820 my $class = shift;
1564 1821
1565 $class->SUPER::new ( 1822 $class->SUPER::new (
1566 padding => 4, 1823 padding => 4,
1567 fg => [1, 1, 1], 1824 fg => [1, 1, 1],
1568 bg => [1, 1, 1, 0.2],
1569 active_fg => [0, 0, 1], 1825 active_fg => [0, 0, 1],
1570 can_hover => 1, 1826 can_hover => 1,
1571 align => 0, 1827 align => 0,
1572 valign => 0, 1828 valign => 0,
1573 can_events => 1, 1829 can_events => 1,
1574 @_ 1830 @_
1575 ) 1831 )
1576} 1832}
1577 1833
1834sub activate { }
1835
1578sub button_up { 1836sub button_up {
1579 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1580 1838
1839 $self->emit ("activate")
1581 if ($x >= 0 && $x < $self->{w} 1840 if $x >= 0 && $x < $self->{w}
1582 && $y >= 0 && $y < $self->{h}) { 1841 && $y >= 0 && $y < $self->{h};
1583 $self->emit ("activate");
1584 }
1585} 1842}
1586 1843
1587sub _draw { 1844sub _draw {
1588 my ($self) = @_; 1845 my ($self) = @_;
1589 1846
… …
1591 1848
1592 if ($GRAB == $self) { 1849 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg}; 1850 $self->{fg} = $self->{active_fg};
1594 } 1851 }
1595 1852
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 1853 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 1855 glColor 0, 0, 0, 1;
1601 1856
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1857 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 1858
1604 glDisable GL_TEXTURE_2D; 1859 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 1860
1607 $self->SUPER::_draw; 1861 $self->SUPER::_draw;
1608} 1862}
1609 1863
1610############################################################################# 1864#############################################################################
… …
1624 1878
1625 $class->SUPER::new ( 1879 $class->SUPER::new (
1626 padding => 2, 1880 padding => 2,
1627 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1628 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],
1629 state => 0, 1885 state => 0,
1630 can_hover => 1, 1886 can_hover => 1,
1631 @_ 1887 @_
1632 ) 1888 )
1633} 1889}
… …
1642 my ($self, $ev, $x, $y) = @_; 1898 my ($self, $ev, $x, $y) = @_;
1643 1899
1644 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1645 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1646 $self->{state} = !$self->{state}; 1902 $self->{state} = !$self->{state};
1647 $self->emit (changed => $self->{state}); 1903 $self->_emit (changed => $self->{state});
1648 } 1904 }
1649} 1905}
1650 1906
1651sub _draw { 1907sub _draw {
1652 my ($self) = @_; 1908 my ($self) = @_;
… …
1657 1913
1658 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;
1659 1915
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 1917
1662 glEnable GL_BLEND; 1918 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919
1663 glEnable GL_TEXTURE_2D; 1920 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 1921 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 1922 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 1923}
1673 1924
1674############################################################################# 1925#############################################################################
1675 1926
1676package CFClient::UI::Image; 1927package CFClient::UI::Image;
… …
1719 glTranslate 0, -$self->{w}, 0; 1970 glTranslate 0, -$self->{w}, 0;
1720 1971
1721 ($w, $h) = ($h, $w); 1972 ($w, $h) = ($h, $w);
1722 } 1973 }
1723 1974
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 1977
1729 $tex->draw_quad (0, 0, $w, $h); 1978 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 1979
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 1980 glDisable GL_TEXTURE_2D;
1733} 1981}
1734 1982
1735############################################################################# 1983#############################################################################
1736 1984
… …
1925 qw(s1_slider.png s1_slider_bg.png); 2173 qw(s1_slider.png s1_slider_bg.png);
1926 2174
1927sub new { 2175sub new {
1928 my $class = shift; 2176 my $class = shift;
1929 2177
1930 # range [value, low, high, page] 2178 # range [value, low, high, page, unit]
1931 2179
1932 # TODO: 0-width page 2180 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 2181 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 2182 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2183 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2184 fg => [1, 1, 1],
1937 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],
1938 range => [0, 0, 100, 10], 2188 range => [0, 0, 100, 10, 0],
1939 req_w => 20, 2189 req_w => $::WIDTH / 80,
1940 req_h => 20, 2190 req_h => $::WIDTH / 80,
1941 vertical => 0, 2191 vertical => 0,
1942 can_hover => 1, 2192 can_hover => 1,
1943 inner_pad => 5, 2193 inner_pad => 0.02,
1944 @_ 2194 @_
1945 ); 2195 );
1946 2196
2197 $self->set_value ($self->{range}[0]);
2198 $self->update;
2199
1947 $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 }
1948} 2233}
1949 2234
1950sub size_request { 2235sub size_request {
1951 my ($self) = @_; 2236 my ($self) = @_;
1952 2237
… …
1958 2243
1959sub button_down { 2244sub button_down {
1960 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
1961 2246
1962 $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
1963 $self->mouse_motion ($ev, $x, $y); 2251 $self->mouse_motion ($ev, $x, $y);
1964} 2252}
1965 2253
1966sub mouse_motion { 2254sub mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
1968 2256
1969 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
1970 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2274 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100;
1971 2276
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2277 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1973 2278
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2279 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2280 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1976 2281
1977 $x -= $inner_pad_px; # substract the padding 2282 $value = ($value - $lo) / $range;
1978 $x = $x * ($hi - $lo) / $inner_w + $lo; 2283 $value = $value * $self->{scale} + $self->{offset};
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 2284
1983 $self->emit (changed => $x); 2285 $self->{knob_x} = $value - $knob_w * 0.5;
1984 $self->update; 2286 $self->{knob_w} = $knob_w;
1985 } 2287 });
1986}
1987 2288
1988# the inner_* stuff is for generating a padding for the slider handle, 2289 $self->SUPER::update;
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1994} 2290}
1995 2291
1996sub _draw { 2292sub _draw {
1997 my ($self) = @_; 2293 my ($self) = @_;
1998 2294
1999 $self->SUPER::_draw (); 2295 $self->SUPER::_draw ();
2000 2296
2001 my ($w, $h) = @$self{qw(w h)}; 2297 glScale $self->{w}, $self->{h};
2002 2298
2003 if ($self->{vertical}) { 2299 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 2300 # draw a vertical slider like a rotated horizontal slider
2005 2301
2302 glTranslate 1, 0, 0;
2006 glRotate 90, 0, 0, 1; 2303 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 2304 }
2011 2305
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2306 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2307 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 2308
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2309 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2311
2038 # draw background 2312 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2313 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 2314
2041 # draw handle 2315 # draw handle
2042 $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);
2043 2317
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2318 glDisable GL_TEXTURE_2D;
2046} 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 (@_) }
2047 2361
2048############################################################################# 2362#############################################################################
2049 2363
2050package CFClient::UI::TextView; 2364package CFClient::UI::TextView;
2051 2365
… …
2060 fontsize => 1, 2374 fontsize => 1,
2061 can_events => 0, 2375 can_events => 0,
2062 #font => default_font 2376 #font => default_font
2063 @_, 2377 @_,
2064 2378
2065 layout => (new CFClient::Layout), 2379 layout => (new CFClient::Layout 1),
2066 par => [], 2380 par => [],
2067 height => 0, 2381 height => 0,
2068 children => [ 2382 children => [
2069 (new CFClient::UI::Empty expand => 1), 2383 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2384 (new CFClient::UI::Slider vertical => 1),
2071 ], 2385 ],
2072 ); 2386 );
2073 2387
2074 $self->{children}[1]->connect (changed => sub { 2388 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2389
2078 $self 2390 $self
2079} 2391}
2080 2392
2081sub set_fontsize { 2393sub set_fontsize {
2082 my ($self, $fontsize) = @_; 2394 my ($self, $fontsize) = @_;
2083 2395
2084 $self->{fontsize} = $fontsize; 2396 $self->{fontsize} = $fontsize;
2085 $self->reflow; 2397 $self->reflow;
2086}
2087
2088sub text_height {
2089 my ($self, $text) = @_;
2090
2091 my $layout = $self->{layout};
2092
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w});
2095 $layout->set_text ($text);
2096
2097 ($layout->size)[1]
2098}
2099
2100sub reflow {
2101 my ($self) = @_;
2102
2103 $self->{need_reflow}++;
2104 $self->update;
2105} 2398}
2106 2399
2107sub size_allocate { 2400sub size_allocate {
2108 my ($self, $w, $h) = @_; 2401 my ($self, $w, $h) = @_;
2109 2402
… …
2114 $self->{layout}->set_width ($self->{children}[0]{w}); 2407 $self->{layout}->set_width ($self->{children}[0]{w});
2115 2408
2116 $self->reflow; 2409 $self->reflow;
2117} 2410}
2118 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
2119sub add_paragraph { 2446sub add_paragraph {
2120 my ($self, $color, $text) = @_; 2447 my ($self, $color, $text, $indent) = @_;
2121 2448
2122 #TODO: intelligently "reformat" paragraph 2449 for my $line (split /\n/, $text) {
2123 2450 my ($w, $h) = $self->text_size ($line);
2124 my $height = $self->text_height ($text);
2125
2126 $self->{height} += $height; 2451 $self->{height} += $h;
2452 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2453 }
2127 2454
2128 push @{$self->{par}}, [$height, $color, $text];
2129
2130 $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]);
2131 $self->{children}[1]->update;
2132} 2456}
2133 2457
2134sub update { 2458sub update {
2135 my ($self) = @_; 2459 my ($self) = @_;
2136 2460
… …
2138 2462
2139 return unless $self->{h} > 0; 2463 return unless $self->{h} > 0;
2140 2464
2141 delete $self->{texture}; 2465 delete $self->{texture};
2142 2466
2143 $ROOT->on_refresh ($self, sub { 2467 $ROOT->on_post_alloc ($self, sub {
2468 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2469
2144 if (delete $self->{need_reflow}) { 2470 if (delete $self->{need_reflow}) {
2145 my $height = 0; 2471 my $height = 0;
2146 2472
2147 $height += $_->[0] = $self->text_height ($_->[2]) 2473 my $layout = $self->{layout};
2474
2475 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2476
2148 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 }
2149 2488
2150 $self->{height} = $height; 2489 $self->{height} = $height;
2151 2490
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2491 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2153 2492
2154 delete $self->{texture}; 2493 delete $self->{texture};
2155 } 2494 }
2156 2495
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2158 glClearColor 0, 0, 0, 1; 2497 glClearColor 0.5, 0.5, 0.5, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2498 glClear GL_COLOR_BUFFER_BIT;
2160 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
2161 glEnable GL_BLEND; 2511 glEnable GL_BLEND;
2512 #TODO# not correct in windows where rgba is forced off
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2513 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165
2166 my $top = int $self->{children}[1]{range}[0];
2167
2168 my $y0 = $top;
2169 my $y1 = $top + $self->{h};
2170
2171 my $y = 0;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176 2514
2177 for my $par (@{$self->{par}}) { 2515 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0]; 2516 my $h = $par->[1];
2179 2517
2180 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]);
2181 $layout->set_text ($par->[2]); 2521 $layout->set_markup ($par->[4]);
2182 2522
2183 glColor @{ $par->[1] }; 2523 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2184 my ($W, $H) = $layout->size; 2524
2185 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;
2186 } 2527 }
2187 2528
2188 $y += $h; 2529 $y += $h;
2189 } 2530 }
2190 2531
2191 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND; 2532 glDisable GL_BLEND;
2193 }; 2533 };
2194 }); 2534 });
2195} 2535}
2196 2536
2197sub _draw { 2537sub _draw {
2198 my ($self) = @_; 2538 my ($self) = @_;
2199 2539
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 2540 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2542 glColor 1, 1, 1, 1;
2204 $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});
2205 glDisable GL_TEXTURE_2D; 2544 glDisable GL_TEXTURE_2D;
2206 }
2207 2545
2208 $self->{children}[1]->draw; 2546 $self->{children}[1]->draw;
2209 2547
2210} 2548}
2211 2549
… …
2259 2597
2260sub new { 2598sub new {
2261 my $class = shift; 2599 my $class = shift;
2262 2600
2263 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2264 state => 0, 2602 state => 0,
2265 connect_activate => \&toggle_flopper, 2603 on_activate => \&toggle_flopper,
2266 @_ 2604 @_
2267 ); 2605 );
2268 2606
2269 if ($self->{state}) {
2270 $self->{state} = 0;
2271 $self->toggle_flopper;
2272 }
2273
2274 $self 2607 $self
2275} 2608}
2276 2609
2277sub toggle_flopper { 2610sub toggle_flopper {
2278 my ($self) = @_; 2611 my ($self) = @_;
2279 2612
2280 # TODO: use animation 2613 $self->{other}->toggle_visibility;
2281 if ($self->{state} = !$self->{state}) {
2282 $CFClient::UI::ROOT->add ($self->{other});
2283 $self->{other}->move ($self->coord2global (0, $self->{h}));
2284 $self->emit ("open");
2285 } else {
2286 $CFClient::UI::ROOT->remove ($self->{other});
2287 $self->emit ("close");
2288 }
2289
2290 $self->emit (changed => $self->{state});
2291} 2614}
2292 2615
2293############################################################################# 2616#############################################################################
2294 2617
2295package CFClient::UI::Tooltip; 2618package CFClient::UI::Tooltip;
… …
2305 @_, 2628 @_,
2306 can_events => 0, 2629 can_events => 0,
2307 ) 2630 )
2308} 2631}
2309 2632
2310sub set_markup { 2633sub set_tooltip_from {
2311 my ($self, $text) = @_; 2634 my ($self, $widget) = @_;
2312 2635
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2636 $self->add (new CFClient::UI::Label
2314 $self->{label}->set_markup ($text); 2637 markup => $widget->{tooltip},
2315 $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 );
2316} 2644}
2317 2645
2318sub size_request { 2646sub size_request {
2319 my ($self) = @_; 2647 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322 2648
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2649 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 2650
2325 ($w + 4, $h + 4) 2651 ($w + 4, $h + 4)
2326} 2652}
… …
2332} 2658}
2333 2659
2334sub _draw { 2660sub _draw {
2335 my ($self) = @_; 2661 my ($self) = @_;
2336 2662
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 2663 glTranslate 0.375, 0.375;
2339 2664
2340 my ($w, $h) = @$self{qw(w h)}; 2665 my ($w, $h) = @$self{qw(w h)};
2341 2666
2342 glColor 1, 0.8, 0.4; 2667 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 2678 glVertex 0 , $h;
2354 glVertex $w, $h; 2679 glVertex $w, $h;
2355 glVertex $w, 0; 2680 glVertex $w, 0;
2356 glEnd; 2681 glEnd;
2357 2682
2358 glPopMatrix; 2683 glTranslate 2 - 0.375, 2 - 0.375;
2359
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 2684 $self->SUPER::_draw;
2362} 2685}
2363 2686
2364############################################################################# 2687#############################################################################
2365 2688
… …
2370use CFClient::OpenGL; 2693use CFClient::OpenGL;
2371 2694
2372sub new { 2695sub new {
2373 my $class = shift; 2696 my $class = shift;
2374 2697
2375 $class->SUPER::new ( 2698 my $self = $class->SUPER::new (
2376 aspect => 1, 2699 aspect => 1,
2700 can_events => 0,
2377 @_, 2701 @_,
2378 ) 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
2379} 2719}
2380 2720
2381sub size_request { 2721sub size_request {
2382 (32, 8) 2722 (32, 8)
2383} 2723}
2384 2724
2725sub update {
2726 my ($self) = @_;
2727
2728 return unless $self->{visible};
2729
2730 $self->SUPER::update;
2731}
2732
2385sub draw { 2733sub _draw {
2386 my ($self) = @_; 2734 my ($self) = @_;
2387 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
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2389 2748
2390 if ($tex) { 2749 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2750 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 2752 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 2754 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 } 2755 }
2756}
2757
2758sub DESTROY {
2759 my ($self) = @_;
2760
2761 $self->{timer}->cancel
2762 if $self->{timer};
2763
2764 $self->SUPER::DESTROY;
2400} 2765}
2401 2766
2402############################################################################# 2767#############################################################################
2403 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
2404package CFClient::UI::Root; 2998package CFClient::UI::Root;
2405 2999
2406our @ISA = CFClient::UI::Container::; 3000our @ISA = CFClient::UI::Container::;
2407 3001
2408use CFClient::OpenGL; 3002use CFClient::OpenGL;
2409 3003
2410sub check_size { 3004sub new {
2411 my ($self) = @_; 3005 my $class = shift;
2412 3006
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3007 $class->SUPER::new (
2414} 3008 visible => 1,
2415 3009 @_,
2416sub size_request { 3010 )
2417 ($::WIDTH, $::HEIGHT)
2418} 3011}
2419 3012
2420sub configure { 3013sub configure {
2421 my ($self, $x, $y, $w, $h) = @_; 3014 my ($self, $x, $y, $w, $h) = @_;
2422 3015
2423 $self->SUPER::configure ($x, $y, $w, $h); 3016 $self->{w} = $w;
3017 $self->{h} = $h;
3018}
2424 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
2425 for my $child (@{$self->{children}}) { 3036 for my $child ($self->children) {
2426 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)};
2427 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
2428 $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;
2429 $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
2430 $child->configure ($X, $Y, $W,$H); 3051 $child->configure ($X, $Y, $W, $H);
2431 } 3052 }
2432} 3053}
2433 3054
2434sub _topleft { 3055sub coord2local {
2435 my ($self, $x, $y) = @_; 3056 my ($self, $x, $y) = @_;
2436 3057
2437 ($x, $y) 3058 ($x, $y)
2438} 3059}
2439 3060
3061sub coord2global {
3062 my ($self, $x, $y) = @_;
3063
3064 ($x, $y)
3065}
3066
2440sub update { 3067sub update {
2441 my ($self) = @_; 3068 my ($self) = @_;
2442 3069
2443 $self->check_size; 3070 $self->check_size;
2444 ::refresh (); 3071 $::WANT_REFRESH++;
2445} 3072}
2446 3073
2447sub add { 3074sub add {
2448 my ($self, $child) = @_; 3075 my ($self, @children) = @_;
2449 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
2450 # integerize window positions 3086 # integerise window positions
2451 $child->{x} = int $child->{x}; 3087 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y}; 3088 $child->{y} = int $child->{y};
3089 }
2453 3090
2454 $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 }
2455} 3104}
2456 3105
2457sub on_refresh { 3106sub on_refresh {
2458 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2459 3108
2460 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2461} 3110}
2462 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2463sub draw { 3118sub draw {
2464 my ($self) = @_; 3119 my ($self) = @_;
2465 3120
2466 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2467 $_->() 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}};
2468 } 3176 }
2469 3177
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3178 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 3180 glClear GL_COLOR_BUFFER_BIT;
2473 3181
2474 glMatrixMode GL_PROJECTION; 3182 glMatrixMode GL_PROJECTION;
2475 glLoadIdentity; 3183 glLoadIdentity;
2476 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2477 glMatrixMode GL_MODELVIEW; 3185 glMatrixMode GL_MODELVIEW;
2478 glLoadIdentity; 3186 glLoadIdentity;
2479 3187
2480 $self->_draw; 3188 $self->_draw;
2481} 3189}
… …
2483############################################################################# 3191#############################################################################
2484 3192
2485package CFClient::UI; 3193package CFClient::UI;
2486 3194
2487$ROOT = new CFClient::UI::Root; 3195$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 3196$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2489 3197
24901 31981
2491 3199

Diff Legend

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