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

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

Diff Legend

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