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

Diff Legend

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