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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.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 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 52 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
31 } 62 }
32 63
33 return; 64 return;
34 } 65 }
35 } 66 }
… …
39 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
40} 71}
41 72
42# class methods for events 73# class methods for events
43sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 76 if $FOCUS;
46} 77}
47 78
48sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 81 if $FOCUS;
51} 82}
52 83
53sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
54 my ($ev) = @_; 85 my ($ev) = @_;
… …
63 check_tooltip; 94 check_tooltip;
64 } 95 }
65 96
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 98
68 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 101}
73 102
74sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
75 my ($ev) = @_; 104 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
77 106
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 108
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 110
82 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 113
87 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 116 $grab->update if $grab;
90 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 134
108 check_tooltip; 135 check_tooltip;
109 } 136 }
110 137
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 139 if $HOVER;
115} 140}
116 141
117# convert position array to integers 142# convert position array to integers
118sub harmonize { 143sub harmonize {
119 my ($vals) = @_; 144 my ($vals) = @_;
… …
123 for (@$vals) { 148 for (@$vals) {
124 my $i = int $_ + $rem; 149 my $i = int $_ + $rem;
125 $rem += $_ - $i; 150 $rem += $_ - $i;
126 $_ = $i; 151 $_ = $i;
127 } 152 }
153}
154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
185 }
186 }
187
188 reconfigure_widgets;
128} 189}
129 190
130############################################################################# 191#############################################################################
131 192
132package CFClient::UI::Base; 193package CFClient::UI::Base;
… …
150 if (/^connect_(.*)$/) { 211 if (/^connect_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
152 } 213 }
153 } 214 }
154 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
155 $self 225 $self
156} 226}
157 227
158sub destroy { 228sub destroy {
159 my ($self) = @_; 229 my ($self) = @_;
… …
162 %$self = (); 232 %$self = ();
163} 233}
164 234
165sub show { 235sub show {
166 my ($self) = @_; 236 my ($self) = @_;
167
168 return if $self->{parent}; 237 return if $self->{parent};
169 238
170 $CFClient::UI::ROOT->add ($self); 239 $CFClient::UI::ROOT->add ($self);
171} 240}
172 241
173sub hide { 242sub show_centered {
174 my ($self) = @_; 243 my ($self) = @_;
244 return if $self->{parent};
245
246 $self->show;
247
248 $CFClient::UI::ROOT->on_post_alloc (
249 "centered $self" => sub {
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
251 },
252 );
253}
254
255sub set_invisible {
256 my ($self) = @_;
257
258 # broken show/hide model
259
260 delete $self->{root};
261 delete $self->{visible};
175 262
176 undef $GRAB if $GRAB == $self; 263 undef $GRAB if $GRAB == $self;
177 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;
178 276
179 $self->{parent}->remove ($self) 277 $self->{parent}->remove ($self)
180 if $self->{parent}; 278 if $self->{parent};
181} 279}
182 280
… …
224 $self->{y} = $y; 322 $self->{y} = $y;
225 $self->update; 323 $self->update;
226 } 324 }
227 325
228 if ($self->{w} != $w || $self->{h} != $h) { 326 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 327 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 328 }
235} 329}
236 330
237sub size_allocate { 331sub size_allocate {
238 # nothing to be done 332 # nothing to be done
239} 333}
240 334
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340}
341
342sub children {
343}
344
241sub set_max_size { 345sub set_max_size {
242 my ($self, $w, $h) = @_; 346 my ($self, $w, $h) = @_;
243 347
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 348 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 349 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 350}
247 351
248# return top left coordinates 352sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 353 my ($self, $tooltip) = @_;
251 354
252 $self->{parent} 355 $tooltip =~ s/^\s+//;
253 or Carp::confess "no parent widget in _topleft\n";#d# 356 $tooltip =~ s/\s+$//;
254 357
255 $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 }
256} 366}
257 367
258# translate global coordinates to local coordinate system 368# translate global coordinates to local coordinate system
259sub coord2local { 369sub coord2local {
260 my ($self, $x, $y) = @_; 370 my ($self, $x, $y) = @_;
261 371
262 my ($X, $Y) = $self->_topleft; 372 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
263 ($x - $X, $y - $Y)
264} 373}
265 374
266# translate local coordinates to global coordinate system 375# translate local coordinates to global coordinate system
267sub coord2global { 376sub coord2global {
268 my ($self, $x, $y) = @_; 377 my ($self, $x, $y) = @_;
269 378
270 my ($X, $Y) = $self->_topleft; 379 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
271 ($x + $X, $y + $Y)
272} 380}
273 381
274sub focus_in { 382sub focus_in {
275 my ($self) = @_; 383 my ($self) = @_;
276 384
277 return if $FOCUS == $self; 385 return if $FOCUS == $self;
278 return unless $self->{can_focus}; 386 return unless $self->{can_focus};
279 387
280 my $focus = $FOCUS; $FOCUS = $self; 388 my $focus = $FOCUS; $FOCUS = $self;
281 389
282 $self->emit (focus_in => $focus); 390 $self->_emit (focus_in => $focus);
283 391
284 $focus->update if $focus; 392 $focus->update if $focus;
285 $FOCUS->update; 393 $FOCUS->update;
286} 394}
287 395
… …
290 398
291 return unless $FOCUS == $self; 399 return unless $FOCUS == $self;
292 400
293 my $focus = $FOCUS; undef $FOCUS; 401 my $focus = $FOCUS; undef $FOCUS;
294 402
295 $self->emit (focus_out => $focus); 403 $self->_emit (focus_out => $focus);
296 404
297 $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;
298} 409}
299 410
300sub mouse_motion { } 411sub mouse_motion { }
301sub button_up { } 412sub button_up { }
302sub key_down { } 413sub key_down { }
303sub key_up { } 414sub key_up { }
304 415
305sub button_down { 416sub button_down {
306 my ($self, $ev, $x, $y) = @_; 417 my ($self, $ev, $x, $y) = @_;
307 418
308 $self->focus_in; 419 $self->focus_in;
… …
342 if ($ENV{PCLIENT_DEBUG}) { 453 if ($ENV{PCLIENT_DEBUG}) {
343 glPushMatrix; 454 glPushMatrix;
344 glColor 1, 1, 0, 1; 455 glColor 1, 1, 0, 1;
345 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
346 glBegin GL_LINE_LOOP; 457 glBegin GL_LINE_LOOP;
347 glVertex 0 , 0; 458 glVertex 0 , 0;
348 glVertex $self->{w}, 0; 459 glVertex $self->{w} - 1, 0;
349 glVertex $self->{w}, $self->{h}; 460 glVertex $self->{w} - 1, $self->{h} - 1;
350 glVertex 0 , $self->{h}; 461 glVertex 0 , $self->{h} - 1;
351 glEnd; 462 glEnd;
352 glPopMatrix; 463 glPopMatrix;
353 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;
354 } 465 }
355} 466}
356 467
357sub _draw { 468sub _draw {
358 my ($self) = @_; 469 my ($self) = @_;
… …
374 485
375sub set_parent { 486sub set_parent {
376 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
377 488
378 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;
379} 499}
380 500
381sub check_size { 501sub check_size {
382 my ($self) = @_; 502 my ($self, $forced) = @_;
383 503
384 $self->{parent} 504 $self->{force_alloc} = 1 if $forced;
385 or return 1; 505 $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} 506}
406 507
407sub update { 508sub update {
408 my ($self) = @_; 509 my ($self) = @_;
409 510
… …
415 my ($self, $signal, $cb) = @_; 516 my ($self, $signal, $cb) = @_;
416 517
417 push @{ $self->{signal_cb}{$signal} }, $cb; 518 push @{ $self->{signal_cb}{$signal} }, $cb;
418} 519}
419 520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
420sub emit { 527sub emit {
421 my ($self, $signal, @args) = @_; 528 my ($self, $signal, @args) = @_;
422 529
423 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
424} 532}
425 533
426sub DESTROY { 534sub DESTROY {
427 my ($self) = @_; 535 my ($self) = @_;
428 536
537 delete $WIDGET{$self+0};
429 #$self->deactivate; 538 #$self->deactivate;
430} 539}
431 540
432############################################################################# 541#############################################################################
433 542
… …
442 my $class = shift; 551 my $class = shift;
443 552
444 # range [value, low, high, page] 553 # range [value, low, high, page]
445 554
446 $class->SUPER::new ( 555 $class->SUPER::new (
447 bg => [0, 0, 0, 0.2], 556 #bg => [0, 0, 0, 0.2],
448 active_bg => [1, 1, 1, 0.5], 557 #active_bg => [1, 1, 1, 0.5],
449 @_ 558 @_
450 ) 559 )
451} 560}
452 561
453sub _draw { 562sub _draw {
454 my ($self) = @_; 563 my ($self) = @_;
455 564
565 my $color = $FOCUS == $self && $self->{active_bg}
566 ? $self->{active_bg}
567 : $self->{bg};
568
569 if ($color && (@$color < 4 || $color->[3])) {
456 my ($w, $h) = @$self{qw(w h)}; 570 my ($w, $h) = @$self{qw(w h)};
457 571
458 glEnable GL_BLEND; 572 glEnable GL_BLEND;
459 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
460 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 574 glColor @$color;
461 575
462 glBegin GL_QUADS; 576 glBegin GL_QUADS;
463 glVertex 0 , 0; 577 glVertex 0 , 0;
464 glVertex 0 , $h; 578 glVertex 0 , $h;
465 glVertex $w, $h; 579 glVertex $w, $h;
466 glVertex $w, 0; 580 glVertex $w, 0;
467 glEnd; 581 glEnd;
468 582
469 glDisable GL_BLEND; 583 glDisable GL_BLEND;
584 }
470} 585}
471 586
472############################################################################# 587#############################################################################
473 588
474package CFClient::UI::Empty; 589package CFClient::UI::Empty;
… …
506 621
507 $self 622 $self
508} 623}
509 624
510sub add { 625sub add {
511 my ($self, $child) = @_; 626 my ($self, @widgets) = @_;
512 627
513 $child->set_parent ($self); 628 $_->set_parent ($self)
629 for @widgets;
514 630
515 use sort 'stable'; 631 use sort 'stable';
516 632
517 $self->{children} = [ 633 $self->{children} = [
518 sort { $a->{z} <=> $b->{z} } 634 sort { $a->{z} <=> $b->{z} }
519 @{$self->{children}}, $child 635 @{$self->{children}}, @widgets
520 ]; 636 ];
521 637
522 $child->check_size; 638 $self->check_size (1);
639 $self->update;
640}
641
642sub children {
643 @{ $_[0]{children} }
523} 644}
524 645
525sub remove { 646sub remove {
526 my ($self, $child) = @_; 647 my ($self, $child) = @_;
527 648
528 delete $child->{parent}; 649 delete $child->{parent};
529 $child->hide; 650 $child->hide;
530 651
531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532 653
533 $self->check_size; 654 $self->check_size (1);
534 $self->update; 655 $self->update;
535} 656}
536 657
537sub clear { 658sub clear {
538 my ($self) = @_; 659 my ($self) = @_;
… …
542 663
543 for (@$children) { 664 for (@$children) {
544 delete $_->{parent}; 665 delete $_->{parent};
545 $_->hide; 666 $_->hide;
546 } 667 }
668
669 $self->check_size;
670 $self->update;
547} 671}
548 672
549sub find_widget { 673sub find_widget {
550 my ($self, $x, $y) = @_; 674 my ($self, $x, $y) = @_;
551 675
… …
626} 750}
627 751
628sub update { 752sub update {
629 my ($self) = @_; 753 my ($self) = @_;
630 754
631 # we want to do this delayed... 755 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 756 $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} 757}
645 758
646sub size_allocate { 759sub size_allocate {
647 my ($self, $w, $h) = @_; 760 my ($self, $w, $h) = @_;
648 761
649 $self->child->configure (0, 0, $w, $h); 762 $self->SUPER::size_allocate ($w, $h);
763 $self->update;
764}
650 765
766sub _render {
767 $_[0]{children}[0]->draw;
768}
769
770sub render_child {
771 my ($self) = @_;
772
773 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT;
776
651 $self->render_chld; 777 $self->_render;
778 };
652} 779}
653 780
654sub _draw { 781sub _draw {
655 my ($self) = @_; 782 my ($self) = @_;
656 783
657 my ($w, $h) = ($self->w, $self->h); 784 my ($w, $h) = ($self->w, $self->h);
658 785
659 my $tex = $self->{texture} 786 my $tex = $self->{texture}
660 or return; 787 or return;
661 788
662 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 789 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
791 glColor 1, 1, 1, 1;
666 792
667 $tex->draw_quad (0, 0, $w, $h); 793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
668 794
669 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 795 glDisable GL_TEXTURE_2D;
671} 796}
672 797
673############################################################################# 798#############################################################################
674 799
675package CFClient::UI::ViewPort; 800package CFClient::UI::ViewPort;
676 801
677our @ISA = CFClient::UI::Window::; 802our @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 803
705sub new { 804sub new {
706 my $class = shift; 805 my $class = shift;
707 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
708 my $self = $class->SUPER::new ( 896 $self = $class->SUPER::new (
709 bg => [1, 1, 1, 1], 897 vp => (new CFClient::UI::ViewPort expand => 1),
710 border_bg => [1, 1, 1, 1], 898 slider => $slider,
711 border => 0.8,
712 @_ 899 @_,
713 ); 900 );
714 901
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider});
905
715 $self 906 $self
716} 907}
717 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
718sub _draw { 948sub _draw {
719 my ($self) = @_; 949 my ($self) = @_;
720 950
721 my ($w, $h) = ($self->{w}, $self->{h}); 951 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)};
722 953
723 glEnable GL_BLEND; 954 glEnable GL_BLEND;
724 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
725 glEnable GL_TEXTURE_2D; 956 glColor @{ $self->{bg} };
726 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
727 957
728# glBegin GL_QUADS; 958 glBegin GL_QUADS;
729# glColor 0, 0, 0, 0;
730# glVertex 0 , 0; 959 glVertex 0 , 0;
731# glVertex 0 , $h; 960 glVertex 0 , $h;
732# glVertex $w, $h; 961 glVertex $w, $h;
733# glVertex $w, 0; 962 glVertex $w, 0;
734# glEnd; 963 glEnd;
735 964
736
737 $self->child->draw;
738 glDisable GL_BLEND; 965 glDisable GL_BLEND;
739 glDisable GL_TEXTURE_2D; 966 }
967
968 $self->SUPER::_draw;
740} 969}
741 970
742############################################################################# 971#############################################################################
743 972
744package CFClient::UI::FancyFrame; 973package CFClient::UI::FancyFrame;
… …
755 my $class = shift; 984 my $class = shift;
756 985
757 # TODO: user_x, user_y, overwrite moveto? 986 # TODO: user_x, user_y, overwrite moveto?
758 987
759 my $self = $class->SUPER::new ( 988 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 989 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 990 border_bg => [1, 1, 1, 1],
762 border => 0.8, 991 border => 0.6,
992 is_toplevel => 1,
763 can_events => 1, 993 can_events => 1,
764 @_ 994 @_
765 ); 995 );
766 996
767 $self->{title} &&= new CFClient::UI::Label 997 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 998 align => 0,
769 valign => 1, 999 valign => 1,
770 text => $self->{title}, 1000 text => $self->{title},
771 fontsize => 1; 1001 fontsize => $self->{border};
772 1002
773 $self 1003 $self
774} 1004}
775 1005
776sub border { 1006sub border {
… …
792 my ($self, $w, $h) = @_; 1022 my ($self, $w, $h) = @_;
793 1023
794 $h -= List::Util::max 0, $self->border * 2; 1024 $h -= List::Util::max 0, $self->border * 2;
795 $w -= List::Util::max 0, $self->border * 2; 1025 $w -= List::Util::max 0, $self->border * 2;
796 1026
797 $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)
798 if $self->{title}; 1028 if $self->{title};
799 1029
800 $self->child->configure ($self->border, $self->border, $w, $h); 1030 $self->child->configure ($self->border, $self->border, $w, $h);
801} 1031}
802 1032
803sub button_down { 1033sub button_down {
804 my ($self, $ev, $x, $y) = @_; 1034 my ($self, $ev, $x, $y) = @_;
805 1035
1036 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 1037 my $border = $self->border;
807 1038
808 if ($x < $self->{w} && $x >= $self->{w} - $border 1039 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 1040 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 1041
1042 if ($lr & $td) {
1043 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1044 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 1045 my ($bw, $bh) = ($self->{w}, $self->{h});
813 1046
1047 my $mx = $x < $border;
1048 my $my = $y < $border;
1049
814 $self->{motion} = sub { 1050 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 1051 my ($ev, $x, $y) = @_;
816 1052
817 ($x, $y) = ($ev->{x}, $ev->{y}); 1053 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy;
818 1055
819 $self->{user_w} = $bw + $x - $ox; 1056 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 1057 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1058 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
821 $self->check_size; 1059 $self->check_size;
822 }; 1060 };
823 1061
824 } elsif ($x >= 0 && $x < $self->{w} 1062 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1063 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 1064 my ($bx, $by) = ($self->{x}, $self->{y});
829 1065
830 $self->{motion} = sub { 1066 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 1067 my ($ev, $x, $y) = @_;
… …
854 my ($self) = @_; 1090 my ($self) = @_;
855 1091
856 my ($w, $h ) = ($self->{w}, $self->{h}); 1092 my ($w, $h ) = ($self->{w}, $self->{h});
857 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1093 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
858 1094
859 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861 glEnable GL_TEXTURE_2D; 1095 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1096 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
863 1097
864 my $border = $self->border; 1098 my $border = $self->border;
865 1099
866 glColor @{ $self->{border_bg} }; 1100 glColor @{ $self->{border_bg} };
867 $tex[1]->draw_quad (0, 0, $w, $border); 1101 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 1102 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1103 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1104 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
871 1105
1106 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
872 my $bg = $tex[0]; 1107 my $bg = $tex[0];
873 1108
874 # TODO: repeat texture not scale 1109 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 1110 my $rep_x = $cw / $bg->{w};
876 my $rep_y = $ch / $bg->{h}; 1111 my $rep_y = $ch / $bg->{h};
877 1112
878 glColor @{ $self->{bg} }; 1113 glColor @{ $self->{bg} };
879 1114
880 $bg->{s} = $rep_x; 1115 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y; 1116 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1; 1117 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 1118 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1119 }
884 1120
885 glDisable GL_TEXTURE_2D; 1121 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND;
887 1122
888 $self->{title}->draw if $self->{title}; 1123 $self->{title}->draw if $self->{title};
1124
889 $self->child->draw; 1125 $self->child->draw;
890} 1126}
891 1127
892############################################################################# 1128#############################################################################
893 1129
… …
902sub new { 1138sub new {
903 my $class = shift; 1139 my $class = shift;
904 1140
905 $class->SUPER::new ( 1141 $class->SUPER::new (
906 col_expand => [], 1142 col_expand => [],
907 @_ 1143 @_,
908 ) 1144 )
1145}
1146
1147sub children {
1148 grep $_, map @$_, grep $_, @{ $_[0]{children} }
909} 1149}
910 1150
911sub add { 1151sub add {
912 my ($self, $x, $y, $child) = @_; 1152 my ($self, $x, $y, $child) = @_;
913 1153
914 $child->set_parent ($self); 1154 $child->set_parent ($self);
915 $self->{children}[$y][$x] = $child; 1155 $self->{children}[$y][$x] = $child;
916 1156
917 $child->check_size; 1157 $self->check_size (1);
918} 1158}
919 1159
920# 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?
921sub clear { 1161sub clear {
922 my ($self) = @_; 1162 my ($self) = @_;
923 1163
924 my $children = delete $self->{children}; 1164 my @children = $self->children;
1165 delete $self->{children};
925 1166
926 for (grep $_, map @$_, grep $_, @$children) { 1167 for (@children) {
927 delete $_->{parent}; 1168 delete $_->{parent};
928 $_->hide; 1169 $_->hide;
929 } 1170 }
930 1171
1172 $self->check_size (1);
931 $self->update; 1173 $self->update;
932} 1174}
933 1175
934sub get_wh { 1176sub get_wh {
935 my ($self) = @_; 1177 my ($self) = @_;
… …
967sub size_allocate { 1209sub size_allocate {
968 my ($self, $w, $h) = @_; 1210 my ($self, $w, $h) = @_;
969 1211
970 my ($ws, $hs) = $self->get_wh; 1212 my ($ws, $hs) = $self->get_wh;
971 1213
972 my $req_w = sum @$ws; 1214 my $req_w = (sum @$ws) || 1;
973 my $req_h = sum @$hs; 1215 my $req_h = (sum @$hs) || 1;
974 1216
975 # TODO: nicer code && do row_expand 1217 # TODO: nicer code && do row_expand
976 my @col_expand = @{$self->{col_expand}}; 1218 my @col_expand = @{$self->{col_expand}};
977 @col_expand = (1) x @$ws unless @col_expand; 1219 @col_expand = (1) x @$ws unless @col_expand;
978 my $col_expand = (sum @col_expand) || 1; 1220 my $col_expand = (sum @col_expand) || 1;
… …
1112} 1354}
1113 1355
1114sub size_allocate { 1356sub size_allocate {
1115 my ($self, $w, $h) = @_; 1357 my ($self, $w, $h) = @_;
1116 1358
1359 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1360
1117 my $children = $self->{children}; 1361 my $children = $self->{children};
1118 1362
1119 my @h = map $_->{req_h}, @$children; 1363 my @h = map $_->{req_h}, @$children;
1120 1364
1121 my $req_h = List::Util::sum @h; 1365 my $req_h = List::Util::sum @h;
… …
1150 1394
1151############################################################################# 1395#############################################################################
1152 1396
1153package CFClient::UI::Label; 1397package CFClient::UI::Label;
1154 1398
1155our @ISA = CFClient::UI::Base::; 1399our @ISA = CFClient::UI::DrawBG::;
1156 1400
1157use CFClient::OpenGL; 1401use CFClient::OpenGL;
1158 1402
1159sub new { 1403sub new {
1160 my ($class, %arg) = @_; 1404 my ($class, %arg) = @_;
1161 1405
1162 my $self = $class->SUPER::new ( 1406 my $self = $class->SUPER::new (
1163 fg => [1, 1, 1], 1407 fg => [1, 1, 1],
1408 #bg => none
1409 #active_bg => none
1164 #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),
1165 fontsize => 1, 1416 fontsize => 1,
1166 text => "",
1167 align => -1, 1417 align => -1,
1168 valign => -1, 1418 valign => -1,
1169 padding => 2, 1419 padding => 2,
1170 layout => new CFClient::Layout,
1171 can_events => 0, 1420 can_events => 0,
1172 %arg 1421 %arg
1173 ); 1422 );
1174 1423
1175 if (exists $self->{template}) { 1424 if (exists $self->{template}) {
1176 my $layout = new CFClient::Layout; 1425 my $layout = new CFClient::Layout;
1177 $layout->set_text (delete $self->{template}); 1426 $layout->set_text (delete $self->{template});
1178 $self->{template} = $layout; 1427 $self->{template} = $layout;
1179 } 1428 }
1180 1429
1181 $self->set_text (delete $self->{text}) if exists $self->{text}; 1430 if (exists $self->{markup}) {
1182 $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 }
1183 1435
1184 $self 1436 $self
1185} 1437}
1186 1438
1187sub escape { 1439sub escape($) {
1188 local $_ = $_[1]; 1440 local $_ = $_[0];
1189 1441
1190 s/&/&amp;/g; 1442 s/&/&amp;/g;
1191 s/>/&gt;/g; 1443 s/>/&gt;/g;
1192 s/</&lt;/g; 1444 s/</&lt;/g;
1193 1445
1194 $_[1] 1446 $_
1447}
1448
1449sub update {
1450 my ($self) = @_;
1451
1452 delete $self->{texture};
1453 $self->SUPER::update;
1195} 1454}
1196 1455
1197sub set_text { 1456sub set_text {
1198 my ($self, $text) = @_; 1457 my ($self, $text) = @_;
1199 1458
1459 return if $self->{text} eq "T$text";
1460 $self->{text} = "T$text";
1461
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1200 $self->{layout}->set_text ($text); 1463 $self->{layout}->set_text ($text);
1201 1464
1202 delete $self->{texture}; 1465 $self->update;
1203 $self->check_size; 1466 $self->check_size;
1204 $self->update;
1205} 1467}
1206 1468
1207sub set_markup { 1469sub set_markup {
1208 my ($self, $markup) = @_; 1470 my ($self, $markup) = @_;
1209 1471
1472 return if $self->{text} eq "M$markup";
1473 $self->{text} = "M$markup";
1474
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1210 $self->{layout}->set_markup ($markup); 1478 $self->{layout}->set_markup ($markup);
1211 1479
1212 delete $self->{texture}; 1480 $self->update;
1213 $self->check_size; 1481 $self->check_size;
1214 $self->update;
1215} 1482}
1216 1483
1217sub size_request { 1484sub size_request {
1218 my ($self) = @_; 1485 my ($self) = @_;
1219 1486
1220 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1487 $self->{layout}->set_font ($self->{font}) if $self->{font};
1221 $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});
1222 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1491 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1223 1492
1224 my ($w, $h) = $self->{layout}->size; 1493 my ($w, $h) = $self->{layout}->size;
1225 1494
1226 if (exists $self->{template}) { 1495 if (exists $self->{template}) {
… …
1248sub set_fontsize { 1517sub set_fontsize {
1249 my ($self, $fontsize) = @_; 1518 my ($self, $fontsize) = @_;
1250 1519
1251 $self->{fontsize} = $fontsize; 1520 $self->{fontsize} = $fontsize;
1252 delete $self->{texture}; 1521 delete $self->{texture};
1522
1523 $self->update;
1253 $self->check_size; 1524 $self->check_size;
1254 $self->update;
1255} 1525}
1256 1526
1257sub _draw { 1527sub _draw {
1258 my ($self) = @_; 1528 my ($self) = @_;
1259 1529
1530 $self->SUPER::_draw; # draw background, if applicable
1531
1260 my $tex = $self->{texture} ||= do { 1532 my $tex = $self->{texture} ||= do {
1533 $self->{layout}->set_foreground (@{$self->{fg}});
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1534 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $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});
1263 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539
1264 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
1265 }; 1551 };
1266 1552
1267 glEnable GL_BLEND;
1268 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1269 glEnable GL_TEXTURE_2D; 1553 glEnable GL_TEXTURE_2D;
1270 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1271 1555
1556 if ($tex->{format} == GL_ALPHA) {
1272 glColor @{$self->{fg}}; 1557 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}); 1558 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1559 } else {
1560 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1561 }
1287 1562
1288 glDisable GL_TEXTURE_2D; 1563 glDisable GL_TEXTURE_2D;
1289 glDisable GL_BLEND;
1290} 1564}
1291 1565
1292############################################################################# 1566#############################################################################
1293 1567
1294package CFClient::UI::EntryBase; 1568package CFClient::UI::EntryBase;
… …
1307 active_fg => [0, 0, 0], 1581 active_fg => [0, 0, 0],
1308 can_hover => 1, 1582 can_hover => 1,
1309 can_focus => 1, 1583 can_focus => 1,
1310 valign => 0, 1584 valign => 0,
1311 can_events => 1, 1585 can_events => 1,
1586 #text => ...
1312 @_ 1587 @_
1313 ) 1588 )
1314} 1589}
1315 1590
1316sub _set_text { 1591sub _set_text {
… …
1326 $self->{text} = $text; 1601 $self->{text} = $text;
1327 1602
1328 $text =~ s/./*/g if $self->{hidden}; 1603 $text =~ s/./*/g if $self->{hidden};
1329 $self->{layout}->set_text ("$text "); 1604 $self->{layout}->set_text ("$text ");
1330 1605
1331 $self->emit (changed => $self->{text}); 1606 $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} 1607}
1351 1608
1352sub set_text { 1609sub set_text {
1353 my ($self, $text) = @_; 1610 my ($self, $text) = @_;
1354 1611
1355 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1356 $self->_set_text ($text); 1613 $self->_set_text ($text);
1357 $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
1358} 1628}
1359 1629
1360sub key_down { 1630sub key_down {
1361 my ($self, $ev) = @_; 1631 my ($self, $ev) = @_;
1362 1632
… …
1364 my $sym = $ev->{sym}; 1634 my $sym = $ev->{sym};
1365 my $uni = $ev->{unicode}; 1635 my $uni = $ev->{unicode};
1366 1636
1367 my $text = $self->get_text; 1637 my $text = $self->get_text;
1368 1638
1369 if ($sym == 8) { 1639 if ($uni == 8) {
1370 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1640 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1371 } elsif ($sym == 127) { 1641 } elsif ($uni == 127) {
1372 substr $text, $self->{cursor}, 1, ""; 1642 substr $text, $self->{cursor}, 1, "";
1373 } elsif ($sym == CFClient::SDLK_LEFT) { 1643 } elsif ($sym == CFClient::SDLK_LEFT) {
1374 --$self->{cursor} if $self->{cursor}; 1644 --$self->{cursor} if $self->{cursor};
1375 } elsif ($sym == CFClient::SDLK_RIGHT) { 1645 } elsif ($sym == CFClient::SDLK_RIGHT) {
1376 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1646 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1377 } elsif ($sym == CFClient::SDLK_HOME) { 1647 } elsif ($sym == CFClient::SDLK_HOME) {
1378 $self->{cursor} = 0; 1648 $self->{cursor} = 0;
1379 } elsif ($sym == CFClient::SDLK_END) { 1649 } elsif ($sym == CFClient::SDLK_END) {
1380 $self->{cursor} = length $text; 1650 $self->{cursor} = length $text;
1381 } elsif ($sym == 27) { 1651 } elsif ($uni == 27) {
1382 $self->emit ('escape'); 1652 $self->_emit ('escape');
1383 } elsif ($uni) { 1653 } elsif ($uni) {
1384 substr $text, $self->{cursor}++, 0, chr $uni; 1654 substr $text, $self->{cursor}++, 0, chr $uni;
1385 } 1655 }
1386 1656
1387 $self->_set_text ($text); 1657 $self->_set_text ($text);
1388 $self->update; 1658 $self->update;
1659 $self->check_size;
1389} 1660}
1390 1661
1391sub focus_in { 1662sub focus_in {
1392 my ($self) = @_; 1663 my ($self) = @_;
1393 1664
… …
1473 if ($sym == 13) { 1744 if ($sym == 13) {
1474 unshift @{$self->{history}}, 1745 unshift @{$self->{history}},
1475 my $txt = $self->get_text; 1746 my $txt = $self->get_text;
1476 $self->{history_pointer} = -1; 1747 $self->{history_pointer} = -1;
1477 $self->{history_saveback} = ''; 1748 $self->{history_saveback} = '';
1478 $self->emit (activate => $txt); 1749 $self->_emit (activate => $txt);
1479 $self->update; 1750 $self->update;
1480 1751
1481 } elsif ($sym == CFClient::SDLK_UP) { 1752 } elsif ($sym == CFClient::SDLK_UP) {
1482 if ($self->{history_pointer} < 0) { 1753 if ($self->{history_pointer} < 0) {
1483 $self->{history_saveback} = $self->get_text; 1754 $self->{history_saveback} = $self->get_text;
… …
1522 my $class = shift; 1793 my $class = shift;
1523 1794
1524 $class->SUPER::new ( 1795 $class->SUPER::new (
1525 padding => 4, 1796 padding => 4,
1526 fg => [1, 1, 1], 1797 fg => [1, 1, 1],
1527 bg => [1, 1, 1, 0.2],
1528 active_fg => [0, 0, 1], 1798 active_fg => [0, 0, 1],
1529 can_hover => 1, 1799 can_hover => 1,
1530 align => 0, 1800 align => 0,
1531 valign => 0, 1801 valign => 0,
1532 can_events => 1, 1802 can_events => 1,
1533 @_ 1803 @_
1534 ) 1804 )
1535} 1805}
1536 1806
1807sub activate { }
1808
1537sub button_up { 1809sub button_up {
1538 my ($self, $ev, $x, $y) = @_; 1810 my ($self, $ev, $x, $y) = @_;
1539 1811
1812 $self->emit ("activate")
1540 if ($x >= 0 && $x < $self->{w} 1813 if $x >= 0 && $x < $self->{w}
1541 && $y >= 0 && $y < $self->{h}) { 1814 && $y >= 0 && $y < $self->{h};
1542 $self->emit ("activate");
1543 }
1544} 1815}
1545 1816
1546sub _draw { 1817sub _draw {
1547 my ($self) = @_; 1818 my ($self) = @_;
1548 1819
… …
1550 1821
1551 if ($GRAB == $self) { 1822 if ($GRAB == $self) {
1552 $self->{fg} = $self->{active_fg}; 1823 $self->{fg} = $self->{active_fg};
1553 } 1824 }
1554 1825
1555 glEnable GL_BLEND;
1556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1557 glEnable GL_TEXTURE_2D; 1826 glEnable GL_TEXTURE_2D;
1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1827 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 glColor 0, 0, 0, 1; 1828 glColor 0, 0, 0, 1;
1560 1829
1561 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1830 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1562 1831
1563 glDisable GL_TEXTURE_2D; 1832 glDisable GL_TEXTURE_2D;
1564 glDisable GL_BLEND;
1565 1833
1566 $self->SUPER::_draw; 1834 $self->SUPER::_draw;
1567} 1835}
1568 1836
1569############################################################################# 1837#############################################################################
… …
1583 1851
1584 $class->SUPER::new ( 1852 $class->SUPER::new (
1585 padding => 2, 1853 padding => 2,
1586 fg => [1, 1, 1], 1854 fg => [1, 1, 1],
1587 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],
1588 state => 0, 1858 state => 0,
1589 can_hover => 1, 1859 can_hover => 1,
1590 @_ 1860 @_
1591 ) 1861 )
1592} 1862}
… …
1601 my ($self, $ev, $x, $y) = @_; 1871 my ($self, $ev, $x, $y) = @_;
1602 1872
1603 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1604 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1605 $self->{state} = !$self->{state}; 1875 $self->{state} = !$self->{state};
1606 $self->emit (changed => $self->{state}); 1876 $self->_emit (changed => $self->{state});
1607 } 1877 }
1608} 1878}
1609 1879
1610sub _draw { 1880sub _draw {
1611 my ($self) = @_; 1881 my ($self) = @_;
… …
1616 1886
1617 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;
1618 1888
1619 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1620 1890
1621 glEnable GL_BLEND; 1891 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892
1622 glEnable GL_TEXTURE_2D; 1893 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); 1894 $tex->draw_quad_alpha (0, 0, $s, $s);
1628
1629 glDisable GL_TEXTURE_2D; 1895 glDisable GL_TEXTURE_2D;
1630 glDisable GL_BLEND;
1631} 1896}
1632 1897
1633############################################################################# 1898#############################################################################
1634 1899
1635package CFClient::UI::Image; 1900package CFClient::UI::Image;
… …
1678 glTranslate 0, -$self->{w}, 0; 1943 glTranslate 0, -$self->{w}, 0;
1679 1944
1680 ($w, $h) = ($h, $w); 1945 ($w, $h) = ($h, $w);
1681 } 1946 }
1682 1947
1683 glEnable GL_BLEND;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685 glEnable GL_TEXTURE_2D; 1948 glEnable GL_TEXTURE_2D;
1686 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1949 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1687 1950
1688 $tex->draw_quad (0, 0, $w, $h); 1951 $tex->draw_quad_alpha (0, 0, $w, $h);
1689 1952
1690 glDisable GL_BLEND;
1691 glDisable GL_TEXTURE_2D; 1953 glDisable GL_TEXTURE_2D;
1692} 1954}
1693 1955
1694############################################################################# 1956#############################################################################
1695 1957
… …
1743} 2005}
1744 2006
1745sub set_max { 2007sub set_max {
1746 my ($self, $max) = @_; 2008 my ($self, $max) = @_;
1747 2009
2010 return if $self->{max_val} == $max;
2011
1748 $self->{max_val} = $max; 2012 $self->{max_val} = $max;
2013 $self->update;
1749} 2014}
1750 2015
1751sub set_value { 2016sub set_value {
1752 my ($self, $val, $max) = @_; 2017 my ($self, $val, $max) = @_;
1753 2018
1754 $self->set_max ($max) 2019 $self->set_max ($max)
1755 if defined $max; 2020 if defined $max;
1756 2021
1757 $max = $self->{max_val}; 2022 return if $self->{val} == $val;
2023
1758 $self->{val} = $val; 2024 $self->{val} = $val;
1759
1760 $self->update; 2025 $self->update;
1761} 2026}
1762 2027
1763sub _draw { 2028sub _draw {
1764 my ($self) = @_; 2029 my ($self) = @_;
… …
1847 2112
1848 $self->{value}->set_fontsize ($fsize); 2113 $self->{value}->set_fontsize ($fsize);
1849 $self->{max} ->set_fontsize ($fsize); 2114 $self->{max} ->set_fontsize ($fsize);
1850} 2115}
1851 2116
2117sub set_max {
2118 my ($self, $max) = @_;
2119
2120 $self->{gauge}->set_max ($max);
2121 $self->{max}->set_text ($max);
2122}
2123
1852sub set_value { 2124sub set_value {
1853 my ($self, $val, $max) = @_; 2125 my ($self, $val, $max) = @_;
1854 2126
1855 $self->set_max ($max) 2127 $self->set_max ($max)
1856 if defined $max; 2128 if defined $max;
1857 2129
1858 $self->{gauge}->set_value ($val, $max); 2130 $self->{gauge}->set_value ($val, $max);
1859 $self->{value}->set_text ($val); 2131 $self->{value}->set_text ($val);
1860}
1861
1862sub set_max {
1863 my ($self, $max) = @_;
1864
1865 $self->{gauge}->set_max ($max);
1866 $self->{max}->set_text ($max);
1867} 2132}
1868 2133
1869############################################################################# 2134#############################################################################
1870 2135
1871package CFClient::UI::Slider; 2136package CFClient::UI::Slider;
… …
1881 qw(s1_slider.png s1_slider_bg.png); 2146 qw(s1_slider.png s1_slider_bg.png);
1882 2147
1883sub new { 2148sub new {
1884 my $class = shift; 2149 my $class = shift;
1885 2150
1886 # range [value, low, high, page] 2151 # range [value, low, high, page, unit]
1887 2152
1888 # TODO: 0-width page 2153 # TODO: 0-width page
1889 # TODO: req_w/h are wrong with vertical 2154 # TODO: req_w/h are wrong with vertical
1890 # TODO: calculations are off 2155 # TODO: calculations are off
1891 my $self = $class->SUPER::new ( 2156 my $self = $class->SUPER::new (
1892 fg => [1, 1, 1], 2157 fg => [1, 1, 1],
1893 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],
1894 range => [0, 0, 100, 10], 2161 range => [0, 0, 100, 10, 0],
1895 req_w => 20, 2162 req_w => $::WIDTH / 80,
1896 req_h => 20, 2163 req_h => $::WIDTH / 80,
1897 vertical => 0, 2164 vertical => 0,
1898 can_hover => 1, 2165 can_hover => 1,
1899 inner_pad => 5, 2166 inner_pad => 0.02,
1900 @_ 2167 @_
1901 ); 2168 );
1902 2169
2170 $self->set_value ($self->{range}[0]);
2171 $self->update;
2172
1903 $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 }
1904} 2206}
1905 2207
1906sub size_request { 2208sub size_request {
1907 my ($self) = @_; 2209 my ($self) = @_;
1908 2210
… …
1914 2216
1915sub button_down { 2217sub button_down {
1916 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
1917 2219
1918 $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
1919 $self->mouse_motion ($ev, $x, $y); 2224 $self->mouse_motion ($ev, $x, $y);
1920} 2225}
1921 2226
1922sub mouse_motion { 2227sub mouse_motion {
1923 my ($self, $ev, $x, $y) = @_; 2228 my ($self, $ev, $x, $y) = @_;
1924 2229
1925 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
1926 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2247 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100;
1927 2249
1928 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2250 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1929 2251
1930 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2252 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1931 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2253 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1932 2254
1933 $x -= $inner_pad_px; # substract the padding 2255 $value = ($value - $lo) / $range;
1934 $x = $x * ($hi - $lo) / $inner_w + $lo; 2256 $value = $value * $self->{scale} + $self->{offset};
1935 $x = $lo if $x < $lo;
1936 $x = $hi - $page if $x > $hi - $page;
1937 $self->{range}[0] = $x;
1938 2257
1939 $self->emit (changed => $x); 2258 $self->{knob_x} = $value - $knob_w * 0.5;
1940 $self->update; 2259 $self->{knob_w} = $knob_w;
1941 } 2260 });
1942}
1943 2261
1944# the inner_* stuff is for generating a padding for the slider handle, 2262 $self->SUPER::update;
1945# so that the handle doesn't leave the texture. This calculation isn't 100%
1946# correct propably, but it does the job for now
1947sub _calc_inner_pad_px {
1948 my ($self, $w) = @_;
1949 ($w / 100) * $self->{inner_pad} # % to pixels
1950} 2263}
1951 2264
1952sub _draw { 2265sub _draw {
1953 my ($self) = @_; 2266 my ($self) = @_;
1954 2267
1955 $self->SUPER::_draw (); 2268 $self->SUPER::_draw ();
1956 2269
1957 my ($w, $h) = @$self{qw(w h)}; 2270 glScale $self->{w}, $self->{h};
1958 2271
1959 if ($self->{vertical}) { 2272 if ($self->{vertical}) {
1960 # draw a vertical slider like a rotated horizontal slider 2273 # draw a vertical slider like a rotated horizontal slider
1961 2274
2275 glTranslate 1, 0, 0;
1962 glRotate 90, 0, 0, 1; 2276 glRotate 90, 0, 0, 1;
1963 glTranslate 0, -$self->{w}, 0;
1964
1965 ($w, $h) = ($h, $w);
1966 } 2277 }
1967 2278
1968 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2279 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1969 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2280 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1970 2281
1971 my ($value, $lo, $hi, $page) = @{$self->{range}};
1972
1973 $hi = $value + 1 if $lo == $hi;
1974
1975 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1976 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1977
1978 $page = int $page * $inner_w / ($hi - $lo);
1979 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1980
1981 $w -= $page;
1982 $page &= ~1;
1983 glTranslate $page * 0.5, 0, 0;
1984 $page ||= 2;
1985
1986 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1987 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1988
1989 glEnable GL_BLEND;
1990 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1991 glEnable GL_TEXTURE_2D; 2282 glEnable GL_TEXTURE_2D;
1992 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1993 2284
1994 # draw background 2285 # draw background
1995 $tex[1]->draw_quad (0, 0, $w, $h); 2286 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1996 2287
1997 # draw handle 2288 # draw handle
1998 $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);
1999 2290
2000 glDisable GL_BLEND;
2001 glDisable GL_TEXTURE_2D; 2291 glDisable GL_TEXTURE_2D;
2002} 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 (@_) }
2003 2334
2004############################################################################# 2335#############################################################################
2005 2336
2006package CFClient::UI::TextView; 2337package CFClient::UI::TextView;
2007 2338
… …
2016 fontsize => 1, 2347 fontsize => 1,
2017 can_events => 0, 2348 can_events => 0,
2018 #font => default_font 2349 #font => default_font
2019 @_, 2350 @_,
2020 2351
2021 layout => (new CFClient::Layout), 2352 layout => (new CFClient::Layout 1),
2022 par => [], 2353 par => [],
2023 height => 0, 2354 height => 0,
2024 children => [ 2355 children => [
2025 (new CFClient::UI::Empty expand => 1), 2356 (new CFClient::UI::Empty expand => 1),
2026 (new CFClient::UI::Slider vertical => 1), 2357 (new CFClient::UI::Slider vertical => 1),
2027 ], 2358 ],
2028 ); 2359 );
2029 2360
2030 $self->{children}[1]->connect (changed => sub { 2361 $self->{children}[1]->connect (changed => sub { $self->update });
2031 $self->update;
2032 });
2033 2362
2034 $self 2363 $self
2035} 2364}
2036 2365
2037sub set_fontsize { 2366sub set_fontsize {
2038 my ($self, $fontsize) = @_; 2367 my ($self, $fontsize) = @_;
2039 2368
2040 $self->{fontsize} = $fontsize; 2369 $self->{fontsize} = $fontsize;
2041 $self->reflow; 2370 $self->reflow;
2042}
2043
2044sub text_height {
2045 my ($self, $text) = @_;
2046
2047 my $layout = $self->{layout};
2048
2049 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2050 $layout->set_width ($self->{w});
2051 $layout->set_text ($text);
2052
2053 ($layout->size)[1]
2054}
2055
2056sub reflow {
2057 my ($self) = @_;
2058
2059 $self->{need_reflow}++;
2060 $self->update;
2061} 2371}
2062 2372
2063sub size_allocate { 2373sub size_allocate {
2064 my ($self, $w, $h) = @_; 2374 my ($self, $w, $h) = @_;
2065 2375
… …
2070 $self->{layout}->set_width ($self->{children}[0]{w}); 2380 $self->{layout}->set_width ($self->{children}[0]{w});
2071 2381
2072 $self->reflow; 2382 $self->reflow;
2073} 2383}
2074 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
2075sub add_paragraph { 2419sub add_paragraph {
2076 my ($self, $color, $text) = @_; 2420 my ($self, $color, $text, $indent) = @_;
2077 2421
2078 #TODO: intelligently "reformat" paragraph 2422 for my $line (split /\n/, $text) {
2079 2423 my ($w, $h) = $self->text_size ($line);
2080 my $height = $self->text_height ($text);
2081
2082 $self->{height} += $height; 2424 $self->{height} += $h;
2425 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2426 }
2083 2427
2084 push @{$self->{par}}, [$height, $color, $text];
2085
2086 $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]);
2087 $self->{children}[1]->update;
2088} 2429}
2089 2430
2090sub update { 2431sub update {
2091 my ($self) = @_; 2432 my ($self) = @_;
2092 2433
… …
2094 2435
2095 return unless $self->{h} > 0; 2436 return unless $self->{h} > 0;
2096 2437
2097 delete $self->{texture}; 2438 delete $self->{texture};
2098 2439
2099 $ROOT->on_refresh ($self, sub { 2440 $ROOT->on_post_alloc ($self, sub {
2441 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2442
2100 if (delete $self->{need_reflow}) { 2443 if (delete $self->{need_reflow}) {
2101 my $height = 0; 2444 my $height = 0;
2102 2445
2103 $height += $_->[0] = $self->text_height ($_->[2]) 2446 my $layout = $self->{layout};
2447
2448 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2449
2104 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 }
2105 2461
2106 $self->{height} = $height; 2462 $self->{height} = $height;
2107 2463
2108 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2464 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2109 2465
2110 delete $self->{texture}; 2466 delete $self->{texture};
2111 } 2467 }
2112 2468
2113 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2469 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2114 glClearColor 0, 0, 0, 1; 2470 glClearColor 0.5, 0.5, 0.5, 0;
2115 glClear GL_COLOR_BUFFER_BIT; 2471 glClear GL_COLOR_BUFFER_BIT;
2116 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
2117 glEnable GL_BLEND; 2484 glEnable GL_BLEND;
2485 #TODO# not correct in windows where rgba is forced off
2118 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2486 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2119 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121
2122 my $top = int $self->{children}[1]{range}[0];
2123
2124 my $y0 = $top;
2125 my $y1 = $top + $self->{h};
2126
2127 my $y = 0;
2128
2129 my $layout = $self->{layout};
2130
2131 $layout->set_font ($self->{font}) if $self->{font};
2132 2487
2133 for my $par (@{$self->{par}}) { 2488 for my $par (@{$self->{par}}) {
2134 my $h = $par->[0]; 2489 my $h = $par->[1];
2135 2490
2136 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]);
2137 $layout->set_text ($par->[2]); 2494 $layout->set_markup ($par->[4]);
2138 2495
2139 glColor @{ $par->[1] }; 2496 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2140 my ($W, $H) = $layout->size; 2497
2141 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;
2142 } 2500 }
2143 2501
2144 $y += $h; 2502 $y += $h;
2145 } 2503 }
2146 2504
2147 glDisable GL_TEXTURE_2D;
2148 glDisable GL_BLEND; 2505 glDisable GL_BLEND;
2149 }; 2506 };
2150 }); 2507 });
2151} 2508}
2152 2509
2153sub _draw { 2510sub _draw {
2154 my ($self) = @_; 2511 my ($self) = @_;
2155 2512
2156 if ($self->{texture}) {
2157 glEnable GL_TEXTURE_2D; 2513 glEnable GL_TEXTURE_2D;
2158 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2515 glColor 1, 1, 1, 1;
2159 $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});
2160 glDisable GL_TEXTURE_2D; 2517 glDisable GL_TEXTURE_2D;
2161 }
2162 2518
2163 $self->{children}[1]->draw; 2519 $self->{children}[1]->draw;
2164 2520
2165} 2521}
2166 2522
… …
2234 2590
2235 # TODO: use animation 2591 # TODO: use animation
2236 if ($self->{state} = !$self->{state}) { 2592 if ($self->{state} = !$self->{state}) {
2237 $CFClient::UI::ROOT->add ($self->{other}); 2593 $CFClient::UI::ROOT->add ($self->{other});
2238 $self->{other}->move ($self->coord2global (0, $self->{h})); 2594 $self->{other}->move ($self->coord2global (0, $self->{h}));
2239 $self->emit ("open"); 2595 $self->_emit ("open");
2240 } else { 2596 } else {
2241 $CFClient::UI::ROOT->remove ($self->{other}); 2597 $CFClient::UI::ROOT->remove ($self->{other});
2242 $self->emit ("close"); 2598 $self->_emit ("close");
2243 } 2599 }
2244 2600
2245 $self->emit (changed => $self->{state}); 2601 $self->_emit (changed => $self->{state});
2246} 2602}
2247 2603
2248############################################################################# 2604#############################################################################
2249 2605
2250package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2260 @_, 2616 @_,
2261 can_events => 0, 2617 can_events => 0,
2262 ) 2618 )
2263} 2619}
2264 2620
2265sub set_markup { 2621sub set_tooltip_from {
2266 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2267 2623
2268 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 $self->add (new CFClient::UI::Label
2269 $self->{label}->set_markup ($text); 2625 markup => $widget->{tooltip},
2270 $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 );
2271} 2632}
2272 2633
2273sub size_request { 2634sub size_request {
2274 my ($self) = @_; 2635 my ($self) = @_;
2275
2276 $self->child->set_max_size ($::WIDTH * 0.3);
2277 2636
2278 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2279 2638
2280 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2281} 2640}
… …
2287} 2646}
2288 2647
2289sub _draw { 2648sub _draw {
2290 my ($self) = @_; 2649 my ($self) = @_;
2291 2650
2292 glPushMatrix;
2293 glTranslate 0.375, 0.375; 2651 glTranslate 0.375, 0.375;
2294 2652
2295 my ($w, $h) = @$self{qw(w h)}; 2653 my ($w, $h) = @$self{qw(w h)};
2296 2654
2297 glColor 1, 0.8, 0.4; 2655 glColor 1, 0.8, 0.4;
… …
2308 glVertex 0 , $h; 2666 glVertex 0 , $h;
2309 glVertex $w, $h; 2667 glVertex $w, $h;
2310 glVertex $w, 0; 2668 glVertex $w, 0;
2311 glEnd; 2669 glEnd;
2312 2670
2313 glPopMatrix; 2671 glTranslate 2 - 0.375, 2 - 0.375;
2314
2315 glTranslate 2, 2;
2316 $self->SUPER::_draw; 2672 $self->SUPER::_draw;
2317} 2673}
2318 2674
2319############################################################################# 2675#############################################################################
2320 2676
… …
2325use CFClient::OpenGL; 2681use CFClient::OpenGL;
2326 2682
2327sub new { 2683sub new {
2328 my $class = shift; 2684 my $class = shift;
2329 2685
2330 $class->SUPER::new ( 2686 my $self = $class->SUPER::new (
2331 aspect => 1, 2687 aspect => 1,
2688 can_events => 0,
2332 @_, 2689 @_,
2333 ) 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
2334} 2707}
2335 2708
2336sub size_request { 2709sub size_request {
2337 (32, 8) 2710 (32, 8)
2338} 2711}
2339 2712
2713sub update {
2714 my ($self) = @_;
2715
2716 return unless $self->{visible};
2717
2718 $self->SUPER::update;
2719}
2720
2340sub draw { 2721sub _draw {
2341 my ($self) = @_; 2722 my ($self) = @_;
2342 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
2343 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2735 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2344 2736
2345 if ($tex) { 2737 if ($tex) {
2346 glEnable GL_BLEND;
2347 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2348 glEnable GL_TEXTURE_2D; 2738 glEnable GL_TEXTURE_2D;
2349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2739 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2350 glColor 1, 1, 1, 1; 2740 glColor 1, 1, 1, 1;
2351 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2741 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2352 glDisable GL_TEXTURE_2D; 2742 glDisable GL_TEXTURE_2D;
2353 glDisable GL_BLEND;
2354 } 2743 }
2744}
2745
2746sub DESTROY {
2747 my ($self) = @_;
2748
2749 $self->{timer}->cancel
2750 if $self->{timer};
2751
2752 $self->SUPER::DESTROY;
2355} 2753}
2356 2754
2357############################################################################# 2755#############################################################################
2358 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
2359package CFClient::UI::Root; 2986package CFClient::UI::Root;
2360 2987
2361our @ISA = CFClient::UI::Container::; 2988our @ISA = CFClient::UI::Container::;
2362 2989
2363use CFClient::OpenGL; 2990use CFClient::OpenGL;
2364 2991
2365sub check_size { 2992sub new {
2366 my ($self) = @_; 2993 my $class = shift;
2367 2994
2368 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2995 $class->SUPER::new (
2369} 2996 visible => 1,
2370 2997 @_,
2371sub size_request { 2998 )
2372 ($::WIDTH, $::HEIGHT)
2373} 2999}
2374 3000
2375sub configure { 3001sub configure {
2376 my ($self, $x, $y, $w, $h) = @_; 3002 my ($self, $x, $y, $w, $h) = @_;
2377 3003
2378 $self->SUPER::configure ($x, $y, $w, $h); 3004 $self->{w} = $w;
3005 $self->{h} = $h;
3006}
2379 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
2380 for my $child (@{$self->{children}}) { 3024 for my $child ($self->children) {
2381 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)};
2382 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
2383 $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;
2384 $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
2385 $child->configure ($X, $Y, $W,$H); 3036 $child->configure ($X, $Y, $W, $H);
2386 } 3037 }
2387} 3038}
2388 3039
2389sub _topleft { 3040sub coord2local {
2390 my ($self, $x, $y) = @_; 3041 my ($self, $x, $y) = @_;
2391 3042
2392 ($x, $y) 3043 ($x, $y)
2393} 3044}
2394 3045
3046sub coord2global {
3047 my ($self, $x, $y) = @_;
3048
3049 ($x, $y)
3050}
3051
2395sub update { 3052sub update {
2396 my ($self) = @_; 3053 my ($self) = @_;
2397 3054
2398 $self->check_size; 3055 $self->check_size;
2399 ::refresh (); 3056 $::WANT_REFRESH++;
2400} 3057}
2401 3058
2402sub add { 3059sub add {
2403 my ($self, $child) = @_; 3060 my ($self, @children) = @_;
2404 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
2405 # integerize window positions 3071 # integerise window positions
2406 $child->{x} = int $child->{x}; 3072 $child->{x} = int $child->{x};
2407 $child->{y} = int $child->{y}; 3073 $child->{y} = int $child->{y};
3074 }
2408 3075
2409 $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 }
2410} 3089}
2411 3090
2412sub on_refresh { 3091sub on_refresh {
2413 my ($self, $id, $cb) = @_; 3092 my ($self, $id, $cb) = @_;
2414 3093
2415 $self->{refresh_hook}{$id} = $cb; 3094 $self->{refresh_hook}{$id} = $cb;
2416} 3095}
2417 3096
3097sub on_post_alloc {
3098 my ($self, $id, $cb) = @_;
3099
3100 $self->{post_alloc_hook}{$id} = $cb;
3101}
3102
2418sub draw { 3103sub draw {
2419 my ($self) = @_; 3104 my ($self) = @_;
2420 3105
2421 while (my $rcb = delete $self->{refresh_hook}) { 3106 while ($self->{refresh_hook}) {
2422 $_->() 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}};
2423 } 3158 }
2424 3159
2425 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3160 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2426 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3161 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2427 glClear GL_COLOR_BUFFER_BIT; 3162 glClear GL_COLOR_BUFFER_BIT;
2428 3163
2429 glMatrixMode GL_PROJECTION; 3164 glMatrixMode GL_PROJECTION;
2430 glLoadIdentity; 3165 glLoadIdentity;
2431 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3166 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2432 glMatrixMode GL_MODELVIEW; 3167 glMatrixMode GL_MODELVIEW;
2433 glLoadIdentity; 3168 glLoadIdentity;
2434 3169
2435 $self->_draw; 3170 $self->_draw;
2436} 3171}
… …
2438############################################################################# 3173#############################################################################
2439 3174
2440package CFClient::UI; 3175package CFClient::UI;
2441 3176
2442$ROOT = new CFClient::UI::Root; 3177$ROOT = new CFClient::UI::Root;
2443$TOOLTIP = new CFClient::UI::Tooltip; 3178$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2444 3179
24451 31801
2446 3181

Diff Legend

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