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.238 by root, Thu May 25 21:48:22 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_text ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
31 } 42 }
32 43
33 return; 44 return;
34 } 45 }
35 } 46 }
… …
39 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
40} 51}
41 52
42# class methods for events 53# class methods for events
43sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS;
45} 57}
46 58
47sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS;
49} 62}
50 63
51sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
52 my ($ev) = @_; 65 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 74 check_tooltip;
62 } 75 }
63 76
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 78
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 if $GRAB;
67} 81}
68 82
69sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
70 my ($ev) = @_; 84 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
72 86
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 88
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 90
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92 if $GRAB;
78 93
79 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 96 $grab->update if $grab;
82 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 114
100 check_tooltip; 115 check_tooltip;
101 } 116 }
102 117
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER;
104} 120}
105 121
106# convert position array to integers 122# convert position array to integers
107sub harmonize { 123sub harmonize {
108 my ($vals) = @_; 124 my ($vals) = @_;
… …
114 $rem += $_ - $i; 130 $rem += $_ - $i;
115 $_ = $i; 131 $_ = $i;
116 } 132 }
117} 133}
118 134
135sub full_refresh {
136 # make a copy, otherwise for complains about freed values.
137 my @widgets = values %WIDGET;
138
139 $_->update
140 for @widgets;
141}
142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
151# call when resolution changes etc.
152sub rescale_widgets {
153 my ($sx, $sy) = @_;
154
155 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) {
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 }
166 }
167
168 reconfigure_widgets;
169}
170
119############################################################################# 171#############################################################################
120 172
121package CFClient::UI::Base; 173package CFClient::UI::Base;
122 174
123use strict; 175use strict;
… …
126 178
127sub new { 179sub new {
128 my $class = shift; 180 my $class = shift;
129 181
130 my $self = bless { 182 my $self = bless {
131 x => 0, 183 x => 0,
132 y => 0, 184 y => 0,
133 z => 0, 185 z => 0,
134 can_events => 1, 186 can_events => 1,
135 @_ 187 @_
136 }, $class; 188 }, $class;
137 189
138 for (keys %$self) { 190 for (keys %$self) {
139 if (/^connect_(.*)$/) { 191 if (/^connect_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 192 $self->connect ($1 => delete $self->{$_});
141 } 193 }
142 } 194 }
143 195
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197
144 $self 198 $self
145} 199}
146 200
147sub destroy { 201sub destroy {
148 my ($self) = @_; 202 my ($self) = @_;
… …
151 %$self = (); 205 %$self = ();
152} 206}
153 207
154sub show { 208sub show {
155 my ($self) = @_; 209 my ($self) = @_;
156
157 return if $self->{parent}; 210 return if $self->{parent};
158 211
159 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
160} 213}
161 214
215sub show_centered {
216 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220
221 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 },
225 );
226}
227
228sub set_invisible {
229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
234
235 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
162sub hide { 244sub hide {
163 my ($self) = @_; 245 my ($self) = @_;
164 246
165 return unless $self->{parent}; 247 $self->set_invisible;
166 248
167 $self->{parent}->remove ($self); 249 $self->{parent}->remove ($self)
250 if $self->{parent};
168} 251}
169 252
170sub move { 253sub move {
171 my ($self, $x, $y, $z) = @_; 254 my ($self, $x, $y, $z) = @_;
172 255
… …
211 $self->{y} = $y; 294 $self->{y} = $y;
212 $self->update; 295 $self->update;
213 } 296 }
214 297
215 if ($self->{w} != $w || $self->{h} != $h) { 298 if ($self->{w} != $w || $self->{h} != $h) {
216 $self->{w} = $w; 299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217 $self->{h} = $h;
218
219 $self->size_allocate ($w, $h);
220 $self->update;
221 } 300 }
222} 301}
223 302
224sub size_allocate { 303sub size_allocate {
225 # nothing to be done 304 # nothing to be done
226} 305}
227 306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children {
315}
316
228sub set_max_size { 317sub set_max_size {
229 my ($self, $w, $h) = @_; 318 my ($self, $w, $h) = @_;
230 319
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
233} 322}
234 323
235# return top left coordinates 324sub set_tooltip {
236sub _topleft {
237 my ($self, $x, $y) = @_; 325 my ($self, $tooltip) = @_;
238 326
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 327 $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 size_allocate {
882 my ($self, $w, $h) = @_;
883
884 $self->SUPER::size_allocate ($w, $h);
885
886 my $child = $self->{vp}->child;
887 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
888}
889
890#TODO# update range on size_allocate depending on child
891# update viewport offset on scroll
892
893#############################################################################
894
895package CFClient::UI::Frame;
896
897our @ISA = CFClient::UI::Bin::;
898
899use CFClient::OpenGL;
900
901sub new {
902 my $class = shift;
903
904 $class->SUPER::new (
905 bg => undef,
906 @_,
907 )
908}
909
673sub _draw { 910sub _draw {
674 my ($self) = @_; 911 my ($self) = @_;
675 912
676 my ($w, $h) = ($self->{w}, $self->{h}); 913 if ($self->{bg}) {
914 my ($w, $h) = @$self{qw(w h)};
677 915
678 glEnable GL_BLEND; 916 glEnable GL_BLEND;
679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 917 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
680 glEnable GL_TEXTURE_2D; 918 glColor @{ $self->{bg} };
681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
682 919
683# glBegin GL_QUADS; 920 glBegin GL_QUADS;
684# glColor 0, 0, 0, 0;
685# glVertex 0 , 0; 921 glVertex 0 , 0;
686# glVertex 0 , $h; 922 glVertex 0 , $h;
687# glVertex $w, $h; 923 glVertex $w, $h;
688# glVertex $w, 0; 924 glVertex $w, 0;
689# glEnd; 925 glEnd;
690 926
691
692 $self->child->draw;
693 glDisable GL_BLEND; 927 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D; 928 }
929
930 $self->SUPER::_draw;
695} 931}
696 932
697############################################################################# 933#############################################################################
698 934
699package CFClient::UI::FancyFrame; 935package CFClient::UI::FancyFrame;
… …
710 my $class = shift; 946 my $class = shift;
711 947
712 # TODO: user_x, user_y, overwrite moveto? 948 # TODO: user_x, user_y, overwrite moveto?
713 949
714 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 951 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 952 border_bg => [1, 1, 1, 1],
717 border => 0.8, 953 border => 0.6,
954 is_toplevel => 1,
718 can_events => 1, 955 can_events => 1,
719 @_ 956 @_
720 ); 957 );
721 958
722 $self->{title} &&= new CFClient::UI::Label 959 $self->{title} &&= new CFClient::UI::Label
723 align => 0, 960 align => 0,
724 valign => 1, 961 valign => 1,
725 text => $self->{title}, 962 text => $self->{title},
726 fontsize => 1; 963 fontsize => $self->{border};
727 964
728 $self 965 $self
729} 966}
730 967
731sub border { 968sub border {
… …
747 my ($self, $w, $h) = @_; 984 my ($self, $w, $h) = @_;
748 985
749 $h -= List::Util::max 0, $self->border * 2; 986 $h -= List::Util::max 0, $self->border * 2;
750 $w -= List::Util::max 0, $self->border * 2; 987 $w -= List::Util::max 0, $self->border * 2;
751 988
752 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 989 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
753 if $self->{title}; 990 if $self->{title};
754 991
755 $self->child->configure ($self->border, $self->border, $w, $h); 992 $self->child->configure ($self->border, $self->border, $w, $h);
756} 993}
757 994
758sub button_down { 995sub button_down {
759 my ($self, $ev, $x, $y) = @_; 996 my ($self, $ev, $x, $y) = @_;
760 997
998 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 999 my $border = $self->border;
762 1000
763 if ($x < $self->{w} && $x >= $self->{w} - $border 1001 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 1002 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 1003
1004 if ($lr & $td) {
1005 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1006 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 1007 my ($bw, $bh) = ($self->{w}, $self->{h});
768 1008
1009 my $mx = $x < $border;
1010 my $my = $y < $border;
1011
769 $self->{motion} = sub { 1012 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 1013 my ($ev, $x, $y) = @_;
771 1014
772 ($x, $y) = ($ev->{x}, $ev->{y}); 1015 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy;
773 1017
774 $self->{user_w} = $bw + $x - $ox; 1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
776 $self->check_size; 1021 $self->check_size;
777 }; 1022 };
778 1023
779 } elsif ($x >= 0 && $x < $self->{w} 1024 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1025 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 1026 my ($bx, $by) = ($self->{x}, $self->{y});
784 1027
785 $self->{motion} = sub { 1028 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 1029 my ($ev, $x, $y) = @_;
… …
809 my ($self) = @_; 1052 my ($self) = @_;
810 1053
811 my ($w, $h ) = ($self->{w}, $self->{h}); 1054 my ($w, $h ) = ($self->{w}, $self->{h});
812 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1055 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
813 1056
814 glEnable GL_BLEND;
815 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
816 glEnable GL_TEXTURE_2D; 1057 glEnable GL_TEXTURE_2D;
817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
818 1059
819 my $border = $self->border; 1060 my $border = $self->border;
820 1061
821 glColor @{ $self->{border_bg} }; 1062 glColor @{ $self->{border_bg} };
822 $tex[1]->draw_quad (0, 0, $w, $border); 1063 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
823 $tex[3]->draw_quad (0, $border, $border, $ch); 1064 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
824 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1065 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
825 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1066 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
826 1067
1068 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
827 my $bg = $tex[0]; 1069 my $bg = $tex[0];
828 1070
829 # TODO: repeat texture not scale 1071 # TODO: repeat texture not scale
830 my $rep_x = $cw / $bg->{w}; 1072 my $rep_x = $cw / $bg->{w};
831 my $rep_y = $ch / $bg->{h}; 1073 my $rep_y = $ch / $bg->{h};
832 1074
833 glColor @{ $self->{bg} }; 1075 glColor @{ $self->{bg} };
834 1076
835 $bg->{s} = $rep_x; 1077 $bg->{s} = $rep_x;
836 $bg->{t} = $rep_y; 1078 $bg->{t} = $rep_y;
837 $bg->{wrap_mode} = 1; 1079 $bg->{wrap_mode} = 1;
838 $bg->draw_quad ($border, $border, $cw, $ch); 1080 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081 }
839 1082
840 glDisable GL_TEXTURE_2D; 1083 glDisable GL_TEXTURE_2D;
841 glDisable GL_BLEND;
842 1084
843 $self->{title}->draw if $self->{title}; 1085 $self->{title}->draw if $self->{title};
1086
844 $self->child->draw; 1087 $self->child->draw;
845} 1088}
846 1089
847############################################################################# 1090#############################################################################
848 1091
… …
857sub new { 1100sub new {
858 my $class = shift; 1101 my $class = shift;
859 1102
860 $class->SUPER::new ( 1103 $class->SUPER::new (
861 col_expand => [], 1104 col_expand => [],
862 @_ 1105 @_,
863 ) 1106 )
1107}
1108
1109sub children {
1110 grep $_, map @$_, grep $_, @{ $_[0]{children} }
864} 1111}
865 1112
866sub add { 1113sub add {
867 my ($self, $x, $y, $child) = @_; 1114 my ($self, $x, $y, $child) = @_;
868 1115
869 $child->set_parent ($self); 1116 $child->set_parent ($self);
870 $self->{children}[$y][$x] = $child; 1117 $self->{children}[$y][$x] = $child;
871 1118
872 $child->check_size; 1119 $self->check_size (1);
873} 1120}
874 1121
875# TODO: move to container class maybe? send childs a signal on removal? 1122# TODO: move to container class maybe? send children a signal on removal?
876sub clear { 1123sub clear {
877 my ($self) = @_; 1124 my ($self) = @_;
878 1125
1126 my @children = $self->children;
879 delete $self->{children}; 1127 delete $self->{children};
1128
1129 for (@children) {
1130 delete $_->{parent};
1131 $_->hide;
1132 }
1133
1134 $self->check_size (1);
880 $self->update; 1135 $self->update;
881} 1136}
882 1137
883sub get_wh { 1138sub get_wh {
884 my ($self) = @_; 1139 my ($self) = @_;
… …
916sub size_allocate { 1171sub size_allocate {
917 my ($self, $w, $h) = @_; 1172 my ($self, $w, $h) = @_;
918 1173
919 my ($ws, $hs) = $self->get_wh; 1174 my ($ws, $hs) = $self->get_wh;
920 1175
921 my $req_w = sum @$ws; 1176 my $req_w = (sum @$ws) || 1;
922 my $req_h = sum @$hs; 1177 my $req_h = (sum @$hs) || 1;
923 1178
924 # TODO: nicer code && do row_expand 1179 # TODO: nicer code && do row_expand
925 my @col_expand = @{$self->{col_expand}}; 1180 my @col_expand = @{$self->{col_expand}};
926 @col_expand = (1) x @$ws unless @col_expand; 1181 @col_expand = (1) x @$ws unless @col_expand;
927 my $col_expand = (sum @col_expand) || 1; 1182 my $col_expand = (sum @col_expand) || 1;
… …
1061} 1316}
1062 1317
1063sub size_allocate { 1318sub size_allocate {
1064 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1065 1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1066 my $children = $self->{children}; 1323 my $children = $self->{children};
1067 1324
1068 my @h = map $_->{req_h}, @$children; 1325 my @h = map $_->{req_h}, @$children;
1069 1326
1070 my $req_h = List::Util::sum @h; 1327 my $req_h = List::Util::sum @h;
… …
1099 1356
1100############################################################################# 1357#############################################################################
1101 1358
1102package CFClient::UI::Label; 1359package CFClient::UI::Label;
1103 1360
1104our @ISA = CFClient::UI::Base::; 1361our @ISA = CFClient::UI::DrawBG::;
1105 1362
1106use CFClient::OpenGL; 1363use CFClient::OpenGL;
1107 1364
1108sub new { 1365sub new {
1109 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1110 1367
1111 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1369 fg => [1, 1, 1],
1370 #bg => none
1371 #active_bg => none
1113 #font => default_font 1372 #font => default_font
1373 #text => initial text
1374 #markup => initial narkup
1375 #max_w => maximum pixel width
1376 ellipsise => 3, # end
1377 layout => (new CFClient::Layout),
1114 fontsize => 1, 1378 fontsize => 1,
1115 text => "",
1116 align => -1, 1379 align => -1,
1117 valign => -1, 1380 valign => -1,
1118 padding => 2, 1381 padding => 2,
1119 layout => new CFClient::Layout,
1120 can_events => 0, 1382 can_events => 0,
1121 %arg 1383 %arg
1122 ); 1384 );
1123 1385
1124 if (exists $self->{template}) { 1386 if (exists $self->{template}) {
1125 my $layout = new CFClient::Layout; 1387 my $layout = new CFClient::Layout;
1126 $layout->set_text (delete $self->{template}); 1388 $layout->set_text (delete $self->{template});
1127 $self->{template} = $layout; 1389 $self->{template} = $layout;
1128 } 1390 }
1129 1391
1130 $self->set_text (delete $self->{text}) if exists $self->{text}; 1392 if (exists $self->{markup}) {
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1393 $self->set_markup (delete $self->{markup});
1394 } else {
1395 $self->set_text (delete $self->{text});
1396 }
1132 1397
1133 $self 1398 $self
1134} 1399}
1135 1400
1136sub escape_text { 1401sub escape($) {
1137 local $_ = $_[1]; 1402 local $_ = $_[0];
1138 1403
1139 s/&/&amp;/g; 1404 s/&/&amp;/g;
1140 s/>/&gt;/g; 1405 s/>/&gt;/g;
1141 s/</&lt;/g; 1406 s/</&lt;/g;
1142 1407
1143 $_[1] 1408 $_
1409}
1410
1411sub update {
1412 my ($self) = @_;
1413
1414 delete $self->{texture};
1415 $self->SUPER::update;
1144} 1416}
1145 1417
1146sub set_text { 1418sub set_text {
1147 my ($self, $text) = @_; 1419 my ($self, $text) = @_;
1148 1420
1421 return if $self->{text} eq "T$text";
1422 $self->{text} = "T$text";
1423
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1149 $self->{layout}->set_text ($text); 1425 $self->{layout}->set_text ($text);
1150 1426
1151 delete $self->{texture}; 1427 $self->update;
1152 $self->check_size; 1428 $self->check_size;
1153 $self->update;
1154} 1429}
1155 1430
1156sub set_markup { 1431sub set_markup {
1157 my ($self, $markup) = @_; 1432 my ($self, $markup) = @_;
1158 1433
1434 return if $self->{text} eq "M$markup";
1435 $self->{text} = "M$markup";
1436
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438
1439 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1159 $self->{layout}->set_markup ($markup); 1440 $self->{layout}->set_markup ($markup);
1160 1441
1161 delete $self->{texture}; 1442 $self->update;
1162 $self->check_size; 1443 $self->check_size;
1163 $self->update;
1164} 1444}
1165 1445
1166sub size_request { 1446sub size_request {
1167 my ($self) = @_; 1447 my ($self) = @_;
1168 1448
1169 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1449 $self->{layout}->set_font ($self->{font}) if $self->{font};
1170 $self->{layout}->set_width ($self->{max_w} || -1); 1450 $self->{layout}->set_width ($self->{max_w} || -1);
1451 $self->{layout}->set_ellipsise ($self->{ellipsise});
1452 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1171 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1453 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1172 1454
1173 my ($w, $h) = $self->{layout}->size; 1455 my ($w, $h) = $self->{layout}->size;
1174 1456
1175 if (exists $self->{template}) { 1457 if (exists $self->{template}) {
… …
1197sub set_fontsize { 1479sub set_fontsize {
1198 my ($self, $fontsize) = @_; 1480 my ($self, $fontsize) = @_;
1199 1481
1200 $self->{fontsize} = $fontsize; 1482 $self->{fontsize} = $fontsize;
1201 delete $self->{texture}; 1483 delete $self->{texture};
1484
1485 $self->update;
1202 $self->check_size; 1486 $self->check_size;
1203 $self->update;
1204} 1487}
1205 1488
1206sub _draw { 1489sub _draw {
1207 my ($self) = @_; 1490 my ($self) = @_;
1208 1491
1492 $self->SUPER::_draw; # draw background, if applicable
1493
1209 my $tex = $self->{texture} ||= do { 1494 my $tex = $self->{texture} ||= do {
1495 $self->{layout}->set_foreground (@{$self->{fg}});
1210 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1496 $self->{layout}->set_font ($self->{font}) if $self->{font};
1211 $self->{layout}->set_width ($self->{w}); 1497 $self->{layout}->set_width ($self->{w});
1498 $self->{layout}->set_ellipsise ($self->{ellipsise});
1499 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1212 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501
1213 new_from_layout CFClient::Texture $self->{layout} 1502 my $tex = new_from_layout CFClient::Texture $self->{layout};
1503
1504 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1505 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1506 : ($self->{w} - $tex->{w}) * 0.5);
1507
1508 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1509 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1510 : ($self->{h} - $tex->{h}) * 0.5);
1511
1512 $tex
1214 }; 1513 };
1215 1514
1216 glEnable GL_BLEND;
1217 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1218 glEnable GL_TEXTURE_2D; 1515 glEnable GL_TEXTURE_2D;
1219 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1516 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1220 1517
1518 if ($tex->{format} == GL_ALPHA) {
1221 glColor @{$self->{fg}}; 1519 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}); 1520 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1521 } else {
1522 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1523 }
1236 1524
1237 glDisable GL_TEXTURE_2D; 1525 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND;
1239} 1526}
1240 1527
1241############################################################################# 1528#############################################################################
1242 1529
1243package CFClient::UI::EntryBase; 1530package CFClient::UI::EntryBase;
… …
1248 1535
1249sub new { 1536sub new {
1250 my $class = shift; 1537 my $class = shift;
1251 1538
1252 $class->SUPER::new ( 1539 $class->SUPER::new (
1253 fg => [1, 1, 1], 1540 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1541 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1542 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1543 active_fg => [0, 0, 0],
1257 can_hover => 1, 1544 can_hover => 1,
1258 can_focus => 1, 1545 can_focus => 1,
1259 valign => 0, 1546 valign => 0,
1260 can_events => 1, 1547 can_events => 1,
1548 #text => ...
1261 @_ 1549 @_
1262 ) 1550 )
1263} 1551}
1264 1552
1265sub _set_text { 1553sub _set_text {
… …
1275 $self->{text} = $text; 1563 $self->{text} = $text;
1276 1564
1277 $text =~ s/./*/g if $self->{hidden}; 1565 $text =~ s/./*/g if $self->{hidden};
1278 $self->{layout}->set_text ("$text "); 1566 $self->{layout}->set_text ("$text ");
1279 1567
1280 $self->emit (changed => $self->{text}); 1568 $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} 1569}
1300 1570
1301sub set_text { 1571sub set_text {
1302 my ($self, $text) = @_; 1572 my ($self, $text) = @_;
1303 1573
1304 $self->{cursor} = length $text; 1574 $self->{cursor} = length $text;
1305 $self->_set_text ($text); 1575 $self->_set_text ($text);
1306 $self->update; 1576 $self->update;
1577 $self->check_size;
1578}
1579
1580sub get_text {
1581 $_[0]{text}
1582}
1583
1584sub size_request {
1585 my ($self) = @_;
1586
1587 my ($w, $h) = $self->SUPER::size_request;
1588
1589 ($w + 1, $h) # add 1 for cursor
1307} 1590}
1308 1591
1309sub key_down { 1592sub key_down {
1310 my ($self, $ev) = @_; 1593 my ($self, $ev) = @_;
1311 1594
… …
1313 my $sym = $ev->{sym}; 1596 my $sym = $ev->{sym};
1314 my $uni = $ev->{unicode}; 1597 my $uni = $ev->{unicode};
1315 1598
1316 my $text = $self->get_text; 1599 my $text = $self->get_text;
1317 1600
1318 if ($sym == 8) { 1601 if ($uni == 8) {
1319 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1602 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1320 } elsif ($sym == 127) { 1603 } elsif ($uni == 127) {
1321 substr $text, $self->{cursor}, 1, ""; 1604 substr $text, $self->{cursor}, 1, "";
1322 } elsif ($sym == CFClient::SDLK_LEFT) { 1605 } elsif ($sym == CFClient::SDLK_LEFT) {
1323 --$self->{cursor} if $self->{cursor}; 1606 --$self->{cursor} if $self->{cursor};
1324 } elsif ($sym == CFClient::SDLK_RIGHT) { 1607 } elsif ($sym == CFClient::SDLK_RIGHT) {
1325 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1608 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1326 } elsif ($sym == CFClient::SDLK_HOME) { 1609 } elsif ($sym == CFClient::SDLK_HOME) {
1327 $self->{cursor} = 0; 1610 $self->{cursor} = 0;
1328 } elsif ($sym == CFClient::SDLK_END) { 1611 } elsif ($sym == CFClient::SDLK_END) {
1329 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1330 } elsif ($sym == 27) { 1613 } elsif ($uni == 27) {
1331 $self->emit ('escape'); 1614 $self->_emit ('escape');
1332 } elsif ($uni) { 1615 } elsif ($uni) {
1333 substr $text, $self->{cursor}++, 0, chr $uni; 1616 substr $text, $self->{cursor}++, 0, chr $uni;
1334 } 1617 }
1335 1618
1336 $self->_set_text ($text); 1619 $self->_set_text ($text);
1337 $self->update; 1620 $self->update;
1621 $self->check_size;
1338} 1622}
1339 1623
1340sub focus_in { 1624sub focus_in {
1341 my ($self) = @_; 1625 my ($self) = @_;
1342 1626
… …
1418 my ($self, $ev) = @_; 1702 my ($self, $ev) = @_;
1419 1703
1420 my $sym = $ev->{sym}; 1704 my $sym = $ev->{sym};
1421 1705
1422 if ($sym == 13) { 1706 if ($sym == 13) {
1707 unshift @{$self->{history}},
1708 my $txt = $self->get_text;
1709 $self->{history_pointer} = -1;
1710 $self->{history_saveback} = '';
1423 $self->emit (activate => $self->get_text); 1711 $self->_emit (activate => $txt);
1424 $self->update; 1712 $self->update;
1713
1714 } elsif ($sym == CFClient::SDLK_UP) {
1715 if ($self->{history_pointer} < 0) {
1716 $self->{history_saveback} = $self->get_text;
1717 }
1718 if (@{$self->{history} || []} > 0) {
1719 $self->{history_pointer}++;
1720 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1721 $self->{history_pointer} = @{$self->{history} || []} - 1;
1722 }
1723 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1724 }
1725
1726 } elsif ($sym == CFClient::SDLK_DOWN) {
1727 $self->{history_pointer}--;
1728 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1729
1730 if ($self->{history_pointer} >= 0) {
1731 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1732 } else {
1733 $self->set_text ($self->{history_saveback});
1734 }
1425 1735
1426 } else { 1736 } else {
1427 $self->SUPER::key_down ($ev); 1737 $self->SUPER::key_down ($ev);
1428 } 1738 }
1429 1739
… …
1443 1753
1444sub new { 1754sub new {
1445 my $class = shift; 1755 my $class = shift;
1446 1756
1447 $class->SUPER::new ( 1757 $class->SUPER::new (
1448 padding => 4, 1758 padding => 4,
1449 fg => [1, 1, 1], 1759 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1760 active_fg => [0, 0, 1],
1452 can_hover => 1, 1761 can_hover => 1,
1453 align => 0, 1762 align => 0,
1454 valign => 0, 1763 valign => 0,
1455 can_events => 1, 1764 can_events => 1,
1456 @_ 1765 @_
1457 ) 1766 )
1458} 1767}
1459 1768
1769sub activate { }
1770
1460sub button_up { 1771sub button_up {
1461 my ($self, $ev, $x, $y) = @_; 1772 my ($self, $ev, $x, $y) = @_;
1462 1773
1774 $self->emit ("activate")
1463 if ($x >= 0 && $x < $self->{w} 1775 if $x >= 0 && $x < $self->{w}
1464 && $y >= 0 && $y < $self->{h}) { 1776 && $y >= 0 && $y < $self->{h};
1465 $self->emit ("activate");
1466 }
1467} 1777}
1468 1778
1469sub _draw { 1779sub _draw {
1470 my ($self) = @_; 1780 my ($self) = @_;
1471 1781
… …
1473 1783
1474 if ($GRAB == $self) { 1784 if ($GRAB == $self) {
1475 $self->{fg} = $self->{active_fg}; 1785 $self->{fg} = $self->{active_fg};
1476 } 1786 }
1477 1787
1478 glEnable GL_BLEND;
1479 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480 glEnable GL_TEXTURE_2D; 1788 glEnable GL_TEXTURE_2D;
1481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482 glColor 0, 0, 0, 1; 1790 glColor 0, 0, 0, 1;
1483 1791
1484 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1792 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1485 1793
1486 glDisable GL_TEXTURE_2D; 1794 glDisable GL_TEXTURE_2D;
1487 glDisable GL_BLEND;
1488 1795
1489 $self->SUPER::_draw; 1796 $self->SUPER::_draw;
1490} 1797}
1491 1798
1492############################################################################# 1799#############################################################################
… …
1506 1813
1507 $class->SUPER::new ( 1814 $class->SUPER::new (
1508 padding => 2, 1815 padding => 2,
1509 fg => [1, 1, 1], 1816 fg => [1, 1, 1],
1510 active_fg => [1, 1, 0], 1817 active_fg => [1, 1, 0],
1818 bg => [0, 0, 0, 0.2],
1819 active_bg => [1, 1, 1, 0.5],
1511 state => 0, 1820 state => 0,
1512 can_hover => 1, 1821 can_hover => 1,
1513 @_ 1822 @_
1514 ) 1823 )
1515} 1824}
… …
1524 my ($self, $ev, $x, $y) = @_; 1833 my ($self, $ev, $x, $y) = @_;
1525 1834
1526 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1527 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1528 $self->{state} = !$self->{state}; 1837 $self->{state} = !$self->{state};
1529 $self->emit (changed => $self->{state}); 1838 $self->_emit (changed => $self->{state});
1530 } 1839 }
1531} 1840}
1532 1841
1533sub _draw { 1842sub _draw {
1534 my ($self) = @_; 1843 my ($self) = @_;
… …
1539 1848
1540 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1849 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1541 1850
1542 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1851 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1543 1852
1544 glEnable GL_BLEND; 1853 my $tex = $self->{state} ? $tex[1] : $tex[0];
1854
1545 glEnable GL_TEXTURE_2D; 1855 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); 1856 $tex->draw_quad_alpha (0, 0, $s, $s);
1551
1552 glDisable GL_TEXTURE_2D; 1857 glDisable GL_TEXTURE_2D;
1553 glDisable GL_BLEND;
1554} 1858}
1555 1859
1556############################################################################# 1860#############################################################################
1557 1861
1558package CFClient::UI::Image; 1862package CFClient::UI::Image;
… …
1601 glTranslate 0, -$self->{w}, 0; 1905 glTranslate 0, -$self->{w}, 0;
1602 1906
1603 ($w, $h) = ($h, $w); 1907 ($w, $h) = ($h, $w);
1604 } 1908 }
1605 1909
1606 glEnable GL_BLEND;
1607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1608 glEnable GL_TEXTURE_2D; 1910 glEnable GL_TEXTURE_2D;
1609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1911 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1610 1912
1611 $tex->draw_quad (0, 0, $w, $h); 1913 $tex->draw_quad_alpha (0, 0, $w, $h);
1612 1914
1613 glDisable GL_BLEND;
1614 glDisable GL_TEXTURE_2D; 1915 glDisable GL_TEXTURE_2D;
1615} 1916}
1616 1917
1617############################################################################# 1918#############################################################################
1618 1919
… …
1666} 1967}
1667 1968
1668sub set_max { 1969sub set_max {
1669 my ($self, $max) = @_; 1970 my ($self, $max) = @_;
1670 1971
1972 return if $self->{max_val} == $max;
1973
1671 $self->{max_val} = $max; 1974 $self->{max_val} = $max;
1975 $self->update;
1672} 1976}
1673 1977
1674sub set_value { 1978sub set_value {
1675 my ($self, $val, $max) = @_; 1979 my ($self, $val, $max) = @_;
1676 1980
1677 $self->set_max ($max) 1981 $self->set_max ($max)
1678 if defined $max; 1982 if defined $max;
1679 1983
1680 $max = $self->{max_val}; 1984 return if $self->{val} == $val;
1985
1681 $self->{val} = $val; 1986 $self->{val} = $val;
1682
1683 $self->update; 1987 $self->update;
1684} 1988}
1685 1989
1686sub _draw { 1990sub _draw {
1687 my ($self) = @_; 1991 my ($self) = @_;
… …
1750 2054
1751sub new { 2055sub new {
1752 my ($class, %arg) = @_; 2056 my ($class, %arg) = @_;
1753 2057
1754 my $self = $class->SUPER::new ( 2058 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 2059 tooltip => $arg{type},
2060 can_hover => 1,
1756 can_events => 1, 2061 can_events => 1,
1757 can_hover => 1,
1758 %arg, 2062 %arg,
1759 ); 2063 );
1760 2064
1761 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2065 $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); 2066 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1770 2074
1771 $self->{value}->set_fontsize ($fsize); 2075 $self->{value}->set_fontsize ($fsize);
1772 $self->{max} ->set_fontsize ($fsize); 2076 $self->{max} ->set_fontsize ($fsize);
1773} 2077}
1774 2078
2079sub set_max {
2080 my ($self, $max) = @_;
2081
2082 $self->{gauge}->set_max ($max);
2083 $self->{max}->set_text ($max);
2084}
2085
1775sub set_value { 2086sub set_value {
1776 my ($self, $val, $max) = @_; 2087 my ($self, $val, $max) = @_;
1777 2088
1778 $self->set_max ($max) 2089 $self->set_max ($max)
1779 if defined $max; 2090 if defined $max;
1780 2091
1781 $self->{gauge}->set_value ($val, $max); 2092 $self->{gauge}->set_value ($val, $max);
1782 $self->{value}->set_text ($val); 2093 $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} 2094}
1791 2095
1792############################################################################# 2096#############################################################################
1793 2097
1794package CFClient::UI::Slider; 2098package CFClient::UI::Slider;
… …
1804 qw(s1_slider.png s1_slider_bg.png); 2108 qw(s1_slider.png s1_slider_bg.png);
1805 2109
1806sub new { 2110sub new {
1807 my $class = shift; 2111 my $class = shift;
1808 2112
1809 # range [value, low, high, page] 2113 # range [value, low, high, page, unit]
1810 2114
1811 # TODO: 0-width page 2115 # TODO: 0-width page
1812 # TODO: req_w/h are wrong with vertical 2116 # TODO: req_w/h are wrong with vertical
1813 # TODO: calculations are off 2117 # TODO: calculations are off
1814 my $self = $class->SUPER::new ( 2118 my $self = $class->SUPER::new (
1815 fg => [1, 1, 1], 2119 fg => [1, 1, 1],
1816 active_fg => [0, 0, 0], 2120 active_fg => [0, 0, 0],
2121 bg => [0, 0, 0, 0.2],
2122 active_bg => [1, 1, 1, 0.5],
1817 range => [0, 0, 100, 10], 2123 range => [0, 0, 100, 10, 0],
1818 req_w => 20, 2124 req_w => $::WIDTH / 80,
1819 req_h => 20, 2125 req_h => $::WIDTH / 80,
1820 vertical => 0, 2126 vertical => 0,
1821 can_hover => 1, 2127 can_hover => 1,
1822 inner_pad => 5, 2128 inner_pad => 0.02,
1823 @_ 2129 @_
1824 ); 2130 );
1825 2131
2132 $self->set_value ($self->{range}[0]);
2133 $self->update;
2134
1826 $self 2135 $self
2136}
2137
2138sub set_range {
2139 my ($self, $range) = @_;
2140
2141 $self->{range} = $range;
2142
2143 $self->update;
2144}
2145
2146sub set_value {
2147 my ($self, $value) = @_;
2148
2149 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2150
2151 $hi = $lo + 1 if $hi <= $lo;
2152
2153 $page = $hi - $lo if $page > $hi - $lo;
2154
2155 $value = $lo if $value < $lo;
2156 $value = $hi - $page if $value > $hi - $page;
2157
2158 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2159 if $unit;
2160
2161 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2162
2163 if ($value != $old_value) {
2164 $self->_emit (changed => $value);
2165 $self->update;
2166 }
1827} 2167}
1828 2168
1829sub size_request { 2169sub size_request {
1830 my ($self) = @_; 2170 my ($self) = @_;
1831 2171
… …
1837 2177
1838sub button_down { 2178sub button_down {
1839 my ($self, $ev, $x, $y) = @_; 2179 my ($self, $ev, $x, $y) = @_;
1840 2180
1841 $self->SUPER::button_down ($ev, $x, $y); 2181 $self->SUPER::button_down ($ev, $x, $y);
2182
2183 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184
1842 $self->mouse_motion ($ev, $x, $y); 2185 $self->mouse_motion ($ev, $x, $y);
1843} 2186}
1844 2187
1845sub mouse_motion { 2188sub mouse_motion {
1846 my ($self, $ev, $x, $y) = @_; 2189 my ($self, $ev, $x, $y) = @_;
1847 2190
1848 if ($GRAB == $self) { 2191 if ($GRAB == $self) {
2192 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2193
2194 my (undef, $lo, $hi, $page) = @{$self->{range}};
2195
2196 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2197
2198 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2199 }
2200}
2201
2202sub update {
2203 my ($self) = @_;
2204
2205 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2206 $self->set_value ($self->{range}[0]);
2207
1849 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2208 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100;
1850 2210
1851 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2211 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1852 2212
1853 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2213 $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 2214 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1855 2215
1856 $x -= $inner_pad_px; # substract the padding 2216 $value = ($value - $lo) / $range;
1857 $x = $x * ($hi - $lo) / $inner_w + $lo; 2217 $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 2218
1862 $self->emit (changed => $x); 2219 $self->{knob_x} = $value - $knob_w * 0.5;
1863 $self->update; 2220 $self->{knob_w} = $knob_w;
1864 } 2221 });
1865}
1866 2222
1867# the inner_* stuff is for generating a padding for the slider handle, 2223 $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} 2224}
1874 2225
1875sub _draw { 2226sub _draw {
1876 my ($self) = @_; 2227 my ($self) = @_;
1877 2228
1878 $self->SUPER::_draw (); 2229 $self->SUPER::_draw ();
1879 2230
1880 my ($w, $h) = @$self{qw(w h)}; 2231 glScale $self->{w}, $self->{h};
1881 2232
1882 if ($self->{vertical}) { 2233 if ($self->{vertical}) {
1883 # draw a vertical slider like a rotated horizontal slider 2234 # draw a vertical slider like a rotated horizontal slider
1884 2235
2236 glTranslate 1, 0, 0;
1885 glRotate 90, 0, 0, 1; 2237 glRotate 90, 0, 0, 1;
1886 glTranslate 0, -$self->{w}, 0;
1887
1888 ($w, $h) = ($h, $w);
1889 } 2238 }
1890 2239
1891 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2240 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1892 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2241 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1893 2242
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; 2243 glEnable GL_TEXTURE_2D;
1915 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1916 2245
1917 # draw background 2246 # draw background
1918 $tex[1]->draw_quad (0, 0, $w, $h); 2247 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1919 2248
1920 # draw handle 2249 # draw handle
1921 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2250 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1922 2251
1923 glDisable GL_BLEND;
1924 glDisable GL_TEXTURE_2D; 2252 glDisable GL_TEXTURE_2D;
1925} 2253}
2254
2255#############################################################################
2256
2257package CFClient::UI::ValSlider;
2258
2259our @ISA = CFClient::UI::HBox::;
2260
2261sub new {
2262 my ($class, %arg) = @_;
2263
2264 my $range = delete $arg{range};
2265
2266 my $self = $class->SUPER::new (
2267 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2268 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2269 to_value => sub { shift },
2270 from_value => sub { shift },
2271 %arg,
2272 );
2273
2274 $self->{slider}->connect (changed => sub {
2275 my ($self, $value) = @_;
2276 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2277 $self->{parent}->emit (changed => $value);
2278 });
2279
2280# $self->{entry}->connect (changed => sub {
2281# my ($self, $value) = @_;
2282# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2283# $self->{parent}->emit (changed => $value);
2284# });
2285
2286 $self->add ($self->{slider}, $self->{entry});
2287
2288 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2289
2290 $self
2291}
2292
2293sub set_range { shift->{slider}->set_range (@_) }
2294sub set_value { shift->{slider}->set_value (@_) }
1926 2295
1927############################################################################# 2296#############################################################################
1928 2297
1929package CFClient::UI::TextView; 2298package CFClient::UI::TextView;
1930 2299
… …
1934 2303
1935sub new { 2304sub new {
1936 my $class = shift; 2305 my $class = shift;
1937 2306
1938 my $self = $class->SUPER::new ( 2307 my $self = $class->SUPER::new (
1939 fontsize => 1, 2308 fontsize => 1,
2309 can_events => 0,
1940 #font => default_font 2310 #font => default_font
1941 @_, 2311 @_,
1942 2312
1943 layout => (new CFClient::Layout), 2313 layout => (new CFClient::Layout 1),
1944 par => [], 2314 par => [],
1945 height => 0, 2315 height => 0,
1946 children => [ 2316 children => [
1947 (new CFClient::UI::Empty expand => 1), 2317 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2318 (new CFClient::UI::Slider vertical => 1),
1949 ], 2319 ],
1950 ); 2320 );
1951 2321
1952 $self->{children}[1]->connect (changed => sub { 2322 $self->{children}[1]->connect (changed => sub { $self->update });
1953 $self->update;
1954 });
1955 2323
1956 $self 2324 $self
1957} 2325}
1958 2326
1959sub set_fontsize { 2327sub set_fontsize {
1960 my ($self, $fontsize) = @_; 2328 my ($self, $fontsize) = @_;
1961 2329
1962 $self->{fontsize} = $fontsize; 2330 $self->{fontsize} = $fontsize;
1963 $self->reflow; 2331 $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} 2332}
1984 2333
1985sub size_allocate { 2334sub size_allocate {
1986 my ($self, $w, $h) = @_; 2335 my ($self, $w, $h) = @_;
1987 2336
… …
1992 $self->{layout}->set_width ($self->{children}[0]{w}); 2341 $self->{layout}->set_width ($self->{children}[0]{w});
1993 2342
1994 $self->reflow; 2343 $self->reflow;
1995} 2344}
1996 2345
2346sub text_size {
2347 my ($self, $text, $indent) = @_;
2348
2349 my $layout = $self->{layout};
2350
2351 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2352 $layout->set_width ($self->{children}[0]{w} - $indent);
2353 $layout->set_markup ($text);
2354
2355 $layout->size
2356}
2357
2358sub reflow {
2359 my ($self) = @_;
2360
2361 $self->{need_reflow}++;
2362 $self->update;
2363}
2364
2365sub set_offset {
2366 my ($self, $offset) = @_;
2367
2368 # todo: base offset on lines or so, not on pixels
2369 $self->{children}[1]->set_value ($offset);
2370}
2371
2372sub clear {
2373 my ($self) = @_;
2374
2375 $self->{par} = [];
2376 $self->{height} = 0;
2377 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2378}
2379
1997sub add_paragraph { 2380sub add_paragraph {
1998 my ($self, $color, $text) = @_; 2381 my ($self, $color, $text, $indent) = @_;
1999 2382
2000 #TODO: intelligently "reformat" paragraph 2383 for my $line (split /\n/, $text) {
2001 2384 my ($w, $h) = $self->text_size ($line);
2002 my $height = $self->text_height ($text);
2003
2004 $self->{height} += $height; 2385 $self->{height} += $h;
2386 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2387 }
2005 2388
2006 push @{$self->{par}}, [$height, $color, $text];
2007
2008 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2389 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2009 $self->{children}[1]->update;
2010} 2390}
2011 2391
2012sub update { 2392sub update {
2013 my ($self) = @_; 2393 my ($self) = @_;
2014 2394
… …
2016 2396
2017 return unless $self->{h} > 0; 2397 return unless $self->{h} > 0;
2018 2398
2019 delete $self->{texture}; 2399 delete $self->{texture};
2020 2400
2021 $ROOT->on_refresh ($self, sub { 2401 $ROOT->on_post_alloc ($self, sub {
2402 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2403
2022 if (delete $self->{need_reflow}) { 2404 if (delete $self->{need_reflow}) {
2023 my $height = 0; 2405 my $height = 0;
2024 2406
2025 $height += $_->[0] = $self->text_height ($_->[2]) 2407 my $layout = $self->{layout};
2408
2409 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2410
2026 for @{$self->{par}}; 2411 for (@{$self->{par}}) {
2412 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2413 $layout->set_width ($W - $_->[3]);
2414 $layout->set_markup ($_->[4]);
2415 my ($w, $h) = $layout->size;
2416 $_->[0] = $w + $_->[3];
2417 $_->[1] = $h;
2418 }
2419
2420 $height += $_->[1];
2421 }
2027 2422
2028 $self->{height} = $height; 2423 $self->{height} = $height;
2029 2424
2030 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2425 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2031 2426
2032 delete $self->{texture}; 2427 delete $self->{texture};
2033 } 2428 }
2034 2429
2035 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2430 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2036 glClearColor 0, 0, 0, 1; 2431 glClearColor 0.5, 0.5, 0.5, 0;
2037 glClear GL_COLOR_BUFFER_BIT; 2432 glClear GL_COLOR_BUFFER_BIT;
2038 2433
2434 my $top = int $self->{children}[1]{range}[0];
2435
2436 my $y0 = $top;
2437 my $y1 = $top + $H;
2438
2439 my $y = 0;
2440
2441 my $layout = $self->{layout};
2442
2443 $layout->set_font ($self->{font}) if $self->{font};
2444
2039 glEnable GL_BLEND; 2445 glEnable GL_BLEND;
2446 #TODO# not correct in windows where rgba is forced off
2040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2447 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 2448
2055 for my $par (@{$self->{par}}) { 2449 for my $par (@{$self->{par}}) {
2056 my $h = $par->[0]; 2450 my $h = $par->[1];
2057 2451
2058 if ($y0 < $y + $h && $y < $y1) { 2452 if ($y0 < $y + $h && $y < $y1) {
2453 $layout->set_foreground (@{ $par->[2] });
2454 $layout->set_width ($W - $par->[3]);
2059 $layout->set_text ($par->[2]); 2455 $layout->set_markup ($par->[4]);
2060 2456
2061 glColor @{ $par->[1] }; 2457 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2062 my ($W, $H) = $layout->size; 2458
2063 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2459 glRasterPos $par->[3], $y - $y0;
2460 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2064 } 2461 }
2065 2462
2066 $y += $h; 2463 $y += $h;
2067 } 2464 }
2068 2465
2069 glDisable GL_TEXTURE_2D;
2070 glDisable GL_BLEND; 2466 glDisable GL_BLEND;
2071 }; 2467 };
2072 }); 2468 });
2073} 2469}
2074 2470
2075sub _draw { 2471sub _draw {
2076 my ($self) = @_; 2472 my ($self) = @_;
2077 2473
2078 if ($self->{texture}) {
2079 glEnable GL_TEXTURE_2D; 2474 glEnable GL_TEXTURE_2D;
2080 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2475 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2476 glColor 1, 1, 1, 1;
2081 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2477 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2082 glDisable GL_TEXTURE_2D; 2478 glDisable GL_TEXTURE_2D;
2083 }
2084 2479
2085 $self->{children}[1]->draw; 2480 $self->{children}[1]->draw;
2086 2481
2087} 2482}
2088 2483
… …
2136 2531
2137sub new { 2532sub new {
2138 my $class = shift; 2533 my $class = shift;
2139 2534
2140 my $self = $class->SUPER::new ( 2535 my $self = $class->SUPER::new (
2141 state => 0, 2536 state => 0,
2142 connect_activate => \&toggle_flopper, 2537 connect_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2538 @_
2145 ); 2539 );
2146 2540
2147 if ($self->{state}) { 2541 if ($self->{state}) {
2148 $self->{state} = 0; 2542 $self->{state} = 0;
… …
2157 2551
2158 # TODO: use animation 2552 # TODO: use animation
2159 if ($self->{state} = !$self->{state}) { 2553 if ($self->{state} = !$self->{state}) {
2160 $CFClient::UI::ROOT->add ($self->{other}); 2554 $CFClient::UI::ROOT->add ($self->{other});
2161 $self->{other}->move ($self->coord2global (0, $self->{h})); 2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2162 $self->emit ("open"); 2556 $self->_emit ("open");
2163 } else { 2557 } else {
2164 $CFClient::UI::ROOT->remove ($self->{other}); 2558 $CFClient::UI::ROOT->remove ($self->{other});
2165 $self->emit ("close"); 2559 $self->_emit ("close");
2166 } 2560 }
2167 2561
2168 $self->emit (changed => $self->{state}); 2562 $self->_emit (changed => $self->{state});
2169} 2563}
2170 2564
2171############################################################################# 2565#############################################################################
2172 2566
2173package CFClient::UI::Tooltip; 2567package CFClient::UI::Tooltip;
… …
2183 @_, 2577 @_,
2184 can_events => 0, 2578 can_events => 0,
2185 ) 2579 )
2186} 2580}
2187 2581
2188sub set_text { 2582sub set_tooltip_from {
2189 my ($self, $text) = @_; 2583 my ($self, $widget) = @_;
2190 2584
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2585 $self->add (new CFClient::UI::Label
2192 $self->{label}->set_text ($text); 2586 markup => $widget->{tooltip},
2193 $self->add ($self->{label}); 2587 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2588 fontsize => 0.8,
2589 fg => [0, 0, 0, 1],
2590 ellipsise => 0,
2591 font => ($widget->{tooltip_font} || $::FONT_PROP),
2592 );
2194} 2593}
2195 2594
2196sub size_request { 2595sub size_request {
2197 my ($self) = @_; 2596 my ($self) = @_;
2198 2597
2199 $self->child->set_max_size ($::WIDTH * 0.3);
2200
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2598 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2599
2203 ($w + 4, $h + 4) 2600 ($w + 4, $h + 4)
2204} 2601}
2205 2602
2603sub size_allocate {
2604 my ($self, $w, $h) = @_;
2605
2606 $self->SUPER::size_allocate ($w - 4, $h - 4);
2607}
2608
2206sub _draw { 2609sub _draw {
2207 my ($self) = @_; 2610 my ($self) = @_;
2208 2611
2209 glPushMatrix;
2210 glTranslate 0.375, 0.375; 2612 glTranslate 0.375, 0.375;
2211 2613
2212 my ($w, $h) = @$self{qw(w h)}; 2614 my ($w, $h) = @$self{qw(w h)};
2213 2615
2214 glColor 1, 0.8, 0.4; 2616 glColor 1, 0.8, 0.4;
… …
2225 glVertex 0 , $h; 2627 glVertex 0 , $h;
2226 glVertex $w, $h; 2628 glVertex $w, $h;
2227 glVertex $w, 0; 2629 glVertex $w, 0;
2228 glEnd; 2630 glEnd;
2229 2631
2230 glPopMatrix; 2632 glTranslate 2 - 0.375, 2 - 0.375;
2231
2232 glTranslate 2, 2;
2233 $self->SUPER::_draw; 2633 $self->SUPER::_draw;
2234} 2634}
2235 2635
2236############################################################################# 2636#############################################################################
2237 2637
2638package CFClient::UI::Face;
2639
2640our @ISA = CFClient::UI::Base::;
2641
2642use CFClient::OpenGL;
2643
2644sub new {
2645 my $class = shift;
2646
2647 my $self = $class->SUPER::new (
2648 aspect => 1,
2649 can_events => 0,
2650 @_,
2651 );
2652
2653 if ($self->{anim} && $self->{animspeed}) {
2654 Scalar::Util::weaken (my $widget = $self);
2655
2656 $self->{timer} = Event->timer (
2657 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2658 hard => 1,
2659 interval => $self->{animspeed},
2660 cb => sub {
2661 ++$widget->{frame};
2662 $widget->update;
2663 },
2664 );
2665 }
2666
2667 $self
2668}
2669
2670sub size_request {
2671 (32, 8)
2672}
2673
2674sub update {
2675 my ($self) = @_;
2676
2677 return unless $self->{visible};
2678
2679 $self->SUPER::update;
2680}
2681
2682sub _draw {
2683 my ($self) = @_;
2684
2685 return unless $::CONN;
2686
2687 my $face;
2688
2689 if ($self->{frame}) {
2690 my $anim = $::CONN->{anim}[$self->{anim}];
2691
2692 $face = $anim->[ $self->{frame} % @$anim ]
2693 if $anim && @$anim;
2694 }
2695
2696 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2697
2698 if ($tex) {
2699 glEnable GL_TEXTURE_2D;
2700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2701 glColor 1, 1, 1, 1;
2702 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2703 glDisable GL_TEXTURE_2D;
2704 }
2705}
2706
2707sub DESTROY {
2708 my ($self) = @_;
2709
2710 $self->{timer}->cancel
2711 if $self->{timer};
2712
2713 $self->SUPER::DESTROY;
2714}
2715
2716#############################################################################
2717
2718package CFClient::UI::Inventory;
2719
2720our @ISA = CFClient::UI::ScrolledWindow::;
2721
2722sub new {
2723 my $class = shift;
2724
2725 my $self = $class->SUPER::new (
2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2727 @_,
2728 );
2729
2730 $self
2731}
2732
2733sub set_items {
2734 my ($self, $items) = @_;
2735
2736 $self->{scrolled}->clear;
2737 return unless $items;
2738
2739 my @items = sort {
2740 ($a->{type} <=> $b->{type})
2741 or ($a->{name} cmp $b->{name})
2742 } @$items;
2743
2744 $self->{real_items} = \@items;
2745
2746 my $row = 0;
2747 for my $item (@items) {
2748 CFClient::Item::update_widgets $item;
2749
2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753
2754 $row++;
2755 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h});
2763}
2764
2765#############################################################################
2766
2767package CFClient::UI::Menu;
2768
2769our @ISA = CFClient::UI::FancyFrame::;
2770
2771use CFClient::OpenGL;
2772
2773sub new {
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 items => [],
2778 z => 100,
2779 @_,
2780 );
2781
2782 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2783
2784 for my $item (@{ $self->{items} }) {
2785 my ($widget, $cb) = @$item;
2786
2787 # handle various types of items, only text for now
2788 if (!ref $widget) {
2789 $widget = new CFClient::UI::Label
2790 can_hover => 1,
2791 can_events => 1,
2792 text => $widget;
2793 }
2794
2795 $self->{item}{$widget} = $item;
2796
2797 $self->{vbox}->add ($widget);
2798 }
2799
2800 $self
2801}
2802
2803# popup given the event (must be a mouse button down event currently)
2804sub popup {
2805 my ($self, $ev) = @_;
2806
2807 $self->_emit ("popdown");
2808
2809 # maybe save $GRAB? must be careful about events...
2810 $GRAB = $self;
2811 $self->{button} = $ev->{button};
2812
2813 $self->show;
2814 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2815}
2816
2817sub mouse_motion {
2818 my ($self, $ev, $x, $y) = @_;
2819
2820 # TODO: should use vbox->find_widget or so
2821 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2822 $self->{hover} = $self->{item}{$HOVER};
2823}
2824
2825sub button_up {
2826 my ($self, $ev, $x, $y) = @_;
2827
2828 if ($ev->{button} == $self->{button}) {
2829 undef $GRAB;
2830 $self->hide;
2831
2832 $self->_emit ("popdown");
2833 $self->{hover}[1]->() if $self->{hover};
2834 }
2835}
2836
2837#############################################################################
2838
2839package CFClient::UI::Statusbox;
2840
2841our @ISA = CFClient::UI::VBox::;
2842
2843sub new {
2844 my $class = shift;
2845
2846 $class->SUPER::new (
2847 fontsize => 0.8,
2848 @_,
2849 )
2850}
2851
2852sub reorder {
2853 my ($self) = @_;
2854 my $NOW = time;
2855
2856 while (my ($k, $v) = each %{ $self->{item} }) {
2857 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2858 }
2859
2860 my @widgets;
2861
2862 my @items = sort {
2863 $a->{pri} <=> $b->{pri}
2864 or $b->{id} <=> $a->{id}
2865 } values %{ $self->{item} };
2866
2867 my $count = 10 + 1;
2868 for my $item (@items) {
2869 last unless --$count;
2870
2871 push @widgets, $item->{label} ||= do {
2872 # TODO: doesn't handle markup well (read as: at all)
2873 my $short = $item->{count} > 1
2874 ? "<b>$item->{count} ×</b> $item->{text}"
2875 : $item->{text};
2876
2877 for ($short) {
2878 s/^\s+//;
2879 s/\s+/ /g;
2880 }
2881
2882 new CFClient::UI::Label
2883 markup => $short,
2884 tooltip => $item->{tooltip},
2885 tooltip_font => $::FONT_PROP,
2886 tooltip_width => 0.67,
2887 fontsize => $item->{fontsize} || $self->{fontsize},
2888 max_w => $::WIDTH * 0.44,
2889 fg => $item->{fg},
2890 can_events => 1,
2891 can_hover => 1
2892 };
2893 }
2894
2895 $self->clear;
2896 $self->SUPER::add (reverse @widgets);
2897}
2898
2899sub add {
2900 my ($self, $text, %arg) = @_;
2901
2902 $text =~ s/^\s+//;
2903 $text =~ s/\s+$//;
2904
2905 return unless $text;
2906
2907 my $timeout = time + ((delete $arg{timeout}) || 60);
2908
2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2910
2911 if (my $item = $self->{item}{$group}) {
2912 if ($item->{text} eq $text) {
2913 $item->{count}++;
2914 } else {
2915 $item->{count} = 1;
2916 $item->{text} = $item->{tooltip} = $text;
2917 }
2918 $item->{id} = ++$self->{id};
2919 $item->{timeout} = $timeout;
2920 delete $item->{label};
2921 } else {
2922 $self->{item}{$group} = {
2923 id => ++$self->{id},
2924 text => $text,
2925 timeout => $timeout,
2926 tooltip => $text,
2927 fg => [0.8, 0.8, 0.8, 0.8],
2928 pri => 0,
2929 count => 1,
2930 %arg,
2931 };
2932 }
2933
2934 $self->reorder;
2935}
2936
2937sub reconfigure {
2938 my ($self) = @_;
2939
2940 delete $_->{label}
2941 for values %{ $self->{item} || {} };
2942
2943 $self->reorder;
2944 $self->SUPER::reconfigure;
2945}
2946
2947#############################################################################
2948
2238package CFClient::UI::Root; 2949package CFClient::UI::Root;
2239 2950
2240our @ISA = CFClient::UI::Container::; 2951our @ISA = CFClient::UI::Container::;
2241 2952
2242use CFClient::OpenGL; 2953use CFClient::OpenGL;
2243 2954
2244sub check_size { 2955sub new {
2245 my ($self) = @_; 2956 my $class = shift;
2246 2957
2247 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2958 $class->SUPER::new (
2248} 2959 @_,
2249 2960 )
2250sub size_request {
2251 ($::WIDTH, $::HEIGHT)
2252} 2961}
2253 2962
2254sub configure { 2963sub configure {
2255 my ($self, $x, $y, $w, $h) = @_; 2964 my ($self, $x, $y, $w, $h) = @_;
2256 2965
2257 $self->SUPER::configure ($x, $y, $w, $h); 2966 $self->{w} = $w;
2967 $self->{h} = $h;
2968}
2258 2969
2970sub check_size {
2971 my ($self) = @_;
2972
2973 $self->size_allocate ($self->{w}, $self->{h})
2974 if $self->{w};
2975}
2976
2977sub size_request {
2978 my ($self) = @_;
2979
2980 ($self->{w}, $self->{h})
2981}
2982
2983sub size_allocate {
2984 my ($self, $w, $h) = @_;
2985
2259 for my $child (@{$self->{children}}) { 2986 for my $child ($self->children) {
2260 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2261 2988
2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2990 if exists $child->{req_x};
2991
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2993 if exists $child->{req_y};
2994
2262 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2995 $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; 2996 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997
2264 $child->configure ($X, $Y, $W,$H); 2998 $child->configure ($X, $Y, $W, $H);
2265 } 2999 }
2266} 3000}
2267 3001
2268sub _topleft { 3002sub coord2local {
2269 my ($self, $x, $y) = @_; 3003 my ($self, $x, $y) = @_;
2270 3004
2271 ($x, $y) 3005 ($x, $y)
2272} 3006}
2273 3007
3008sub coord2global {
3009 my ($self, $x, $y) = @_;
3010
3011 ($x, $y)
3012}
3013
2274sub update { 3014sub update {
2275 my ($self) = @_; 3015 my ($self) = @_;
2276 3016
2277 $self->check_size; 3017 $self->check_size;
2278 ::refresh (); 3018 $::WANT_REFRESH++;
2279} 3019}
2280 3020
2281sub add { 3021sub add {
2282 my ($self, $child) = @_; 3022 my ($self, @children) = @_;
2283 3023
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029
3030 for my $child (@children) {
3031 $child->{is_toplevel} = 1;
3032
2284 # integerize window positions 3033 # integerise window positions
2285 $child->{x} = int $child->{x}; 3034 $child->{x} = int $child->{x};
2286 $child->{y} = int $child->{y}; 3035 $child->{y} = int $child->{y};
3036 }
2287 3037
2288 $self->SUPER::add ($child); 3038 $self->SUPER::add (@children);
3039}
3040
3041sub remove {
3042 my ($self, @children) = @_;
3043
3044 $self->SUPER::remove (@children);
3045
3046 while (@children) {
3047 my $w = pop @children;
3048 push @children, $w->children;
3049 $w->set_invisible;
3050 }
2289} 3051}
2290 3052
2291sub on_refresh { 3053sub on_refresh {
2292 my ($self, $id, $cb) = @_; 3054 my ($self, $id, $cb) = @_;
2293 3055
2294 $self->{refresh_hook}{$id} = $cb; 3056 $self->{refresh_hook}{$id} = $cb;
2295} 3057}
2296 3058
3059sub on_post_alloc {
3060 my ($self, $id, $cb) = @_;
3061
3062 $self->{post_alloc_hook}{$id} = $cb;
3063}
3064
2297sub draw { 3065sub draw {
2298 my ($self) = @_; 3066 my ($self) = @_;
2299 3067
2300 while (my $rcb = delete $self->{refresh_hook}) { 3068 while ($self->{refresh_hook}) {
2301 $_->() for values %$rcb; 3069 $_->()
3070 for values %{delete $self->{refresh_hook}};
3071 }
3072
3073 if ($self->{check_size}) {
3074 my @queue = ([], []);
3075
3076 for (;;) {
3077 if ($self->{check_size}) {
3078 # heuristic: check containers last
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3080 for values %{delete $self->{check_size}}
3081 }
3082
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3084
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3086 ? @$widget{qw(user_w user_h)}
3087 : $widget->size_request;
3088
3089 if (delete $widget->{force_alloc}
3090 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3092
3093 $widget->{req_w} = $w;
3094 $widget->{req_h} = $h;
3095
3096 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3097
3098 $widget->{parent}->check_size
3099 if $widget->{parent};
3100 }
3101 }
3102 }
3103
3104 while ($self->{size_alloc}) {
3105 for (values %{delete $self->{size_alloc}}) {
3106 my ($widget, $w, $h) = @$_;
3107
3108 $w = 0 if $w < 0;
3109 $h = 0 if $h < 0;
3110
3111 $widget->{w} = $w;
3112 $widget->{h} = $h;
3113 $widget->emit (size_allocate => $w, $h);
3114 }
3115 }
3116
3117 while ($self->{post_alloc_hook}) {
3118 $_->()
3119 for values %{delete $self->{post_alloc_hook}};
2302 } 3120 }
2303 3121
2304 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3122 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2305 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3123 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2306 glClear GL_COLOR_BUFFER_BIT; 3124 glClear GL_COLOR_BUFFER_BIT;
2307 3125
2308 glMatrixMode GL_PROJECTION; 3126 glMatrixMode GL_PROJECTION;
2309 glLoadIdentity; 3127 glLoadIdentity;
2310 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3128 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2311 glMatrixMode GL_MODELVIEW; 3129 glMatrixMode GL_MODELVIEW;
2312 glLoadIdentity; 3130 glLoadIdentity;
2313 3131
2314 $self->_draw; 3132 $self->_draw;
2315} 3133}
… …
2317############################################################################# 3135#############################################################################
2318 3136
2319package CFClient::UI; 3137package CFClient::UI;
2320 3138
2321$ROOT = new CFClient::UI::Root; 3139$ROOT = new CFClient::UI::Root;
2322$TOOLTIP = new CFClient::UI::Tooltip; 3140$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2323 3141
23241 31421
2325 3143

Diff Legend

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