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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.234 by root, Thu May 25 16:24:44 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
241sub children { 314sub children {
242}
243
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252} 315}
253 316
254sub set_max_size { 317sub set_max_size {
255 my ($self, $w, $h) = @_; 318 my ($self, $w, $h) = @_;
256 319
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
259} 322}
260 323
261# return top left coordinates 324sub set_tooltip {
262sub _topleft {
263 my ($self, $x, $y) = @_; 325 my ($self, $tooltip) = @_;
264 326
265 $self->{parent} 327 $tooltip =~ s/^\s+//;
266 or Carp::confess "no parent widget in _topleft\n";#d# 328 $tooltip =~ s/\s+$//;
267 329
268 $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 }
269} 338}
270 339
271# translate global coordinates to local coordinate system 340# translate global coordinates to local coordinate system
272sub coord2local { 341sub coord2local {
273 my ($self, $x, $y) = @_; 342 my ($self, $x, $y) = @_;
274 343
275 my ($X, $Y) = $self->_topleft; 344 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 345}
278 346
279# translate local coordinates to global coordinate system 347# translate local coordinates to global coordinate system
280sub coord2global { 348sub coord2global {
281 my ($self, $x, $y) = @_; 349 my ($self, $x, $y) = @_;
282 350
283 my ($X, $Y) = $self->_topleft; 351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 352}
286 353
287sub focus_in { 354sub focus_in {
288 my ($self) = @_; 355 my ($self) = @_;
289 356
290 return if $FOCUS == $self; 357 return if $FOCUS == $self;
291 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
292 359
293 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
294 361
295 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
296 363
297 $focus->update if $focus; 364 $focus->update if $focus;
298 $FOCUS->update; 365 $FOCUS->update;
299} 366}
300 367
… …
303 370
304 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
305 372
306 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
307 374
308 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
309 376
310 $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;
311} 381}
312 382
313sub mouse_motion { } 383sub mouse_motion { }
314sub button_up { } 384sub button_up { }
315sub key_down { } 385sub key_down { }
316sub key_up { } 386sub key_up { }
317 387
318sub button_down { 388sub button_down {
319 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
320 390
321 $self->focus_in; 391 $self->focus_in;
… …
355 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
356 glPushMatrix; 426 glPushMatrix;
357 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0; 430 glVertex 0 , 0;
361 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
362 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
363 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
364 glEnd; 434 glEnd;
365 glPopMatrix; 435 glPopMatrix;
366 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;
367 } 437 }
368} 438}
369 439
370sub _draw { 440sub _draw {
371 my ($self) = @_; 441 my ($self) = @_;
… …
387 457
388sub set_parent { 458sub set_parent {
389 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
390 460
391 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
392} 468}
393 469
394sub check_size { 470sub check_size {
395 my ($self) = @_; 471 my ($self, $forced) = @_;
396 472
397 $self->{parent} 473 $self->{force_alloc} = 1 if $forced;
398 or return 1; 474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418} 475}
419 476
420sub update { 477sub update {
421 my ($self) = @_; 478 my ($self) = @_;
422 479
… …
428 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
429 486
430 push @{ $self->{signal_cb}{$signal} }, $cb; 487 push @{ $self->{signal_cb}{$signal} }, $cb;
431} 488}
432 489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
433sub emit { 496sub emit {
434 my ($self, $signal, @args) = @_; 497 my ($self, $signal, @args) = @_;
435 498
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
437} 501}
438 502
439sub DESTROY { 503sub DESTROY {
440 my ($self) = @_; 504 my ($self) = @_;
441 505
506 delete $WIDGET{$self+0};
442 #$self->deactivate; 507 #$self->deactivate;
443} 508}
444 509
445############################################################################# 510#############################################################################
446 511
… …
455 my $class = shift; 520 my $class = shift;
456 521
457 # range [value, low, high, page] 522 # range [value, low, high, page]
458 523
459 $class->SUPER::new ( 524 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 525 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 526 #active_bg => [1, 1, 1, 0.5],
462 @_ 527 @_
463 ) 528 )
464} 529}
465 530
466sub _draw { 531sub _draw {
467 my ($self) = @_; 532 my ($self) = @_;
468 533
534 my $color = $FOCUS == $self && $self->{active_bg}
535 ? $self->{active_bg}
536 : $self->{bg};
537
538 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 539 my ($w, $h) = @$self{qw(w h)};
470 540
471 glEnable GL_BLEND; 541 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 543 glColor @$color;
474 544
475 glBegin GL_QUADS; 545 glBegin GL_QUADS;
476 glVertex 0 , 0; 546 glVertex 0 , 0;
477 glVertex 0 , $h; 547 glVertex 0 , $h;
478 glVertex $w, $h; 548 glVertex $w, $h;
479 glVertex $w, 0; 549 glVertex $w, 0;
480 glEnd; 550 glEnd;
481 551
482 glDisable GL_BLEND; 552 glDisable GL_BLEND;
553 }
483} 554}
484 555
485############################################################################# 556#############################################################################
486 557
487package CFClient::UI::Empty; 558package CFClient::UI::Empty;
… …
519 590
520 $self 591 $self
521} 592}
522 593
523sub add { 594sub add {
524 my ($self, $child) = @_; 595 my ($self, @widgets) = @_;
525 596
526 $child->set_parent ($self); 597 $_->set_parent ($self)
598 for @widgets;
527 599
528 use sort 'stable'; 600 use sort 'stable';
529 601
530 $self->{children} = [ 602 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 603 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 604 @{$self->{children}}, @widgets
533 ]; 605 ];
534 606
535 $child->check_size; 607 $self->check_size (1);
608 $self->update;
536} 609}
537 610
538sub children { 611sub children {
539 @{ $_[0]{children} } 612 @{ $_[0]{children} }
540} 613}
… …
559 632
560 for (@$children) { 633 for (@$children) {
561 delete $_->{parent}; 634 delete $_->{parent};
562 $_->hide; 635 $_->hide;
563 } 636 }
637
638 $self->check_size;
639 $self->update;
564} 640}
565 641
566sub find_widget { 642sub find_widget {
567 my ($self, $x, $y) = @_; 643 my ($self, $x, $y) = @_;
568 644
… …
643} 719}
644 720
645sub update { 721sub update {
646 my ($self) = @_; 722 my ($self) = @_;
647 723
648 # we want to do this delayed... 724 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 725 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 726}
662 727
663sub size_allocate { 728sub size_allocate {
664 my ($self, $w, $h) = @_; 729 my ($self, $w, $h) = @_;
665 730
666 $self->child->configure (0, 0, $w, $h); 731 $self->SUPER::size_allocate ($w, $h);
732 $self->update;
733}
667 734
735sub _render {
736 $_[0]{children}[0]->draw;
737}
738
739sub render_child {
740 my ($self) = @_;
741
742 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
743 glClearColor 0, 0, 0, 0;
744 glClear GL_COLOR_BUFFER_BIT;
745
668 $self->render_chld; 746 $self->_render;
747 };
669} 748}
670 749
671sub _draw { 750sub _draw {
672 my ($self) = @_; 751 my ($self) = @_;
673 752
674 my ($w, $h) = ($self->w, $self->h); 753 my ($w, $h) = ($self->w, $self->h);
675 754
676 my $tex = $self->{texture} 755 my $tex = $self->{texture}
677 or return; 756 or return;
678 757
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 758 glEnable GL_TEXTURE_2D;
682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 glColor 1, 1, 1, 1;
683 761
684 $tex->draw_quad (0, 0, $w, $h); 762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 763
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 764 glDisable GL_TEXTURE_2D;
688} 765}
689 766
690############################################################################# 767#############################################################################
691 768
692package CFClient::UI::ViewPort; 769package CFClient::UI::ViewPort;
693 770
694our @ISA = CFClient::UI::Window::; 771our @ISA = CFClient::UI::Window::;
695
696sub new { die }
697
698sub size_request {
699 my ($self) = @_;
700
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
703
704 @$self{qw(child_w child_h)}
705}
706
707sub _draw {
708 my ($self) = @_;
709
710 $self->{children}[1]->draw;
711}
712
713
714#############################################################################
715
716package CFClient::UI::Frame;
717
718our @ISA = CFClient::UI::Bin::;
719
720use CFClient::OpenGL;
721 772
722sub new { 773sub new {
723 my $class = shift; 774 my $class = shift;
724 775
776 $class->SUPER::new (
777 scroll_x => 0,
778 scroll_y => 1,
779 @_,
780 )
781}
782
783sub size_request {
784 my ($self) = @_;
785
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
787
788 @$self{qw(child_w child_h)}
789}
790
791sub size_allocate {
792 my ($self, $w, $h) = @_;
793
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796
797 $self->child->configure (0, 0, $w, $h);
798 $self->update;
799}
800
801sub set_offset {
802 my ($self, $x, $y) = @_;
803
804 $self->{view_x} = int $x;
805 $self->{view_y} = int $y;
806
807 $self->update;
808}
809
810# hmm, this does not work for topleft of $self... but we should not ask for that
811sub coord2local {
812 my ($self, $x, $y) = @_;
813
814 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
815}
816
817sub coord2global {
818 my ($self, $x, $y) = @_;
819
820 $x = List::Util::min $self->{w}, $x - $self->{view_x};
821 $y = List::Util::min $self->{h}, $y - $self->{view_y};
822
823 $self->SUPER::coord2global ($x, $y)
824}
825
826sub find_widget {
827 my ($self, $x, $y) = @_;
828
829 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
830 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
831 ) {
832 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
833 } else {
834 $self->CFClient::UI::Base::find_widget ($x, $y)
835 }
836}
837
838sub _render {
839 my ($self) = @_;
840
841 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842
843 $self->SUPER::_render;
844}
845
846#############################################################################
847
848package CFClient::UI::ScrolledWindow;
849
850our @ISA = CFClient::UI::HBox::;
851
852sub new {
853 my $class = shift;
854
855 my $self;
856
857 my $slider = new CFClient::UI::Slider
858 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]);
862 },
863 ;
864
725 my $self = $class->SUPER::new ( 865 $self = $class->SUPER::new (
726 bg => [1, 1, 1, 1], 866 vp => (new CFClient::UI::ViewPort expand => 1),
727 border_bg => [1, 1, 1, 1], 867 slider => $slider,
728 border => 0.8,
729 @_ 868 @_,
730 ); 869 );
731 870
871 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp});
873 $self->add ($self->{slider});
874
732 $self 875 $self
733} 876}
734 877
878sub size_allocate {
879 my ($self, $w, $h) = @_;
880
881 $self->SUPER::size_allocate ($w, $h);
882
883 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
885}
886
887#TODO# update range on size_allocate depending on child
888# update viewport offset on scroll
889
890#############################################################################
891
892package CFClient::UI::Frame;
893
894our @ISA = CFClient::UI::Bin::;
895
896use CFClient::OpenGL;
897
898sub new {
899 my $class = shift;
900
901 $class->SUPER::new (
902 bg => undef,
903 @_,
904 )
905}
906
735sub _draw { 907sub _draw {
736 my ($self) = @_; 908 my ($self) = @_;
737 909
738 my ($w, $h) = ($self->{w}, $self->{h}); 910 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)};
739 912
740 glEnable GL_BLEND; 913 glEnable GL_BLEND;
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D; 915 glColor @{ $self->{bg} };
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 916
745# glBegin GL_QUADS; 917 glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0; 918 glVertex 0 , 0;
748# glVertex 0 , $h; 919 glVertex 0 , $h;
749# glVertex $w, $h; 920 glVertex $w, $h;
750# glVertex $w, 0; 921 glVertex $w, 0;
751# glEnd; 922 glEnd;
752 923
753
754 $self->child->draw;
755 glDisable GL_BLEND; 924 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D; 925 }
926
927 $self->SUPER::_draw;
757} 928}
758 929
759############################################################################# 930#############################################################################
760 931
761package CFClient::UI::FancyFrame; 932package CFClient::UI::FancyFrame;
… …
772 my $class = shift; 943 my $class = shift;
773 944
774 # TODO: user_x, user_y, overwrite moveto? 945 # TODO: user_x, user_y, overwrite moveto?
775 946
776 my $self = $class->SUPER::new ( 947 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 948 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 949 border_bg => [1, 1, 1, 1],
779 border => 0.8, 950 border => 0.6,
951 is_toplevel => 1,
780 can_events => 1, 952 can_events => 1,
781 @_ 953 @_
782 ); 954 );
783 955
784 $self->{title} &&= new CFClient::UI::Label 956 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 957 align => 0,
786 valign => 1, 958 valign => 1,
787 text => $self->{title}, 959 text => $self->{title},
788 fontsize => 1; 960 fontsize => $self->{border};
789 961
790 $self 962 $self
791} 963}
792 964
793sub border { 965sub border {
… …
809 my ($self, $w, $h) = @_; 981 my ($self, $w, $h) = @_;
810 982
811 $h -= List::Util::max 0, $self->border * 2; 983 $h -= List::Util::max 0, $self->border * 2;
812 $w -= List::Util::max 0, $self->border * 2; 984 $w -= List::Util::max 0, $self->border * 2;
813 985
814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
815 if $self->{title}; 987 if $self->{title};
816 988
817 $self->child->configure ($self->border, $self->border, $w, $h); 989 $self->child->configure ($self->border, $self->border, $w, $h);
818} 990}
819 991
820sub button_down { 992sub button_down {
821 my ($self, $ev, $x, $y) = @_; 993 my ($self, $ev, $x, $y) = @_;
822 994
995 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 996 my $border = $self->border;
824 997
825 if ($x < $self->{w} && $x >= $self->{w} - $border 998 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 999 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 1000
1001 if ($lr & $td) {
1002 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1003 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 1004 my ($bw, $bh) = ($self->{w}, $self->{h});
830 1005
1006 my $mx = $x < $border;
1007 my $my = $y < $border;
1008
831 $self->{motion} = sub { 1009 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 1010 my ($ev, $x, $y) = @_;
833 1011
834 ($x, $y) = ($ev->{x}, $ev->{y}); 1012 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy;
835 1014
836 $self->{user_w} = $bw + $x - $ox; 1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
838 $self->check_size; 1018 $self->check_size;
839 }; 1019 };
840 1020
841 } elsif ($x >= 0 && $x < $self->{w} 1021 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1022 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 1023 my ($bx, $by) = ($self->{x}, $self->{y});
846 1024
847 $self->{motion} = sub { 1025 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 1026 my ($ev, $x, $y) = @_;
… …
871 my ($self) = @_; 1049 my ($self) = @_;
872 1050
873 my ($w, $h ) = ($self->{w}, $self->{h}); 1051 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
875 1053
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 1054 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 1056
881 my $border = $self->border; 1057 my $border = $self->border;
882 1058
883 glColor @{ $self->{border_bg} }; 1059 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
888 1064
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
889 my $bg = $tex[0]; 1066 my $bg = $tex[0];
890 1067
891 # TODO: repeat texture not scale 1068 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 1069 my $rep_x = $cw / $bg->{w};
893 my $rep_y = $ch / $bg->{h}; 1070 my $rep_y = $ch / $bg->{h};
894 1071
895 glColor @{ $self->{bg} }; 1072 glColor @{ $self->{bg} };
896 1073
897 $bg->{s} = $rep_x; 1074 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y; 1075 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1; 1076 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 }
901 1079
902 glDisable GL_TEXTURE_2D; 1080 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 1081
905 $self->{title}->draw if $self->{title}; 1082 $self->{title}->draw if $self->{title};
1083
906 $self->child->draw; 1084 $self->child->draw;
907} 1085}
908 1086
909############################################################################# 1087#############################################################################
910 1088
… …
919sub new { 1097sub new {
920 my $class = shift; 1098 my $class = shift;
921 1099
922 $class->SUPER::new ( 1100 $class->SUPER::new (
923 col_expand => [], 1101 col_expand => [],
924 @_ 1102 @_,
925 ) 1103 )
926} 1104}
927 1105
928sub add { 1106sub add {
929 my ($self, $x, $y, $child) = @_; 1107 my ($self, $x, $y, $child) = @_;
… …
1134} 1312}
1135 1313
1136sub size_allocate { 1314sub size_allocate {
1137 my ($self, $w, $h) = @_; 1315 my ($self, $w, $h) = @_;
1138 1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1139 my $children = $self->{children}; 1319 my $children = $self->{children};
1140 1320
1141 my @h = map $_->{req_h}, @$children; 1321 my @h = map $_->{req_h}, @$children;
1142 1322
1143 my $req_h = List::Util::sum @h; 1323 my $req_h = List::Util::sum @h;
… …
1172 1352
1173############################################################################# 1353#############################################################################
1174 1354
1175package CFClient::UI::Label; 1355package CFClient::UI::Label;
1176 1356
1177our @ISA = CFClient::UI::Base::; 1357our @ISA = CFClient::UI::DrawBG::;
1178 1358
1179use CFClient::OpenGL; 1359use CFClient::OpenGL;
1180 1360
1181sub new { 1361sub new {
1182 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1183 1363
1184 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1365 fg => [1, 1, 1],
1366 #bg => none
1367 #active_bg => none
1186 #font => default_font 1368 #font => default_font
1369 #text => initial text
1370 #markup => initial narkup
1371 #max_w => maximum pixel width
1372 ellipsise => 3, # end
1373 layout => (new CFClient::Layout),
1187 fontsize => 1, 1374 fontsize => 1,
1188 text => "",
1189 align => -1, 1375 align => -1,
1190 valign => -1, 1376 valign => -1,
1191 padding => 2, 1377 padding => 2,
1192 layout => new CFClient::Layout,
1193 can_events => 0, 1378 can_events => 0,
1194 %arg 1379 %arg
1195 ); 1380 );
1196 1381
1197 if (exists $self->{template}) { 1382 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1383 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1384 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1385 $self->{template} = $layout;
1201 } 1386 }
1202 1387
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1388 if (exists $self->{markup}) {
1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1389 $self->set_markup (delete $self->{markup});
1390 } else {
1391 $self->set_text (delete $self->{text});
1392 }
1205 1393
1206 $self 1394 $self
1207} 1395}
1208 1396
1209sub escape { 1397sub escape($) {
1210 local $_ = $_[1]; 1398 local $_ = $_[0];
1211 1399
1212 s/&/&amp;/g; 1400 s/&/&amp;/g;
1213 s/>/&gt;/g; 1401 s/>/&gt;/g;
1214 s/</&lt;/g; 1402 s/</&lt;/g;
1215 1403
1216 $_[1] 1404 $_
1217} 1405}
1218 1406
1219sub update { 1407sub update {
1220 my ($self) = @_; 1408 my ($self) = @_;
1221 1409
1222 delete $self->{texture}; 1410 delete $self->{texture};
1223 $self->SUPER::update; 1411 $self->SUPER::update;
1224} 1412}
1225 1413
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1414sub set_text {
1233 my ($self, $text) = @_; 1415 my ($self, $text) = @_;
1234 1416
1235 return if $self->{text} eq "T$text"; 1417 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1418 $self->{text} = "T$text";
1237 1419
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1421 $self->{layout}->set_text ($text);
1239 1422
1240 delete $self->{texture};
1241 $self->update; 1423 $self->update;
1242 $self->check_size; 1424 $self->check_size;
1243} 1425}
1244 1426
1245sub set_markup { 1427sub set_markup {
1246 my ($self, $markup) = @_; 1428 my ($self, $markup) = @_;
1247 1429
1248 return if $self->{text} eq "M$markup"; 1430 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1431 $self->{text} = "M$markup";
1250 1432
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1436 $self->{layout}->set_markup ($markup);
1252 1437
1253 delete $self->{texture};
1254 $self->update; 1438 $self->update;
1255 $self->check_size; 1439 $self->check_size;
1256} 1440}
1257 1441
1258sub size_request { 1442sub size_request {
1259 my ($self) = @_; 1443 my ($self) = @_;
1260 1444
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1445 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1); 1446 $self->{layout}->set_width ($self->{max_w} || -1);
1447 $self->{layout}->set_ellipsise ($self->{ellipsise});
1448 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1449 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264 1450
1265 my ($w, $h) = $self->{layout}->size; 1451 my ($w, $h) = $self->{layout}->size;
1266 1452
1267 if (exists $self->{template}) { 1453 if (exists $self->{template}) {
… …
1289sub set_fontsize { 1475sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1476 my ($self, $fontsize) = @_;
1291 1477
1292 $self->{fontsize} = $fontsize; 1478 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1479 delete $self->{texture};
1480
1481 $self->update;
1294 $self->check_size; 1482 $self->check_size;
1295 $self->update;
1296} 1483}
1297 1484
1298sub _draw { 1485sub _draw {
1299 my ($self) = @_; 1486 my ($self) = @_;
1300 1487
1488 $self->SUPER::_draw; # draw background, if applicable
1489
1301 my $tex = $self->{texture} ||= do { 1490 my $tex = $self->{texture} ||= do {
1491 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1492 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{w}); 1493 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497
1305 new_from_layout CFClient::Texture $self->{layout} 1498 my $tex = new_from_layout CFClient::Texture $self->{layout};
1499
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1502 : ($self->{w} - $tex->{w}) * 0.5);
1503
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1506 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1306 }; 1509 };
1307 1510
1308 glEnable GL_BLEND;
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D; 1511 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1513
1514 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1515 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $tex->draw_quad ($self->{ox}, $self->{oy}); 1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1517 } else {
1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1519 }
1328 1520
1329 glDisable GL_TEXTURE_2D; 1521 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1522}
1332 1523
1333############################################################################# 1524#############################################################################
1334 1525
1335package CFClient::UI::EntryBase; 1526package CFClient::UI::EntryBase;
… …
1348 active_fg => [0, 0, 0], 1539 active_fg => [0, 0, 0],
1349 can_hover => 1, 1540 can_hover => 1,
1350 can_focus => 1, 1541 can_focus => 1,
1351 valign => 0, 1542 valign => 0,
1352 can_events => 1, 1543 can_events => 1,
1544 #text => ...
1353 @_ 1545 @_
1354 ) 1546 )
1355} 1547}
1356 1548
1357sub _set_text { 1549sub _set_text {
… …
1367 $self->{text} = $text; 1559 $self->{text} = $text;
1368 1560
1369 $text =~ s/./*/g if $self->{hidden}; 1561 $text =~ s/./*/g if $self->{hidden};
1370 $self->{layout}->set_text ("$text "); 1562 $self->{layout}->set_text ("$text ");
1371 1563
1372 $self->emit (changed => $self->{text}); 1564 $self->_emit (changed => $self->{text});
1373}
1374
1375sub get_text {
1376 $_[0]{text}
1377}
1378
1379sub size_request {
1380 my ($self) = @_;
1381
1382 my ($w, $h) = $self->SUPER::size_request;
1383
1384 ($w + 1, $h) # add 1 for cursor
1385}
1386
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391} 1565}
1392 1566
1393sub set_text { 1567sub set_text {
1394 my ($self, $text) = @_; 1568 my ($self, $text) = @_;
1395 1569
1396 $self->{cursor} = length $text; 1570 $self->{cursor} = length $text;
1397 $self->_set_text ($text); 1571 $self->_set_text ($text);
1398 $self->update; 1572 $self->update;
1573 $self->check_size;
1574}
1575
1576sub get_text {
1577 $_[0]{text}
1578}
1579
1580sub size_request {
1581 my ($self) = @_;
1582
1583 my ($w, $h) = $self->SUPER::size_request;
1584
1585 ($w + 1, $h) # add 1 for cursor
1399} 1586}
1400 1587
1401sub key_down { 1588sub key_down {
1402 my ($self, $ev) = @_; 1589 my ($self, $ev) = @_;
1403 1590
… …
1405 my $sym = $ev->{sym}; 1592 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 1593 my $uni = $ev->{unicode};
1407 1594
1408 my $text = $self->get_text; 1595 my $text = $self->get_text;
1409 1596
1410 if ($sym == 8) { 1597 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1598 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 1599 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 1600 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 1601 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 1602 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 1603 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1604 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 1605 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0; 1606 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) { 1607 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text; 1608 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 1609 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 1610 $self->_emit ('escape');
1424 } elsif ($uni) { 1611 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 1612 substr $text, $self->{cursor}++, 0, chr $uni;
1426 } 1613 }
1427 1614
1428 $self->_set_text ($text); 1615 $self->_set_text ($text);
1429 $self->update; 1616 $self->update;
1617 $self->check_size;
1430} 1618}
1431 1619
1432sub focus_in { 1620sub focus_in {
1433 my ($self) = @_; 1621 my ($self) = @_;
1434 1622
… …
1514 if ($sym == 13) { 1702 if ($sym == 13) {
1515 unshift @{$self->{history}}, 1703 unshift @{$self->{history}},
1516 my $txt = $self->get_text; 1704 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1; 1705 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = ''; 1706 $self->{history_saveback} = '';
1519 $self->emit (activate => $txt); 1707 $self->_emit (activate => $txt);
1520 $self->update; 1708 $self->update;
1521 1709
1522 } elsif ($sym == CFClient::SDLK_UP) { 1710 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) { 1711 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text; 1712 $self->{history_saveback} = $self->get_text;
… …
1563 my $class = shift; 1751 my $class = shift;
1564 1752
1565 $class->SUPER::new ( 1753 $class->SUPER::new (
1566 padding => 4, 1754 padding => 4,
1567 fg => [1, 1, 1], 1755 fg => [1, 1, 1],
1568 bg => [1, 1, 1, 0.2],
1569 active_fg => [0, 0, 1], 1756 active_fg => [0, 0, 1],
1570 can_hover => 1, 1757 can_hover => 1,
1571 align => 0, 1758 align => 0,
1572 valign => 0, 1759 valign => 0,
1573 can_events => 1, 1760 can_events => 1,
1574 @_ 1761 @_
1575 ) 1762 )
1576} 1763}
1577 1764
1765sub activate { }
1766
1578sub button_up { 1767sub button_up {
1579 my ($self, $ev, $x, $y) = @_; 1768 my ($self, $ev, $x, $y) = @_;
1580 1769
1770 $self->emit ("activate")
1581 if ($x >= 0 && $x < $self->{w} 1771 if $x >= 0 && $x < $self->{w}
1582 && $y >= 0 && $y < $self->{h}) { 1772 && $y >= 0 && $y < $self->{h};
1583 $self->emit ("activate");
1584 }
1585} 1773}
1586 1774
1587sub _draw { 1775sub _draw {
1588 my ($self) = @_; 1776 my ($self) = @_;
1589 1777
… …
1591 1779
1592 if ($GRAB == $self) { 1780 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg}; 1781 $self->{fg} = $self->{active_fg};
1594 } 1782 }
1595 1783
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 1784 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 1786 glColor 0, 0, 0, 1;
1601 1787
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1788 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 1789
1604 glDisable GL_TEXTURE_2D; 1790 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 1791
1607 $self->SUPER::_draw; 1792 $self->SUPER::_draw;
1608} 1793}
1609 1794
1610############################################################################# 1795#############################################################################
… …
1624 1809
1625 $class->SUPER::new ( 1810 $class->SUPER::new (
1626 padding => 2, 1811 padding => 2,
1627 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1628 active_fg => [1, 1, 0], 1813 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5],
1629 state => 0, 1816 state => 0,
1630 can_hover => 1, 1817 can_hover => 1,
1631 @_ 1818 @_
1632 ) 1819 )
1633} 1820}
… …
1642 my ($self, $ev, $x, $y) = @_; 1829 my ($self, $ev, $x, $y) = @_;
1643 1830
1644 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1645 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1646 $self->{state} = !$self->{state}; 1833 $self->{state} = !$self->{state};
1647 $self->emit (changed => $self->{state}); 1834 $self->_emit (changed => $self->{state});
1648 } 1835 }
1649} 1836}
1650 1837
1651sub _draw { 1838sub _draw {
1652 my ($self) = @_; 1839 my ($self) = @_;
… …
1657 1844
1658 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1845 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1659 1846
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 1848
1662 glEnable GL_BLEND; 1849 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850
1663 glEnable GL_TEXTURE_2D; 1851 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 1852 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 1853 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 1854}
1673 1855
1674############################################################################# 1856#############################################################################
1675 1857
1676package CFClient::UI::Image; 1858package CFClient::UI::Image;
… …
1719 glTranslate 0, -$self->{w}, 0; 1901 glTranslate 0, -$self->{w}, 0;
1720 1902
1721 ($w, $h) = ($h, $w); 1903 ($w, $h) = ($h, $w);
1722 } 1904 }
1723 1905
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 1906 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1907 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 1908
1729 $tex->draw_quad (0, 0, $w, $h); 1909 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 1910
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1733} 1912}
1734 1913
1735############################################################################# 1914#############################################################################
1736 1915
… …
1925 qw(s1_slider.png s1_slider_bg.png); 2104 qw(s1_slider.png s1_slider_bg.png);
1926 2105
1927sub new { 2106sub new {
1928 my $class = shift; 2107 my $class = shift;
1929 2108
1930 # range [value, low, high, page] 2109 # range [value, low, high, page, unit]
1931 2110
1932 # TODO: 0-width page 2111 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 2112 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 2113 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2114 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2115 fg => [1, 1, 1],
1937 active_fg => [0, 0, 0], 2116 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5],
1938 range => [0, 0, 100, 10], 2119 range => [0, 0, 100, 10, 0],
1939 req_w => 20, 2120 req_w => $::WIDTH / 80,
1940 req_h => 20, 2121 req_h => $::WIDTH / 80,
1941 vertical => 0, 2122 vertical => 0,
1942 can_hover => 1, 2123 can_hover => 1,
1943 inner_pad => 5, 2124 inner_pad => 0.02,
1944 @_ 2125 @_
1945 ); 2126 );
1946 2127
2128 $self->set_value ($self->{range}[0]);
2129 $self->update;
2130
1947 $self 2131 $self
2132}
2133
2134sub set_range {
2135 my ($self, $range) = @_;
2136
2137 $self->{range} = $range;
2138
2139 $self->update;
2140}
2141
2142sub set_value {
2143 my ($self, $value) = @_;
2144
2145 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2146
2147 $hi = $lo + 1 if $hi <= $lo;
2148
2149 $page = $hi - $lo if $page > $hi - $lo;
2150
2151 $value = $lo if $value < $lo;
2152 $value = $hi - $page if $value > $hi - $page;
2153
2154 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2155 if $unit;
2156
2157 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2158
2159 if ($value != $old_value) {
2160 $self->_emit (changed => $value);
2161 $self->update;
2162 }
1948} 2163}
1949 2164
1950sub size_request { 2165sub size_request {
1951 my ($self) = @_; 2166 my ($self) = @_;
1952 2167
… …
1958 2173
1959sub button_down { 2174sub button_down {
1960 my ($self, $ev, $x, $y) = @_; 2175 my ($self, $ev, $x, $y) = @_;
1961 2176
1962 $self->SUPER::button_down ($ev, $x, $y); 2177 $self->SUPER::button_down ($ev, $x, $y);
2178
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180
1963 $self->mouse_motion ($ev, $x, $y); 2181 $self->mouse_motion ($ev, $x, $y);
1964} 2182}
1965 2183
1966sub mouse_motion { 2184sub mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 2185 my ($self, $ev, $x, $y) = @_;
1968 2186
1969 if ($GRAB == $self) { 2187 if ($GRAB == $self) {
2188 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2189
2190 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193
2194 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2195 }
2196}
2197
2198sub update {
2199 my ($self) = @_;
2200
2201 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2202 $self->set_value ($self->{range}[0]);
2203
1970 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2204 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100;
1971 2206
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2207 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1973 2208
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2209 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2210 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1976 2211
1977 $x -= $inner_pad_px; # substract the padding 2212 $value = ($value - $lo) / $range;
1978 $x = $x * ($hi - $lo) / $inner_w + $lo; 2213 $value = $value * $self->{scale} + $self->{offset};
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 2214
1983 $self->emit (changed => $x); 2215 $self->{knob_x} = $value - $knob_w * 0.5;
1984 $self->update; 2216 $self->{knob_w} = $knob_w;
1985 } 2217 });
1986}
1987 2218
1988# the inner_* stuff is for generating a padding for the slider handle, 2219 $self->SUPER::update;
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1994} 2220}
1995 2221
1996sub _draw { 2222sub _draw {
1997 my ($self) = @_; 2223 my ($self) = @_;
1998 2224
1999 $self->SUPER::_draw (); 2225 $self->SUPER::_draw ();
2000 2226
2001 my ($w, $h) = @$self{qw(w h)}; 2227 glScale $self->{w}, $self->{h};
2002 2228
2003 if ($self->{vertical}) { 2229 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 2230 # draw a vertical slider like a rotated horizontal slider
2005 2231
2232 glTranslate 1, 0, 0;
2006 glRotate 90, 0, 0, 1; 2233 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 2234 }
2011 2235
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2236 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2237 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 2238
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2239 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2240 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2241
2038 # draw background 2242 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2243 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 2244
2041 # draw handle 2245 # draw handle
2042 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2246 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2043 2247
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2046} 2249}
2250
2251#############################################################################
2252
2253package CFClient::UI::ValSlider;
2254
2255our @ISA = CFClient::UI::HBox::;
2256
2257sub new {
2258 my ($class, %arg) = @_;
2259
2260 my $range = delete $arg{range};
2261
2262 my $self = $class->SUPER::new (
2263 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2264 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2265 to_value => sub { shift },
2266 from_value => sub { shift },
2267 %arg,
2268 );
2269
2270 $self->{slider}->connect (changed => sub {
2271 my ($self, $value) = @_;
2272 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2273 $self->{parent}->emit (changed => $value);
2274 });
2275
2276# $self->{entry}->connect (changed => sub {
2277# my ($self, $value) = @_;
2278# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2279# $self->{parent}->emit (changed => $value);
2280# });
2281
2282 $self->add ($self->{slider}, $self->{entry});
2283
2284 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2285
2286 $self
2287}
2288
2289sub set_range { shift->{slider}->set_range (@_) }
2290sub set_value { shift->{slider}->set_value (@_) }
2047 2291
2048############################################################################# 2292#############################################################################
2049 2293
2050package CFClient::UI::TextView; 2294package CFClient::UI::TextView;
2051 2295
… …
2060 fontsize => 1, 2304 fontsize => 1,
2061 can_events => 0, 2305 can_events => 0,
2062 #font => default_font 2306 #font => default_font
2063 @_, 2307 @_,
2064 2308
2065 layout => (new CFClient::Layout), 2309 layout => (new CFClient::Layout 1),
2066 par => [], 2310 par => [],
2067 height => 0, 2311 height => 0,
2068 children => [ 2312 children => [
2069 (new CFClient::UI::Empty expand => 1), 2313 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2314 (new CFClient::UI::Slider vertical => 1),
2071 ], 2315 ],
2072 ); 2316 );
2073 2317
2074 $self->{children}[1]->connect (changed => sub { 2318 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2319
2078 $self 2320 $self
2079} 2321}
2080 2322
2081sub set_fontsize { 2323sub set_fontsize {
2082 my ($self, $fontsize) = @_; 2324 my ($self, $fontsize) = @_;
2083 2325
2084 $self->{fontsize} = $fontsize; 2326 $self->{fontsize} = $fontsize;
2085 $self->reflow; 2327 $self->reflow;
2086}
2087
2088sub text_height {
2089 my ($self, $text) = @_;
2090
2091 my $layout = $self->{layout};
2092
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w});
2095 $layout->set_text ($text);
2096
2097 ($layout->size)[1]
2098}
2099
2100sub reflow {
2101 my ($self) = @_;
2102
2103 $self->{need_reflow}++;
2104 $self->update;
2105} 2328}
2106 2329
2107sub size_allocate { 2330sub size_allocate {
2108 my ($self, $w, $h) = @_; 2331 my ($self, $w, $h) = @_;
2109 2332
… …
2114 $self->{layout}->set_width ($self->{children}[0]{w}); 2337 $self->{layout}->set_width ($self->{children}[0]{w});
2115 2338
2116 $self->reflow; 2339 $self->reflow;
2117} 2340}
2118 2341
2342sub text_size {
2343 my ($self, $text, $indent) = @_;
2344
2345 my $layout = $self->{layout};
2346
2347 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2348 $layout->set_width ($self->{children}[0]{w} - $indent);
2349 $layout->set_markup ($text);
2350
2351 $layout->size
2352}
2353
2354sub reflow {
2355 my ($self) = @_;
2356
2357 $self->{need_reflow}++;
2358 $self->update;
2359}
2360
2361sub set_offset {
2362 my ($self, $offset) = @_;
2363
2364 # todo: base offset on lines or so, not on pixels
2365 $self->{children}[1]->set_value ($offset);
2366}
2367
2368sub clear {
2369 my ($self) = @_;
2370
2371 $self->{par} = [];
2372 $self->{height} = 0;
2373 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2374}
2375
2119sub add_paragraph { 2376sub add_paragraph {
2120 my ($self, $color, $text) = @_; 2377 my ($self, $color, $text, $indent) = @_;
2121 2378
2122 #TODO: intelligently "reformat" paragraph 2379 for my $line (split /\n/, $text) {
2123 2380 my ($w, $h) = $self->text_size ($line);
2124 my $height = $self->text_height ($text);
2125
2126 $self->{height} += $height; 2381 $self->{height} += $h;
2382 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2383 }
2127 2384
2128 push @{$self->{par}}, [$height, $color, $text];
2129
2130 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2385 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2131 $self->{children}[1]->update;
2132} 2386}
2133 2387
2134sub update { 2388sub update {
2135 my ($self) = @_; 2389 my ($self) = @_;
2136 2390
… …
2138 2392
2139 return unless $self->{h} > 0; 2393 return unless $self->{h} > 0;
2140 2394
2141 delete $self->{texture}; 2395 delete $self->{texture};
2142 2396
2143 $ROOT->on_refresh ($self, sub { 2397 $ROOT->on_post_alloc ($self, sub {
2398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399
2144 if (delete $self->{need_reflow}) { 2400 if (delete $self->{need_reflow}) {
2145 my $height = 0; 2401 my $height = 0;
2146 2402
2147 $height += $_->[0] = $self->text_height ($_->[2]) 2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406
2148 for @{$self->{par}}; 2407 for (@{$self->{par}}) {
2408 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2409 $layout->set_width ($W - $_->[3]);
2410 $layout->set_markup ($_->[4]);
2411 my ($w, $h) = $layout->size;
2412 $_->[0] = $w + $_->[3];
2413 $_->[1] = $h;
2414 }
2415
2416 $height += $_->[1];
2417 }
2149 2418
2150 $self->{height} = $height; 2419 $self->{height} = $height;
2151 2420
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2421 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2153 2422
2154 delete $self->{texture}; 2423 delete $self->{texture};
2155 } 2424 }
2156 2425
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2158 glClearColor 0, 0, 0, 1; 2427 glClearColor 0.5, 0.5, 0.5, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2428 glClear GL_COLOR_BUFFER_BIT;
2160 2429
2430 my $top = int $self->{children}[1]{range}[0];
2431
2432 my $y0 = $top;
2433 my $y1 = $top + $H;
2434
2435 my $y = 0;
2436
2437 my $layout = $self->{layout};
2438
2439 $layout->set_font ($self->{font}) if $self->{font};
2440
2161 glEnable GL_BLEND; 2441 glEnable GL_BLEND;
2442 #TODO# not correct in windows where rgba is forced off
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2443 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165
2166 my $top = int $self->{children}[1]{range}[0];
2167
2168 my $y0 = $top;
2169 my $y1 = $top + $self->{h};
2170
2171 my $y = 0;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176 2444
2177 for my $par (@{$self->{par}}) { 2445 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0]; 2446 my $h = $par->[1];
2179 2447
2180 if ($y0 < $y + $h && $y < $y1) { 2448 if ($y0 < $y + $h && $y < $y1) {
2449 $layout->set_foreground (@{ $par->[2] });
2450 $layout->set_width ($W - $par->[3]);
2181 $layout->set_text ($par->[2]); 2451 $layout->set_markup ($par->[4]);
2182 2452
2183 glColor @{ $par->[1] }; 2453 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2184 my ($W, $H) = $layout->size; 2454
2185 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2455 glRasterPos $par->[3], $y - $y0;
2456 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2186 } 2457 }
2187 2458
2188 $y += $h; 2459 $y += $h;
2189 } 2460 }
2190 2461
2191 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND; 2462 glDisable GL_BLEND;
2193 }; 2463 };
2194 }); 2464 });
2195} 2465}
2196 2466
2197sub _draw { 2467sub _draw {
2198 my ($self) = @_; 2468 my ($self) = @_;
2199 2469
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 2470 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2472 glColor 1, 1, 1, 1;
2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2473 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2205 glDisable GL_TEXTURE_2D; 2474 glDisable GL_TEXTURE_2D;
2206 }
2207 2475
2208 $self->{children}[1]->draw; 2476 $self->{children}[1]->draw;
2209 2477
2210} 2478}
2211 2479
… …
2279 2547
2280 # TODO: use animation 2548 # TODO: use animation
2281 if ($self->{state} = !$self->{state}) { 2549 if ($self->{state} = !$self->{state}) {
2282 $CFClient::UI::ROOT->add ($self->{other}); 2550 $CFClient::UI::ROOT->add ($self->{other});
2283 $self->{other}->move ($self->coord2global (0, $self->{h})); 2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2284 $self->emit ("open"); 2552 $self->_emit ("open");
2285 } else { 2553 } else {
2286 $CFClient::UI::ROOT->remove ($self->{other}); 2554 $CFClient::UI::ROOT->remove ($self->{other});
2287 $self->emit ("close"); 2555 $self->_emit ("close");
2288 } 2556 }
2289 2557
2290 $self->emit (changed => $self->{state}); 2558 $self->_emit (changed => $self->{state});
2291} 2559}
2292 2560
2293############################################################################# 2561#############################################################################
2294 2562
2295package CFClient::UI::Tooltip; 2563package CFClient::UI::Tooltip;
… …
2305 @_, 2573 @_,
2306 can_events => 0, 2574 can_events => 0,
2307 ) 2575 )
2308} 2576}
2309 2577
2310sub set_markup { 2578sub set_tooltip_from {
2311 my ($self, $text) = @_; 2579 my ($self, $widget) = @_;
2312 2580
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2581 $self->add (new CFClient::UI::Label
2314 $self->{label}->set_markup ($text); 2582 markup => $widget->{tooltip},
2315 $self->add ($self->{label}); 2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8,
2585 fg => [0, 0, 0, 1],
2586 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP),
2588 );
2316} 2589}
2317 2590
2318sub size_request { 2591sub size_request {
2319 my ($self) = @_; 2592 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322 2593
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2594 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 2595
2325 ($w + 4, $h + 4) 2596 ($w + 4, $h + 4)
2326} 2597}
… …
2332} 2603}
2333 2604
2334sub _draw { 2605sub _draw {
2335 my ($self) = @_; 2606 my ($self) = @_;
2336 2607
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 2608 glTranslate 0.375, 0.375;
2339 2609
2340 my ($w, $h) = @$self{qw(w h)}; 2610 my ($w, $h) = @$self{qw(w h)};
2341 2611
2342 glColor 1, 0.8, 0.4; 2612 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 2623 glVertex 0 , $h;
2354 glVertex $w, $h; 2624 glVertex $w, $h;
2355 glVertex $w, 0; 2625 glVertex $w, 0;
2356 glEnd; 2626 glEnd;
2357 2627
2358 glPopMatrix; 2628 glTranslate 2 - 0.375, 2 - 0.375;
2359
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 2629 $self->SUPER::_draw;
2362} 2630}
2363 2631
2364############################################################################# 2632#############################################################################
2365 2633
… …
2370use CFClient::OpenGL; 2638use CFClient::OpenGL;
2371 2639
2372sub new { 2640sub new {
2373 my $class = shift; 2641 my $class = shift;
2374 2642
2375 $class->SUPER::new ( 2643 my $self = $class->SUPER::new (
2376 aspect => 1, 2644 aspect => 1,
2645 can_events => 0,
2377 @_, 2646 @_,
2378 ) 2647 );
2648
2649 if ($self->{anim} && $self->{animspeed}) {
2650 Scalar::Util::weaken (my $widget = $self);
2651
2652 $self->{timer} = Event->timer (
2653 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2654 hard => 1,
2655 interval => $self->{animspeed},
2656 cb => sub {
2657 ++$widget->{frame};
2658 $widget->update;
2659 },
2660 );
2661 }
2662
2663 $self
2379} 2664}
2380 2665
2381sub size_request { 2666sub size_request {
2382 (32, 8) 2667 (32, 8)
2383} 2668}
2384 2669
2670sub update {
2671 my ($self) = @_;
2672
2673 return unless $self->{visible};
2674
2675 $self->SUPER::update;
2676}
2677
2385sub draw { 2678sub _draw {
2386 my ($self) = @_; 2679 my ($self) = @_;
2387 2680
2681 return unless $::CONN;
2682
2683 my $face;
2684
2685 if ($self->{frame}) {
2686 my $anim = $::CONN->{anim}[$self->{anim}];
2687
2688 $face = $anim->[ $self->{frame} % @$anim ]
2689 if $anim && @$anim;
2690 }
2691
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2389 2693
2390 if ($tex) { 2694 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2695 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 2697 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 2699 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 } 2700 }
2701}
2702
2703sub DESTROY {
2704 my ($self) = @_;
2705
2706 $self->{timer}->cancel
2707 if $self->{timer};
2708
2709 $self->SUPER::DESTROY;
2400} 2710}
2401 2711
2402############################################################################# 2712#############################################################################
2403 2713
2714package CFClient::UI::InventoryItem;
2715
2716our @ISA = CFClient::UI::HBox::;
2717
2718sub new {
2719 my $class = shift;
2720
2721 my %args = @_;
2722
2723 my $item = delete $args{item};
2724
2725 my $desc = CFClient::Item::desc_string $item;
2726
2727 my $self = $class->SUPER::new (
2728 can_hover => 1,
2729 can_events => 1,
2730 tooltip => ((CFClient::UI::Label::escape $desc)
2731 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732 connect_button_down => sub {
2733 my ($self, $ev, $x, $y) = @_;
2734
2735 # todo: maybe put examine on 1? but should just be a tooltip :(
2736 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737 my $targ = $::CONN->{player}{tag};
2738
2739 if ($item->{container} == $::CONN->{player}{tag}) {
2740 $targ = $main::OPENCONT;
2741 }
2742
2743 $::CONN->send ("move $targ $item->{tag} 0");
2744 } elsif ($ev->{button} == 1) {
2745 $::CONN->send ("examine $item->{tag}");
2746 } elsif ($ev->{button} == 2) {
2747 $::CONN->send ("apply $item->{tag}");
2748 } elsif ($ev->{button} == 3) {
2749 my @menu_items = (
2750 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753 (
2754 $item->{flags} & Crossfire::Protocol::F_LOCKED
2755 ? (
2756 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757 )
2758 : (
2759 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761 )
2762 ),
2763 );
2764
2765 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766 }
2767
2768 1
2769 },
2770 %args
2771 );
2772
2773
2774 $self->add (new CFClient::UI::Face
2775 can_events => 0,
2776 face => $item->{face},
2777 anim => $item->{anim},
2778 animspeed => $item->{animspeed},
2779 );
2780
2781 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783 $self->{item} = $item;
2784
2785 $self->update_item;
2786
2787 $self
2788}
2789
2790sub update_item {
2791 my ($self) = @_;
2792
2793 my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795 $self->{name_lbl}->set_text ($desc);
2796}
2797
2798#############################################################################
2799
2800package CFClient::UI::Inventory;
2801
2802our @ISA = CFClient::UI::ScrolledWindow::;
2803
2804sub new {
2805 my $class = shift;
2806
2807 my $self = $class->SUPER::new (
2808 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2809 @_,
2810 );
2811
2812 $self
2813}
2814
2815sub set_items {
2816 my ($self, $items) = @_;
2817
2818 $self->{scrolled}->clear;
2819 return unless $items;
2820
2821 my @items = sort {
2822 ($a->{type} <=> $b->{type})
2823 or ($a->{name} cmp $b->{name})
2824 } @$items;
2825
2826 $self->{real_items} = \@items;
2827
2828 my $row = 0;
2829 for my $item (@items) {
2830 CFClient::Item::update_widgets $item;
2831
2832 $self->{scrolled}->add (0, $row, $item->{face_widget});
2833 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2834 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2835
2836 $row++;
2837 }
2838
2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840}
2841
2842sub size_request {
2843 my ($self) = @_;
2844 ($self->{req_w}, $self->{req_h});
2845}
2846
2847#############################################################################
2848
2849package CFClient::UI::Menu;
2850
2851our @ISA = CFClient::UI::FancyFrame::;
2852
2853use CFClient::OpenGL;
2854
2855sub new {
2856 my $class = shift;
2857
2858 my $self = $class->SUPER::new (
2859 items => [],
2860 z => 100,
2861 @_,
2862 );
2863
2864 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2865
2866 for my $item (@{ $self->{items} }) {
2867 my ($widget, $cb) = @$item;
2868
2869 # handle various types of items, only text for now
2870 if (!ref $widget) {
2871 $widget = new CFClient::UI::Label
2872 can_hover => 1,
2873 can_events => 1,
2874 text => $widget;
2875 }
2876
2877 $self->{item}{$widget} = $item;
2878
2879 $self->{vbox}->add ($widget);
2880 }
2881
2882 $self
2883}
2884
2885# popup given the event (must be a mouse button down event currently)
2886sub popup {
2887 my ($self, $ev) = @_;
2888
2889 $self->_emit ("popdown");
2890
2891 # maybe save $GRAB? must be careful about events...
2892 $GRAB = $self;
2893 $self->{button} = $ev->{button};
2894
2895 $self->show;
2896 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2897}
2898
2899sub mouse_motion {
2900 my ($self, $ev, $x, $y) = @_;
2901
2902 # TODO: should use vbox->find_widget or so
2903 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2904 $self->{hover} = $self->{item}{$HOVER};
2905}
2906
2907sub button_up {
2908 my ($self, $ev, $x, $y) = @_;
2909
2910 if ($ev->{button} == $self->{button}) {
2911 undef $GRAB;
2912 $self->hide;
2913
2914 $self->_emit ("popdown");
2915 $self->{hover}[1]->() if $self->{hover};
2916 }
2917}
2918
2919#############################################################################
2920
2921package CFClient::UI::Statusbox;
2922
2923our @ISA = CFClient::UI::VBox::;
2924
2925sub new {
2926 my $class = shift;
2927
2928 $class->SUPER::new (
2929 fontsize => 0.8,
2930 @_,
2931 )
2932}
2933
2934sub reorder {
2935 my ($self) = @_;
2936 my $NOW = time;
2937
2938 while (my ($k, $v) = each %{ $self->{item} }) {
2939 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2940 }
2941
2942 my @widgets;
2943
2944 my @items = sort {
2945 $a->{pri} <=> $b->{pri}
2946 or $b->{id} <=> $a->{id}
2947 } values %{ $self->{item} };
2948
2949 my $count = 10 + 1;
2950 for my $item (@items) {
2951 last unless --$count;
2952
2953 push @widgets, $item->{label} ||= do {
2954 # TODO: doesn't handle markup well (read as: at all)
2955 my $short = $item->{count} > 1
2956 ? "<b>$item->{count} ×</b> $item->{text}"
2957 : $item->{text};
2958
2959 for ($short) {
2960 s/^\s+//;
2961 s/\s+/ /g;
2962 }
2963
2964 new CFClient::UI::Label
2965 markup => $short,
2966 tooltip => $item->{tooltip},
2967 tooltip_font => $::FONT_PROP,
2968 tooltip_width => 0.67,
2969 fontsize => $item->{fontsize} || $self->{fontsize},
2970 max_w => $::WIDTH * 0.44,
2971 fg => $item->{fg},
2972 can_events => 1,
2973 can_hover => 1
2974 };
2975 }
2976
2977 $self->clear;
2978 $self->SUPER::add (reverse @widgets);
2979}
2980
2981sub add {
2982 my ($self, $text, %arg) = @_;
2983
2984 $text =~ s/^\s+//;
2985 $text =~ s/\s+$//;
2986
2987 return unless $text;
2988
2989 my $timeout = time + ((delete $arg{timeout}) || 60);
2990
2991 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2992
2993 if (my $item = $self->{item}{$group}) {
2994 if ($item->{text} eq $text) {
2995 $item->{count}++;
2996 } else {
2997 $item->{count} = 1;
2998 $item->{text} = $item->{tooltip} = $text;
2999 }
3000 $item->{id} = ++$self->{id};
3001 $item->{timeout} = $timeout;
3002 delete $item->{label};
3003 } else {
3004 $self->{item}{$group} = {
3005 id => ++$self->{id},
3006 text => $text,
3007 timeout => $timeout,
3008 tooltip => $text,
3009 fg => [0.8, 0.8, 0.8, 0.8],
3010 pri => 0,
3011 count => 1,
3012 %arg,
3013 };
3014 }
3015
3016 $self->reorder;
3017}
3018
3019sub reconfigure {
3020 my ($self) = @_;
3021
3022 delete $_->{label}
3023 for values %{ $self->{item} || {} };
3024
3025 $self->reorder;
3026 $self->SUPER::reconfigure;
3027}
3028
3029#############################################################################
3030
2404package CFClient::UI::Root; 3031package CFClient::UI::Root;
2405 3032
2406our @ISA = CFClient::UI::Container::; 3033our @ISA = CFClient::UI::Container::;
2407 3034
2408use CFClient::OpenGL; 3035use CFClient::OpenGL;
2409 3036
2410sub check_size { 3037sub new {
2411 my ($self) = @_; 3038 my $class = shift;
2412 3039
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3040 $class->SUPER::new (
2414} 3041 @_,
2415 3042 )
2416sub size_request {
2417 ($::WIDTH, $::HEIGHT)
2418} 3043}
2419 3044
2420sub configure { 3045sub configure {
2421 my ($self, $x, $y, $w, $h) = @_; 3046 my ($self, $x, $y, $w, $h) = @_;
2422 3047
2423 $self->SUPER::configure ($x, $y, $w, $h); 3048 $self->{w} = $w;
3049 $self->{h} = $h;
3050}
2424 3051
3052sub check_size {
3053 my ($self) = @_;
3054
3055 $self->size_allocate ($self->{w}, $self->{h})
3056 if $self->{w};
3057}
3058
3059sub size_request {
3060 my ($self) = @_;
3061
3062 ($self->{w}, $self->{h})
3063}
3064
3065sub size_allocate {
3066 my ($self, $w, $h) = @_;
3067
2425 for my $child (@{$self->{children}}) { 3068 for my $child ($self->children) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3069 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427 3070
3071 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3072 if exists $child->{req_x};
3073
3074 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3075 if exists $child->{req_y};
3076
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3077 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3078 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079
2430 $child->configure ($X, $Y, $W,$H); 3080 $child->configure ($X, $Y, $W, $H);
2431 } 3081 }
2432} 3082}
2433 3083
2434sub _topleft { 3084sub coord2local {
2435 my ($self, $x, $y) = @_; 3085 my ($self, $x, $y) = @_;
2436 3086
2437 ($x, $y) 3087 ($x, $y)
2438} 3088}
2439 3089
3090sub coord2global {
3091 my ($self, $x, $y) = @_;
3092
3093 ($x, $y)
3094}
3095
2440sub update { 3096sub update {
2441 my ($self) = @_; 3097 my ($self) = @_;
2442 3098
2443 $self->check_size; 3099 $self->check_size;
2444 ::refresh (); 3100 $::WANT_REFRESH++;
2445} 3101}
2446 3102
2447sub add { 3103sub add {
2448 my ($self, $child) = @_; 3104 my ($self, @children) = @_;
2449 3105
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111
3112 for my $child (@children) {
3113 $child->{is_toplevel} = 1;
3114
2450 # integerize window positions 3115 # integerise window positions
2451 $child->{x} = int $child->{x}; 3116 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y}; 3117 $child->{y} = int $child->{y};
3118 }
2453 3119
2454 $self->SUPER::add ($child); 3120 $self->SUPER::add (@children);
3121}
3122
3123sub remove {
3124 my ($self, @children) = @_;
3125
3126 $self->SUPER::remove (@children);
3127
3128 while (@children) {
3129 my $w = pop @children;
3130 push @children, $w->children;
3131 $w->set_invisible;
3132 }
2455} 3133}
2456 3134
2457sub on_refresh { 3135sub on_refresh {
2458 my ($self, $id, $cb) = @_; 3136 my ($self, $id, $cb) = @_;
2459 3137
2460 $self->{refresh_hook}{$id} = $cb; 3138 $self->{refresh_hook}{$id} = $cb;
2461} 3139}
2462 3140
3141sub on_post_alloc {
3142 my ($self, $id, $cb) = @_;
3143
3144 $self->{post_alloc_hook}{$id} = $cb;
3145}
3146
2463sub draw { 3147sub draw {
2464 my ($self) = @_; 3148 my ($self) = @_;
2465 3149
2466 while (my $rcb = delete $self->{refresh_hook}) { 3150 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 3151 $_->()
3152 for values %{delete $self->{refresh_hook}};
3153 }
3154
3155 if ($self->{check_size}) {
3156 my @queue = ([], []);
3157
3158 for (;;) {
3159 if ($self->{check_size}) {
3160 # heuristic: check containers last
3161 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3162 for values %{delete $self->{check_size}}
3163 }
3164
3165 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3166
3167 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3168 ? @$widget{qw(user_w user_h)}
3169 : $widget->size_request;
3170
3171 if (delete $widget->{force_alloc}
3172 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174
3175 $widget->{req_w} = $w;
3176 $widget->{req_h} = $h;
3177
3178 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3179
3180 $widget->{parent}->check_size
3181 if $widget->{parent};
3182 }
3183 }
3184 }
3185
3186 while ($self->{size_alloc}) {
3187 for (values %{delete $self->{size_alloc}}) {
3188 my ($widget, $w, $h) = @$_;
3189
3190 $w = 0 if $w < 0;
3191 $h = 0 if $h < 0;
3192
3193 $widget->{w} = $w;
3194 $widget->{h} = $h;
3195 $widget->emit (size_allocate => $w, $h);
3196 }
3197 }
3198
3199 while ($self->{post_alloc_hook}) {
3200 $_->()
3201 for values %{delete $self->{post_alloc_hook}};
2468 } 3202 }
2469 3203
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3204 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3205 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 3206 glClear GL_COLOR_BUFFER_BIT;
2473 3207
2474 glMatrixMode GL_PROJECTION; 3208 glMatrixMode GL_PROJECTION;
2475 glLoadIdentity; 3209 glLoadIdentity;
2476 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3210 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2477 glMatrixMode GL_MODELVIEW; 3211 glMatrixMode GL_MODELVIEW;
2478 glLoadIdentity; 3212 glLoadIdentity;
2479 3213
2480 $self->_draw; 3214 $self->_draw;
2481} 3215}
… …
2483############################################################################# 3217#############################################################################
2484 3218
2485package CFClient::UI; 3219package CFClient::UI;
2486 3220
2487$ROOT = new CFClient::UI::Root; 3221$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 3222$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2489 3223
24901 32241
2491 3225

Diff Legend

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