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

Diff Legend

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