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.167 by elmex, Mon Apr 24 08:44:23 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
314sub children {
315}
316
241sub set_max_size { 317sub set_max_size {
242 my ($self, $w, $h) = @_; 318 my ($self, $w, $h) = @_;
243 319
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 322}
247 323
248# return top left coordinates 324sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 325 my ($self, $tooltip) = @_;
251 326
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 327 $tooltip =~ s/^\s+//;
328 $tooltip =~ s/\s+$//;
329
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 }
253} 338}
254 339
255# translate global coordinates to local coordinate system 340# translate global coordinates to local coordinate system
256sub coord2local { 341sub coord2local {
257 my ($self, $x, $y) = @_; 342 my ($self, $x, $y) = @_;
258 343
259 my ($X, $Y) = $self->_topleft; 344 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 345}
262 346
263# translate local coordinates to global coordinate system 347# translate local coordinates to global coordinate system
264sub coord2global { 348sub coord2global {
265 my ($self, $x, $y) = @_; 349 my ($self, $x, $y) = @_;
266 350
267 my ($X, $Y) = $self->_topleft; 351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 352}
270 353
271sub focus_in { 354sub focus_in {
272 my ($self) = @_; 355 my ($self) = @_;
273 356
274 return if $FOCUS == $self; 357 return if $FOCUS == $self;
275 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
276 359
277 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
278 361
279 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
280 363
281 $focus->update if $focus; 364 $focus->update if $focus;
282 $FOCUS->update; 365 $FOCUS->update;
283} 366}
284 367
… …
287 370
288 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
289 372
290 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
291 374
292 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
293 376
294 $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;
295} 381}
296 382
297sub mouse_motion { } 383sub mouse_motion { }
298sub button_up { } 384sub button_up { }
299sub key_down { } 385sub key_down { }
300sub key_up { } 386sub key_up { }
301 387
302sub button_down { 388sub button_down {
303 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
304 390
305 $self->focus_in; 391 $self->focus_in;
… …
339 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix; 426 glPushMatrix;
341 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0; 430 glVertex 0 , 0;
345 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
346 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
347 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
348 glEnd; 434 glEnd;
349 glPopMatrix; 435 glPopMatrix;
350 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;
351 } 437 }
352} 438}
353 439
354sub _draw { 440sub _draw {
355 my ($self) = @_; 441 my ($self) = @_;
… …
371 457
372sub set_parent { 458sub set_parent {
373 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
374 460
375 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;
376} 468}
377 469
378sub check_size { 470sub check_size {
379 my ($self) = @_; 471 my ($self, $forced) = @_;
380 472
381 $self->{parent} 473 $self->{force_alloc} = 1 if $forced;
382 or return 1; 474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402} 475}
403 476
404sub update { 477sub update {
405 my ($self) = @_; 478 my ($self) = @_;
406 479
… …
412 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
413 486
414 push @{ $self->{signal_cb}{$signal} }, $cb; 487 push @{ $self->{signal_cb}{$signal} }, $cb;
415} 488}
416 489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
417sub emit { 496sub emit {
418 my ($self, $signal, @args) = @_; 497 my ($self, $signal, @args) = @_;
419 498
420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
421} 501}
422 502
423sub DESTROY { 503sub DESTROY {
424 my ($self) = @_; 504 my ($self) = @_;
425 505
506 delete $WIDGET{$self+0};
426 #$self->deactivate; 507 #$self->deactivate;
427} 508}
428 509
429############################################################################# 510#############################################################################
430 511
… …
439 my $class = shift; 520 my $class = shift;
440 521
441 # range [value, low, high, page] 522 # range [value, low, high, page]
442 523
443 $class->SUPER::new ( 524 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 525 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 526 #active_bg => [1, 1, 1, 0.5],
446 @_ 527 @_
447 ) 528 )
448} 529}
449 530
450sub _draw { 531sub _draw {
451 my ($self) = @_; 532 my ($self) = @_;
452 533
534 my $color = $FOCUS == $self && $self->{active_bg}
535 ? $self->{active_bg}
536 : $self->{bg};
537
538 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 539 my ($w, $h) = @$self{qw(w h)};
454 540
455 glEnable GL_BLEND; 541 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 543 glColor @$color;
458 544
459 glBegin GL_QUADS; 545 glBegin GL_QUADS;
460 glVertex 0 , 0; 546 glVertex 0 , 0;
461 glVertex 0 , $h; 547 glVertex 0 , $h;
462 glVertex $w, $h; 548 glVertex $w, $h;
463 glVertex $w, 0; 549 glVertex $w, 0;
464 glEnd; 550 glEnd;
465 551
466 glDisable GL_BLEND; 552 glDisable GL_BLEND;
553 }
467} 554}
468 555
469############################################################################# 556#############################################################################
470 557
471package CFClient::UI::Empty; 558package CFClient::UI::Empty;
… …
503 590
504 $self 591 $self
505} 592}
506 593
507sub add { 594sub add {
508 my ($self, $child) = @_; 595 my ($self, @widgets) = @_;
509 596
510 $child->set_parent ($self); 597 $_->set_parent ($self)
598 for @widgets;
511 599
512 use sort 'stable'; 600 use sort 'stable';
513 601
514 $self->{children} = [ 602 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 603 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 604 @{$self->{children}}, @widgets
517 ]; 605 ];
518 606
519 $child->check_size; 607 $self->check_size (1);
608 $self->update;
609}
610
611sub children {
612 @{ $_[0]{children} }
520} 613}
521 614
522sub remove { 615sub remove {
523 my ($self, $child) = @_; 616 my ($self, $child) = @_;
524 617
… …
539 632
540 for (@$children) { 633 for (@$children) {
541 delete $_->{parent}; 634 delete $_->{parent};
542 $_->hide; 635 $_->hide;
543 } 636 }
637
638 $self->check_size;
639 $self->update;
544} 640}
545 641
546sub find_widget { 642sub find_widget {
547 my ($self, $x, $y) = @_; 643 my ($self, $x, $y) = @_;
548 644
… …
623} 719}
624 720
625sub update { 721sub update {
626 my ($self) = @_; 722 my ($self) = @_;
627 723
628 # we want to do this delayed... 724 $ROOT->on_post_alloc ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 725 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 726}
642 727
643sub size_allocate { 728sub size_allocate {
644 my ($self, $w, $h) = @_; 729 my ($self, $w, $h) = @_;
645 730
646 $self->child->configure (0, 0, $w, $h); 731 $self->SUPER::size_allocate ($w, $h);
732 $self->update;
733}
647 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
648 $self->render_chld; 746 $self->_render;
747 };
649} 748}
650 749
651sub _draw { 750sub _draw {
652 my ($self) = @_; 751 my ($self) = @_;
653 752
654 my ($w, $h) = ($self->w, $self->h); 753 my ($w, $h) = ($self->w, $self->h);
655 754
656 my $tex = $self->{texture} 755 my $tex = $self->{texture}
657 or return; 756 or return;
658 757
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 758 glEnable GL_TEXTURE_2D;
662 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;
663 761
664 $tex->draw_quad (0, 0, $w, $h); 762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 763
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 764 glDisable GL_TEXTURE_2D;
668} 765}
669 766
670############################################################################# 767#############################################################################
671 768
672package CFClient::UI::ViewPort; 769package CFClient::UI::ViewPort;
673 770
674our @ISA = CFClient::UI::Window::; 771our @ISA = CFClient::UI::Window::;
675
676sub new { die }
677
678sub size_request {
679 my ($self) = @_;
680
681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
683
684 @$self{qw(child_w child_h)}
685}
686
687sub _draw {
688 my ($self) = @_;
689
690 $self->{children}[1]->draw;
691}
692
693
694#############################################################################
695
696package CFClient::UI::Frame;
697
698our @ISA = CFClient::UI::Bin::;
699
700use CFClient::OpenGL;
701 772
702sub new { 773sub new {
703 my $class = shift; 774 my $class = shift;
704 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
705 my $self = $class->SUPER::new ( 865 $self = $class->SUPER::new (
706 bg => [1, 1, 1, 1], 866 vp => (new CFClient::UI::ViewPort expand => 1),
707 border_bg => [1, 1, 1, 1], 867 slider => $slider,
708 border => 0.8,
709 @_ 868 @_,
710 ); 869 );
711 870
871 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp});
873 $self->add ($self->{slider});
874
712 $self 875 $self
713} 876}
714 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
715sub _draw { 907sub _draw {
716 my ($self) = @_; 908 my ($self) = @_;
717 909
718 my ($w, $h) = ($self->{w}, $self->{h}); 910 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)};
719 912
720 glEnable GL_BLEND; 913 glEnable GL_BLEND;
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722 glEnable GL_TEXTURE_2D; 915 glColor @{ $self->{bg} };
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724 916
725# glBegin GL_QUADS; 917 glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0; 918 glVertex 0 , 0;
728# glVertex 0 , $h; 919 glVertex 0 , $h;
729# glVertex $w, $h; 920 glVertex $w, $h;
730# glVertex $w, 0; 921 glVertex $w, 0;
731# glEnd; 922 glEnd;
732 923
733
734 $self->child->draw;
735 glDisable GL_BLEND; 924 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D; 925 }
926
927 $self->SUPER::_draw;
737} 928}
738 929
739############################################################################# 930#############################################################################
740 931
741package CFClient::UI::FancyFrame; 932package CFClient::UI::FancyFrame;
… …
752 my $class = shift; 943 my $class = shift;
753 944
754 # TODO: user_x, user_y, overwrite moveto? 945 # TODO: user_x, user_y, overwrite moveto?
755 946
756 my $self = $class->SUPER::new ( 947 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 948 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 949 border_bg => [1, 1, 1, 1],
759 border => 0.8, 950 border => 0.6,
951 is_toplevel => 1,
760 can_events => 1, 952 can_events => 1,
761 @_ 953 @_
762 ); 954 );
763 955
764 $self->{title} &&= new CFClient::UI::Label 956 $self->{title} &&= new CFClient::UI::Label
765 align => 0, 957 align => 0,
766 valign => 1, 958 valign => 1,
767 text => $self->{title}, 959 text => $self->{title},
768 fontsize => 1; 960 fontsize => $self->{border};
769 961
770 $self 962 $self
771} 963}
772 964
773sub border { 965sub border {
… …
789 my ($self, $w, $h) = @_; 981 my ($self, $w, $h) = @_;
790 982
791 $h -= List::Util::max 0, $self->border * 2; 983 $h -= List::Util::max 0, $self->border * 2;
792 $w -= List::Util::max 0, $self->border * 2; 984 $w -= List::Util::max 0, $self->border * 2;
793 985
794 $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)
795 if $self->{title}; 987 if $self->{title};
796 988
797 $self->child->configure ($self->border, $self->border, $w, $h); 989 $self->child->configure ($self->border, $self->border, $w, $h);
798} 990}
799 991
800sub button_down { 992sub button_down {
801 my ($self, $ev, $x, $y) = @_; 993 my ($self, $ev, $x, $y) = @_;
802 994
995 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 996 my $border = $self->border;
804 997
805 if ($x < $self->{w} && $x >= $self->{w} - $border 998 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 999 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 1000
1001 if ($lr & $td) {
1002 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1003 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 1004 my ($bw, $bh) = ($self->{w}, $self->{h});
810 1005
1006 my $mx = $x < $border;
1007 my $my = $y < $border;
1008
811 $self->{motion} = sub { 1009 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 1010 my ($ev, $x, $y) = @_;
813 1011
814 ($x, $y) = ($ev->{x}, $ev->{y}); 1012 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy;
815 1014
816 $self->{user_w} = $bw + $x - $ox; 1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
818 $self->check_size; 1018 $self->check_size;
819 }; 1019 };
820 1020
821 } elsif ($x >= 0 && $x < $self->{w} 1021 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1022 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 1023 my ($bx, $by) = ($self->{x}, $self->{y});
826 1024
827 $self->{motion} = sub { 1025 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 1026 my ($ev, $x, $y) = @_;
… …
851 my ($self) = @_; 1049 my ($self) = @_;
852 1050
853 my ($w, $h ) = ($self->{w}, $self->{h}); 1051 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855 1053
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D; 1054 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860 1056
861 my $border = $self->border; 1057 my $border = $self->border;
862 1058
863 glColor @{ $self->{border_bg} }; 1059 glColor @{ $self->{border_bg} };
864 $tex[1]->draw_quad (0, 0, $w, $border); 1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
868 1064
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869 my $bg = $tex[0]; 1066 my $bg = $tex[0];
870 1067
871 # TODO: repeat texture not scale 1068 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 1069 my $rep_x = $cw / $bg->{w};
873 my $rep_y = $ch / $bg->{h}; 1070 my $rep_y = $ch / $bg->{h};
874 1071
875 glColor @{ $self->{bg} }; 1072 glColor @{ $self->{bg} };
876 1073
877 $bg->{s} = $rep_x; 1074 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y; 1075 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1; 1076 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 }
881 1079
882 glDisable GL_TEXTURE_2D; 1080 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND;
884 1081
885 $self->{title}->draw if $self->{title}; 1082 $self->{title}->draw if $self->{title};
1083
886 $self->child->draw; 1084 $self->child->draw;
887} 1085}
888 1086
889############################################################################# 1087#############################################################################
890 1088
… …
899sub new { 1097sub new {
900 my $class = shift; 1098 my $class = shift;
901 1099
902 $class->SUPER::new ( 1100 $class->SUPER::new (
903 col_expand => [], 1101 col_expand => [],
904 @_ 1102 @_,
905 ) 1103 )
906} 1104}
907 1105
908sub add { 1106sub add {
909 my ($self, $x, $y, $child) = @_; 1107 my ($self, $x, $y, $child) = @_;
… …
912 $self->{children}[$y][$x] = $child; 1110 $self->{children}[$y][$x] = $child;
913 1111
914 $child->check_size; 1112 $child->check_size;
915} 1113}
916 1114
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
917# TODO: move to container class maybe? send childs a signal on removal? 1119# TODO: move to container class maybe? send childs a signal on removal?
918sub clear { 1120sub clear {
919 my ($self) = @_; 1121 my ($self) = @_;
920 1122
921 my $children = delete $self->{children}; 1123 my @children = $self->children;
1124 delete $self->{children};
922 1125
923 for (grep $_, map @$_, grep $_, @$children) { 1126 for (@children) {
924 delete $_->{parent}; 1127 delete $_->{parent};
925 $_->hide; 1128 $_->hide;
926 } 1129 }
927 1130
928 $self->update; 1131 $self->update;
… …
1109} 1312}
1110 1313
1111sub size_allocate { 1314sub size_allocate {
1112 my ($self, $w, $h) = @_; 1315 my ($self, $w, $h) = @_;
1113 1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1114 my $children = $self->{children}; 1319 my $children = $self->{children};
1115 1320
1116 my @h = map $_->{req_h}, @$children; 1321 my @h = map $_->{req_h}, @$children;
1117 1322
1118 my $req_h = List::Util::sum @h; 1323 my $req_h = List::Util::sum @h;
… …
1147 1352
1148############################################################################# 1353#############################################################################
1149 1354
1150package CFClient::UI::Label; 1355package CFClient::UI::Label;
1151 1356
1152our @ISA = CFClient::UI::Base::; 1357our @ISA = CFClient::UI::DrawBG::;
1153 1358
1154use CFClient::OpenGL; 1359use CFClient::OpenGL;
1155 1360
1156sub new { 1361sub new {
1157 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1158 1363
1159 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1365 fg => [1, 1, 1],
1366 #bg => none
1367 #active_bg => none
1161 #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),
1162 fontsize => 1, 1374 fontsize => 1,
1163 text => "",
1164 align => -1, 1375 align => -1,
1165 valign => -1, 1376 valign => -1,
1166 padding => 2, 1377 padding => 2,
1167 layout => new CFClient::Layout,
1168 can_events => 0, 1378 can_events => 0,
1169 %arg 1379 %arg
1170 ); 1380 );
1171 1381
1172 if (exists $self->{template}) { 1382 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1383 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1384 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1385 $self->{template} = $layout;
1176 } 1386 }
1177 1387
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1388 if (exists $self->{markup}) {
1179 $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 }
1180 1393
1181 $self 1394 $self
1182} 1395}
1183 1396
1184sub escape { 1397sub escape($) {
1185 local $_ = $_[1]; 1398 local $_ = $_[0];
1186 1399
1187 s/&/&amp;/g; 1400 s/&/&amp;/g;
1188 s/>/&gt;/g; 1401 s/>/&gt;/g;
1189 s/</&lt;/g; 1402 s/</&lt;/g;
1190 1403
1191 $_[1] 1404 $_
1405}
1406
1407sub update {
1408 my ($self) = @_;
1409
1410 delete $self->{texture};
1411 $self->SUPER::update;
1192} 1412}
1193 1413
1194sub set_text { 1414sub set_text {
1195 my ($self, $text) = @_; 1415 my ($self, $text) = @_;
1196 1416
1417 return if $self->{text} eq "T$text";
1418 $self->{text} = "T$text";
1419
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1197 $self->{layout}->set_text ($text); 1421 $self->{layout}->set_text ($text);
1198 1422
1199 delete $self->{texture}; 1423 $self->update;
1200 $self->check_size; 1424 $self->check_size;
1201 $self->update;
1202} 1425}
1203 1426
1204sub set_markup { 1427sub set_markup {
1205 my ($self, $markup) = @_; 1428 my ($self, $markup) = @_;
1206 1429
1430 return if $self->{text} eq "M$markup";
1431 $self->{text} = "M$markup";
1432
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1207 $self->{layout}->set_markup ($markup); 1436 $self->{layout}->set_markup ($markup);
1208 1437
1209 delete $self->{texture}; 1438 $self->update;
1210 $self->check_size; 1439 $self->check_size;
1211 $self->update;
1212} 1440}
1213 1441
1214sub size_request { 1442sub size_request {
1215 my ($self) = @_; 1443 my ($self) = @_;
1216 1444
1217 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1445 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $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});
1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1449 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220 1450
1221 my ($w, $h) = $self->{layout}->size; 1451 my ($w, $h) = $self->{layout}->size;
1222 1452
1223 if (exists $self->{template}) { 1453 if (exists $self->{template}) {
… …
1245sub set_fontsize { 1475sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1476 my ($self, $fontsize) = @_;
1247 1477
1248 $self->{fontsize} = $fontsize; 1478 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1479 delete $self->{texture};
1480
1481 $self->update;
1250 $self->check_size; 1482 $self->check_size;
1251 $self->update;
1252} 1483}
1253 1484
1254sub _draw { 1485sub _draw {
1255 my ($self) = @_; 1486 my ($self) = @_;
1256 1487
1488 $self->SUPER::_draw; # draw background, if applicable
1489
1257 my $tex = $self->{texture} ||= do { 1490 my $tex = $self->{texture} ||= do {
1491 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1492 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $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});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497
1261 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
1262 }; 1509 };
1263 1510
1264 glEnable GL_BLEND;
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266 glEnable GL_TEXTURE_2D; 1511 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1513
1514 if ($tex->{format} == GL_ALPHA) {
1269 glColor @{$self->{fg}}; 1515 glColor @{$self->{fg}};
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $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 }
1284 1520
1285 glDisable GL_TEXTURE_2D; 1521 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1522}
1288 1523
1289############################################################################# 1524#############################################################################
1290 1525
1291package CFClient::UI::EntryBase; 1526package CFClient::UI::EntryBase;
… …
1304 active_fg => [0, 0, 0], 1539 active_fg => [0, 0, 0],
1305 can_hover => 1, 1540 can_hover => 1,
1306 can_focus => 1, 1541 can_focus => 1,
1307 valign => 0, 1542 valign => 0,
1308 can_events => 1, 1543 can_events => 1,
1544 #text => ...
1309 @_ 1545 @_
1310 ) 1546 )
1311} 1547}
1312 1548
1313sub _set_text { 1549sub _set_text {
… …
1323 $self->{text} = $text; 1559 $self->{text} = $text;
1324 1560
1325 $text =~ s/./*/g if $self->{hidden}; 1561 $text =~ s/./*/g if $self->{hidden};
1326 $self->{layout}->set_text ("$text "); 1562 $self->{layout}->set_text ("$text ");
1327 1563
1328 $self->emit (changed => $self->{text}); 1564 $self->_emit (changed => $self->{text});
1329}
1330
1331sub get_text {
1332 $_[0]{text}
1333}
1334
1335sub size_request {
1336 my ($self) = @_;
1337
1338 my ($w, $h) = $self->SUPER::size_request;
1339
1340 ($w + 1, $h) # add 1 for cursor
1341}
1342
1343sub size_allocate {
1344 my ($self, $w, $h) = @_;
1345
1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347} 1565}
1348 1566
1349sub set_text { 1567sub set_text {
1350 my ($self, $text) = @_; 1568 my ($self, $text) = @_;
1351 1569
1352 $self->{cursor} = length $text; 1570 $self->{cursor} = length $text;
1353 $self->_set_text ($text); 1571 $self->_set_text ($text);
1354 $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
1355} 1586}
1356 1587
1357sub key_down { 1588sub key_down {
1358 my ($self, $ev) = @_; 1589 my ($self, $ev) = @_;
1359 1590
… …
1361 my $sym = $ev->{sym}; 1592 my $sym = $ev->{sym};
1362 my $uni = $ev->{unicode}; 1593 my $uni = $ev->{unicode};
1363 1594
1364 my $text = $self->get_text; 1595 my $text = $self->get_text;
1365 1596
1366 if ($sym == 8) { 1597 if ($uni == 8) {
1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1598 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368 } elsif ($sym == 127) { 1599 } elsif ($uni == 127) {
1369 substr $text, $self->{cursor}, 1, ""; 1600 substr $text, $self->{cursor}, 1, "";
1370 } elsif ($sym == CFClient::SDLK_LEFT) { 1601 } elsif ($sym == CFClient::SDLK_LEFT) {
1371 --$self->{cursor} if $self->{cursor}; 1602 --$self->{cursor} if $self->{cursor};
1372 } elsif ($sym == CFClient::SDLK_RIGHT) { 1603 } elsif ($sym == CFClient::SDLK_RIGHT) {
1373 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1604 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1374 } elsif ($sym == CFClient::SDLK_HOME) { 1605 } elsif ($sym == CFClient::SDLK_HOME) {
1375 $self->{cursor} = 0; 1606 $self->{cursor} = 0;
1376 } elsif ($sym == CFClient::SDLK_END) { 1607 } elsif ($sym == CFClient::SDLK_END) {
1377 $self->{cursor} = length $text; 1608 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) { 1609 } elsif ($uni == 27) {
1379 $self->emit ('escape'); 1610 $self->_emit ('escape');
1380 } elsif ($uni) { 1611 } elsif ($uni) {
1381 substr $text, $self->{cursor}++, 0, chr $uni; 1612 substr $text, $self->{cursor}++, 0, chr $uni;
1382 } 1613 }
1383 1614
1384 $self->_set_text ($text); 1615 $self->_set_text ($text);
1385 $self->update; 1616 $self->update;
1617 $self->check_size;
1386} 1618}
1387 1619
1388sub focus_in { 1620sub focus_in {
1389 my ($self) = @_; 1621 my ($self) = @_;
1390 1622
… …
1469 1701
1470 if ($sym == 13) { 1702 if ($sym == 13) {
1471 unshift @{$self->{history}}, 1703 unshift @{$self->{history}},
1472 my $txt = $self->get_text; 1704 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1; 1705 $self->{history_pointer} = -1;
1706 $self->{history_saveback} = '';
1474 $self->emit (activate => $txt); 1707 $self->_emit (activate => $txt);
1475 $self->update; 1708 $self->update;
1476 1709
1477 } elsif ($sym == CFClient::SDLK_UP) { 1710 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) { 1711 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text; 1712 $self->{history_saveback} = $self->get_text;
1480 } 1713 }
1714 if (@{$self->{history} || []} > 0) {
1481 $self->{history_pointer}++; 1715 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) { 1716 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1; 1717 $self->{history_pointer} = @{$self->{history} || []} - 1;
1718 }
1719 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1484 } 1720 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486 1721
1487 } elsif ($sym == CFClient::SDLK_DOWN) { 1722 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--; 1723 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1724 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490 1725
… …
1516 my $class = shift; 1751 my $class = shift;
1517 1752
1518 $class->SUPER::new ( 1753 $class->SUPER::new (
1519 padding => 4, 1754 padding => 4,
1520 fg => [1, 1, 1], 1755 fg => [1, 1, 1],
1521 bg => [1, 1, 1, 0.2],
1522 active_fg => [0, 0, 1], 1756 active_fg => [0, 0, 1],
1523 can_hover => 1, 1757 can_hover => 1,
1524 align => 0, 1758 align => 0,
1525 valign => 0, 1759 valign => 0,
1526 can_events => 1, 1760 can_events => 1,
1527 @_ 1761 @_
1528 ) 1762 )
1529} 1763}
1530 1764
1765sub activate { }
1766
1531sub button_up { 1767sub button_up {
1532 my ($self, $ev, $x, $y) = @_; 1768 my ($self, $ev, $x, $y) = @_;
1533 1769
1770 $self->emit ("activate")
1534 if ($x >= 0 && $x < $self->{w} 1771 if $x >= 0 && $x < $self->{w}
1535 && $y >= 0 && $y < $self->{h}) { 1772 && $y >= 0 && $y < $self->{h};
1536 $self->emit ("activate");
1537 }
1538} 1773}
1539 1774
1540sub _draw { 1775sub _draw {
1541 my ($self) = @_; 1776 my ($self) = @_;
1542 1777
… …
1544 1779
1545 if ($GRAB == $self) { 1780 if ($GRAB == $self) {
1546 $self->{fg} = $self->{active_fg}; 1781 $self->{fg} = $self->{active_fg};
1547 } 1782 }
1548 1783
1549 glEnable GL_BLEND;
1550 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551 glEnable GL_TEXTURE_2D; 1784 glEnable GL_TEXTURE_2D;
1552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553 glColor 0, 0, 0, 1; 1786 glColor 0, 0, 0, 1;
1554 1787
1555 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1788 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1556 1789
1557 glDisable GL_TEXTURE_2D; 1790 glDisable GL_TEXTURE_2D;
1558 glDisable GL_BLEND;
1559 1791
1560 $self->SUPER::_draw; 1792 $self->SUPER::_draw;
1561} 1793}
1562 1794
1563############################################################################# 1795#############################################################################
… …
1577 1809
1578 $class->SUPER::new ( 1810 $class->SUPER::new (
1579 padding => 2, 1811 padding => 2,
1580 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1581 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],
1582 state => 0, 1816 state => 0,
1583 can_hover => 1, 1817 can_hover => 1,
1584 @_ 1818 @_
1585 ) 1819 )
1586} 1820}
… …
1595 my ($self, $ev, $x, $y) = @_; 1829 my ($self, $ev, $x, $y) = @_;
1596 1830
1597 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1598 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1599 $self->{state} = !$self->{state}; 1833 $self->{state} = !$self->{state};
1600 $self->emit (changed => $self->{state}); 1834 $self->_emit (changed => $self->{state});
1601 } 1835 }
1602} 1836}
1603 1837
1604sub _draw { 1838sub _draw {
1605 my ($self) = @_; 1839 my ($self) = @_;
… …
1610 1844
1611 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;
1612 1846
1613 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1614 1848
1615 glEnable GL_BLEND; 1849 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850
1616 glEnable GL_TEXTURE_2D; 1851 glEnable GL_TEXTURE_2D;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618
1619 my $tex = $self->{state} ? $tex[1] : $tex[0];
1620
1621 $tex->draw_quad (0, 0, $s, $s); 1852 $tex->draw_quad_alpha (0, 0, $s, $s);
1622
1623 glDisable GL_TEXTURE_2D; 1853 glDisable GL_TEXTURE_2D;
1624 glDisable GL_BLEND;
1625} 1854}
1626 1855
1627############################################################################# 1856#############################################################################
1628 1857
1629package CFClient::UI::Image; 1858package CFClient::UI::Image;
… …
1672 glTranslate 0, -$self->{w}, 0; 1901 glTranslate 0, -$self->{w}, 0;
1673 1902
1674 ($w, $h) = ($h, $w); 1903 ($w, $h) = ($h, $w);
1675 } 1904 }
1676 1905
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 1906 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1907 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 1908
1682 $tex->draw_quad (0, 0, $w, $h); 1909 $tex->draw_quad_alpha (0, 0, $w, $h);
1683 1910
1684 glDisable GL_BLEND;
1685 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1686} 1912}
1687 1913
1688############################################################################# 1914#############################################################################
1689 1915
… …
1737} 1963}
1738 1964
1739sub set_max { 1965sub set_max {
1740 my ($self, $max) = @_; 1966 my ($self, $max) = @_;
1741 1967
1968 return if $self->{max_val} == $max;
1969
1742 $self->{max_val} = $max; 1970 $self->{max_val} = $max;
1971 $self->update;
1743} 1972}
1744 1973
1745sub set_value { 1974sub set_value {
1746 my ($self, $val, $max) = @_; 1975 my ($self, $val, $max) = @_;
1747 1976
1748 $self->set_max ($max) 1977 $self->set_max ($max)
1749 if defined $max; 1978 if defined $max;
1750 1979
1751 $max = $self->{max_val}; 1980 return if $self->{val} == $val;
1981
1752 $self->{val} = $val; 1982 $self->{val} = $val;
1753
1754 $self->update; 1983 $self->update;
1755} 1984}
1756 1985
1757sub _draw { 1986sub _draw {
1758 my ($self) = @_; 1987 my ($self) = @_;
… …
1821 2050
1822sub new { 2051sub new {
1823 my ($class, %arg) = @_; 2052 my ($class, %arg) = @_;
1824 2053
1825 my $self = $class->SUPER::new ( 2054 my $self = $class->SUPER::new (
1826 tooltip => $arg{type}, 2055 tooltip => $arg{type},
1827 can_hover => 1, 2056 can_hover => 1,
2057 can_events => 1,
1828 %arg, 2058 %arg,
1829 ); 2059 );
1830 2060
1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2061 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2062 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1840 2070
1841 $self->{value}->set_fontsize ($fsize); 2071 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize); 2072 $self->{max} ->set_fontsize ($fsize);
1843} 2073}
1844 2074
2075sub set_max {
2076 my ($self, $max) = @_;
2077
2078 $self->{gauge}->set_max ($max);
2079 $self->{max}->set_text ($max);
2080}
2081
1845sub set_value { 2082sub set_value {
1846 my ($self, $val, $max) = @_; 2083 my ($self, $val, $max) = @_;
1847 2084
1848 $self->set_max ($max) 2085 $self->set_max ($max)
1849 if defined $max; 2086 if defined $max;
1850 2087
1851 $self->{gauge}->set_value ($val, $max); 2088 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val); 2089 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860} 2090}
1861 2091
1862############################################################################# 2092#############################################################################
1863 2093
1864package CFClient::UI::Slider; 2094package CFClient::UI::Slider;
… …
1874 qw(s1_slider.png s1_slider_bg.png); 2104 qw(s1_slider.png s1_slider_bg.png);
1875 2105
1876sub new { 2106sub new {
1877 my $class = shift; 2107 my $class = shift;
1878 2108
1879 # range [value, low, high, page] 2109 # range [value, low, high, page, unit]
1880 2110
1881 # TODO: 0-width page 2111 # TODO: 0-width page
1882 # TODO: req_w/h are wrong with vertical 2112 # TODO: req_w/h are wrong with vertical
1883 # TODO: calculations are off 2113 # TODO: calculations are off
1884 my $self = $class->SUPER::new ( 2114 my $self = $class->SUPER::new (
1885 fg => [1, 1, 1], 2115 fg => [1, 1, 1],
1886 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],
1887 range => [0, 0, 100, 10], 2119 range => [0, 0, 100, 10, 0],
1888 req_w => 20, 2120 req_w => $::WIDTH / 80,
1889 req_h => 20, 2121 req_h => $::WIDTH / 80,
1890 vertical => 0, 2122 vertical => 0,
1891 can_hover => 1, 2123 can_hover => 1,
1892 inner_pad => 5, 2124 inner_pad => 0.02,
1893 @_ 2125 @_
1894 ); 2126 );
1895 2127
2128 $self->set_value ($self->{range}[0]);
2129 $self->update;
2130
1896 $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 }
1897} 2163}
1898 2164
1899sub size_request { 2165sub size_request {
1900 my ($self) = @_; 2166 my ($self) = @_;
1901 2167
… …
1907 2173
1908sub button_down { 2174sub button_down {
1909 my ($self, $ev, $x, $y) = @_; 2175 my ($self, $ev, $x, $y) = @_;
1910 2176
1911 $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
1912 $self->mouse_motion ($ev, $x, $y); 2181 $self->mouse_motion ($ev, $x, $y);
1913} 2182}
1914 2183
1915sub mouse_motion { 2184sub mouse_motion {
1916 my ($self, $ev, $x, $y) = @_; 2185 my ($self, $ev, $x, $y) = @_;
1917 2186
1918 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
1919 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2204 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100;
1920 2206
1921 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2207 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1922 2208
1923 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2209 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1924 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2210 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1925 2211
1926 $x -= $inner_pad_px; # substract the padding 2212 $value = ($value - $lo) / $range;
1927 $x = $x * ($hi - $lo) / $inner_w + $lo; 2213 $value = $value * $self->{scale} + $self->{offset};
1928 $x = $lo if $x < $lo;
1929 $x = $hi - $page if $x > $hi - $page;
1930 $self->{range}[0] = $x;
1931 2214
1932 $self->emit (changed => $x); 2215 $self->{knob_x} = $value - $knob_w * 0.5;
1933 $self->update; 2216 $self->{knob_w} = $knob_w;
1934 } 2217 });
1935}
1936 2218
1937# the inner_* stuff is for generating a padding for the slider handle, 2219 $self->SUPER::update;
1938# so that the handle doesn't leave the texture. This calculation isn't 100%
1939# correct propably, but it does the job for now
1940sub _calc_inner_pad_px {
1941 my ($self, $w) = @_;
1942 ($w / 100) * $self->{inner_pad} # % to pixels
1943} 2220}
1944 2221
1945sub _draw { 2222sub _draw {
1946 my ($self) = @_; 2223 my ($self) = @_;
1947 2224
1948 $self->SUPER::_draw (); 2225 $self->SUPER::_draw ();
1949 2226
1950 my ($w, $h) = @$self{qw(w h)}; 2227 glScale $self->{w}, $self->{h};
1951 2228
1952 if ($self->{vertical}) { 2229 if ($self->{vertical}) {
1953 # draw a vertical slider like a rotated horizontal slider 2230 # draw a vertical slider like a rotated horizontal slider
1954 2231
2232 glTranslate 1, 0, 0;
1955 glRotate 90, 0, 0, 1; 2233 glRotate 90, 0, 0, 1;
1956 glTranslate 0, -$self->{w}, 0;
1957
1958 ($w, $h) = ($h, $w);
1959 } 2234 }
1960 2235
1961 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2236 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1962 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2237 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1963 2238
1964 my ($value, $lo, $hi, $page) = @{$self->{range}};
1965
1966 $hi = $value + 1 if $lo == $hi;
1967
1968 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1969 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1970
1971 $page = int $page * $inner_w / ($hi - $lo);
1972 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1973
1974 $w -= $page;
1975 $page &= ~1;
1976 glTranslate $page * 0.5, 0, 0;
1977 $page ||= 2;
1978
1979 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1980 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1981
1982 glEnable GL_BLEND;
1983 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1984 glEnable GL_TEXTURE_2D; 2239 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2240 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 2241
1987 # draw background 2242 # draw background
1988 $tex[1]->draw_quad (0, 0, $w, $h); 2243 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1989 2244
1990 # draw handle 2245 # draw handle
1991 $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);
1992 2247
1993 glDisable GL_BLEND;
1994 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
1995} 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 (@_) }
1996 2291
1997############################################################################# 2292#############################################################################
1998 2293
1999package CFClient::UI::TextView; 2294package CFClient::UI::TextView;
2000 2295
… …
2009 fontsize => 1, 2304 fontsize => 1,
2010 can_events => 0, 2305 can_events => 0,
2011 #font => default_font 2306 #font => default_font
2012 @_, 2307 @_,
2013 2308
2014 layout => (new CFClient::Layout), 2309 layout => (new CFClient::Layout 1),
2015 par => [], 2310 par => [],
2016 height => 0, 2311 height => 0,
2017 children => [ 2312 children => [
2018 (new CFClient::UI::Empty expand => 1), 2313 (new CFClient::UI::Empty expand => 1),
2019 (new CFClient::UI::Slider vertical => 1), 2314 (new CFClient::UI::Slider vertical => 1),
2020 ], 2315 ],
2021 ); 2316 );
2022 2317
2023 $self->{children}[1]->connect (changed => sub { 2318 $self->{children}[1]->connect (changed => sub { $self->update });
2024 $self->update;
2025 });
2026 2319
2027 $self 2320 $self
2028} 2321}
2029 2322
2030sub set_fontsize { 2323sub set_fontsize {
2031 my ($self, $fontsize) = @_; 2324 my ($self, $fontsize) = @_;
2032 2325
2033 $self->{fontsize} = $fontsize; 2326 $self->{fontsize} = $fontsize;
2034 $self->reflow; 2327 $self->reflow;
2035}
2036
2037sub text_height {
2038 my ($self, $text) = @_;
2039
2040 my $layout = $self->{layout};
2041
2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043 $layout->set_width ($self->{w});
2044 $layout->set_text ($text);
2045
2046 ($layout->size)[1]
2047}
2048
2049sub reflow {
2050 my ($self) = @_;
2051
2052 $self->{need_reflow}++;
2053 $self->update;
2054} 2328}
2055 2329
2056sub size_allocate { 2330sub size_allocate {
2057 my ($self, $w, $h) = @_; 2331 my ($self, $w, $h) = @_;
2058 2332
… …
2063 $self->{layout}->set_width ($self->{children}[0]{w}); 2337 $self->{layout}->set_width ($self->{children}[0]{w});
2064 2338
2065 $self->reflow; 2339 $self->reflow;
2066} 2340}
2067 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
2068sub add_paragraph { 2376sub add_paragraph {
2069 my ($self, $color, $text) = @_; 2377 my ($self, $color, $text, $indent) = @_;
2070 2378
2071 #TODO: intelligently "reformat" paragraph 2379 for my $line (split /\n/, $text) {
2072 2380 my ($w, $h) = $self->text_size ($line);
2073 my $height = $self->text_height ($text);
2074
2075 $self->{height} += $height; 2381 $self->{height} += $h;
2382 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2383 }
2076 2384
2077 push @{$self->{par}}, [$height, $color, $text];
2078
2079 $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]);
2080 $self->{children}[1]->update;
2081} 2386}
2082 2387
2083sub update { 2388sub update {
2084 my ($self) = @_; 2389 my ($self) = @_;
2085 2390
… …
2087 2392
2088 return unless $self->{h} > 0; 2393 return unless $self->{h} > 0;
2089 2394
2090 delete $self->{texture}; 2395 delete $self->{texture};
2091 2396
2092 $ROOT->on_refresh ($self, sub { 2397 $ROOT->on_post_alloc ($self, sub {
2398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399
2093 if (delete $self->{need_reflow}) { 2400 if (delete $self->{need_reflow}) {
2094 my $height = 0; 2401 my $height = 0;
2095 2402
2096 $height += $_->[0] = $self->text_height ($_->[2]) 2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406
2097 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 }
2098 2418
2099 $self->{height} = $height; 2419 $self->{height} = $height;
2100 2420
2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2421 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2102 2422
2103 delete $self->{texture}; 2423 delete $self->{texture};
2104 } 2424 }
2105 2425
2106 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2107 glClearColor 0, 0, 0, 1; 2427 glClearColor 0.5, 0.5, 0.5, 0;
2108 glClear GL_COLOR_BUFFER_BIT; 2428 glClear GL_COLOR_BUFFER_BIT;
2109 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
2110 glEnable GL_BLEND; 2441 glEnable GL_BLEND;
2442 #TODO# not correct in windows where rgba is forced off
2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2443 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2112 glEnable GL_TEXTURE_2D;
2113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2114
2115 my $top = int $self->{children}[1]{range}[0];
2116
2117 my $y0 = $top;
2118 my $y1 = $top + $self->{h};
2119
2120 my $y = 0;
2121
2122 my $layout = $self->{layout};
2123
2124 $layout->set_font ($self->{font}) if $self->{font};
2125 2444
2126 for my $par (@{$self->{par}}) { 2445 for my $par (@{$self->{par}}) {
2127 my $h = $par->[0]; 2446 my $h = $par->[1];
2128 2447
2129 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]);
2130 $layout->set_text ($par->[2]); 2451 $layout->set_markup ($par->[4]);
2131 2452
2132 glColor @{ $par->[1] }; 2453 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2133 my ($W, $H) = $layout->size; 2454
2134 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;
2135 } 2457 }
2136 2458
2137 $y += $h; 2459 $y += $h;
2138 } 2460 }
2139 2461
2140 glDisable GL_TEXTURE_2D;
2141 glDisable GL_BLEND; 2462 glDisable GL_BLEND;
2142 }; 2463 };
2143 }); 2464 });
2144} 2465}
2145 2466
2146sub _draw { 2467sub _draw {
2147 my ($self) = @_; 2468 my ($self) = @_;
2148 2469
2149 if ($self->{texture}) {
2150 glEnable GL_TEXTURE_2D; 2470 glEnable GL_TEXTURE_2D;
2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 1, 1, 1, 1;
2152 $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});
2153 glDisable GL_TEXTURE_2D; 2474 glDisable GL_TEXTURE_2D;
2154 }
2155 2475
2156 $self->{children}[1]->draw; 2476 $self->{children}[1]->draw;
2157 2477
2158} 2478}
2159 2479
… …
2227 2547
2228 # TODO: use animation 2548 # TODO: use animation
2229 if ($self->{state} = !$self->{state}) { 2549 if ($self->{state} = !$self->{state}) {
2230 $CFClient::UI::ROOT->add ($self->{other}); 2550 $CFClient::UI::ROOT->add ($self->{other});
2231 $self->{other}->move ($self->coord2global (0, $self->{h})); 2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2232 $self->emit ("open"); 2552 $self->_emit ("open");
2233 } else { 2553 } else {
2234 $CFClient::UI::ROOT->remove ($self->{other}); 2554 $CFClient::UI::ROOT->remove ($self->{other});
2235 $self->emit ("close"); 2555 $self->_emit ("close");
2236 } 2556 }
2237 2557
2238 $self->emit (changed => $self->{state}); 2558 $self->_emit (changed => $self->{state});
2239} 2559}
2240 2560
2241############################################################################# 2561#############################################################################
2242 2562
2243package CFClient::UI::Tooltip; 2563package CFClient::UI::Tooltip;
… …
2253 @_, 2573 @_,
2254 can_events => 0, 2574 can_events => 0,
2255 ) 2575 )
2256} 2576}
2257 2577
2258sub set_markup { 2578sub set_tooltip_from {
2259 my ($self, $text) = @_; 2579 my ($self, $widget) = @_;
2260 2580
2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2581 $self->add (new CFClient::UI::Label
2262 $self->{label}->set_markup ($text); 2582 markup => $widget->{tooltip},
2263 $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 );
2264} 2589}
2265 2590
2266sub size_request { 2591sub size_request {
2267 my ($self) = @_; 2592 my ($self) = @_;
2268
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270 2593
2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2594 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272 2595
2273 ($w + 4, $h + 4) 2596 ($w + 4, $h + 4)
2274} 2597}
… …
2280} 2603}
2281 2604
2282sub _draw { 2605sub _draw {
2283 my ($self) = @_; 2606 my ($self) = @_;
2284 2607
2285 glPushMatrix;
2286 glTranslate 0.375, 0.375; 2608 glTranslate 0.375, 0.375;
2287 2609
2288 my ($w, $h) = @$self{qw(w h)}; 2610 my ($w, $h) = @$self{qw(w h)};
2289 2611
2290 glColor 1, 0.8, 0.4; 2612 glColor 1, 0.8, 0.4;
… …
2301 glVertex 0 , $h; 2623 glVertex 0 , $h;
2302 glVertex $w, $h; 2624 glVertex $w, $h;
2303 glVertex $w, 0; 2625 glVertex $w, 0;
2304 glEnd; 2626 glEnd;
2305 2627
2306 glPopMatrix; 2628 glTranslate 2 - 0.375, 2 - 0.375;
2307
2308 glTranslate 2, 2;
2309 $self->SUPER::_draw; 2629 $self->SUPER::_draw;
2310} 2630}
2311 2631
2312############################################################################# 2632#############################################################################
2313 2633
… …
2318use CFClient::OpenGL; 2638use CFClient::OpenGL;
2319 2639
2320sub new { 2640sub new {
2321 my $class = shift; 2641 my $class = shift;
2322 2642
2323 $class->SUPER::new ( 2643 my $self = $class->SUPER::new (
2324 aspect => 1, 2644 aspect => 1,
2645 can_events => 0,
2325 @_, 2646 @_,
2326 ) 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
2327} 2664}
2328 2665
2329sub size_request { 2666sub size_request {
2330 (32, 8) 2667 (32, 8)
2331} 2668}
2332 2669
2670sub update {
2671 my ($self) = @_;
2672
2673 return unless $self->{visible};
2674
2675 $self->SUPER::update;
2676}
2677
2333sub draw { 2678sub _draw {
2334 my ($self) = @_; 2679 my ($self) = @_;
2335 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
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2337 2693
2338 if ($tex) { 2694 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D; 2695 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1; 2697 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D; 2699 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 } 2700 }
2701}
2702
2703sub DESTROY {
2704 my ($self) = @_;
2705
2706 $self->{timer}->cancel
2707 if $self->{timer};
2708
2709 $self->SUPER::DESTROY;
2348} 2710}
2349 2711
2350############################################################################# 2712#############################################################################
2351 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
2352package CFClient::UI::Root; 3031package CFClient::UI::Root;
2353 3032
2354our @ISA = CFClient::UI::Container::; 3033our @ISA = CFClient::UI::Container::;
2355 3034
2356use CFClient::OpenGL; 3035use CFClient::OpenGL;
2357 3036
2358sub check_size { 3037sub new {
2359 my ($self) = @_; 3038 my $class = shift;
2360 3039
2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3040 $class->SUPER::new (
2362} 3041 @_,
2363 3042 )
2364sub size_request {
2365 ($::WIDTH, $::HEIGHT)
2366} 3043}
2367 3044
2368sub configure { 3045sub configure {
2369 my ($self, $x, $y, $w, $h) = @_; 3046 my ($self, $x, $y, $w, $h) = @_;
2370 3047
2371 $self->SUPER::configure ($x, $y, $w, $h); 3048 $self->{w} = $w;
3049 $self->{h} = $h;
3050}
2372 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
2373 for my $child (@{$self->{children}}) { 3068 for my $child ($self->children) {
2374 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)};
2375 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
2376 $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;
2377 $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
2378 $child->configure ($X, $Y, $W,$H); 3080 $child->configure ($X, $Y, $W, $H);
2379 } 3081 }
2380} 3082}
2381 3083
2382sub _topleft { 3084sub coord2local {
2383 my ($self, $x, $y) = @_; 3085 my ($self, $x, $y) = @_;
2384 3086
2385 ($x, $y) 3087 ($x, $y)
2386} 3088}
2387 3089
3090sub coord2global {
3091 my ($self, $x, $y) = @_;
3092
3093 ($x, $y)
3094}
3095
2388sub update { 3096sub update {
2389 my ($self) = @_; 3097 my ($self) = @_;
2390 3098
2391 $self->check_size; 3099 $self->check_size;
2392 ::refresh (); 3100 $::WANT_REFRESH++;
2393} 3101}
2394 3102
2395sub add { 3103sub add {
2396 my ($self, $child) = @_; 3104 my ($self, @children) = @_;
2397 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
2398 # integerize window positions 3115 # integerise window positions
2399 $child->{x} = int $child->{x}; 3116 $child->{x} = int $child->{x};
2400 $child->{y} = int $child->{y}; 3117 $child->{y} = int $child->{y};
3118 }
2401 3119
2402 $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 }
2403} 3133}
2404 3134
2405sub on_refresh { 3135sub on_refresh {
2406 my ($self, $id, $cb) = @_; 3136 my ($self, $id, $cb) = @_;
2407 3137
2408 $self->{refresh_hook}{$id} = $cb; 3138 $self->{refresh_hook}{$id} = $cb;
2409} 3139}
2410 3140
3141sub on_post_alloc {
3142 my ($self, $id, $cb) = @_;
3143
3144 $self->{post_alloc_hook}{$id} = $cb;
3145}
3146
2411sub draw { 3147sub draw {
2412 my ($self) = @_; 3148 my ($self) = @_;
2413 3149
2414 while (my $rcb = delete $self->{refresh_hook}) { 3150 while ($self->{refresh_hook}) {
2415 $_->() 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}};
2416 } 3202 }
2417 3203
2418 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3204 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3205 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420 glClear GL_COLOR_BUFFER_BIT; 3206 glClear GL_COLOR_BUFFER_BIT;
2421 3207
2422 glMatrixMode GL_PROJECTION; 3208 glMatrixMode GL_PROJECTION;
2423 glLoadIdentity; 3209 glLoadIdentity;
2424 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3210 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2425 glMatrixMode GL_MODELVIEW; 3211 glMatrixMode GL_MODELVIEW;
2426 glLoadIdentity; 3212 glLoadIdentity;
2427 3213
2428 $self->_draw; 3214 $self->_draw;
2429} 3215}
… …
2431############################################################################# 3217#############################################################################
2432 3218
2433package CFClient::UI; 3219package CFClient::UI;
2434 3220
2435$ROOT = new CFClient::UI::Root; 3221$ROOT = new CFClient::UI::Root;
2436$TOOLTIP = new CFClient::UI::Tooltip; 3222$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2437 3223
24381 32241
2439 3225

Diff Legend

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