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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.233 by root, Thu May 25 03:42:40 2006 UTC

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

Diff Legend

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