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.174 by root, Tue Apr 25 11:18:49 2006 UTC vs.
Revision 1.242 by elmex, Sat May 27 20:00:40 2006 UTC

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

Diff Legend

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