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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.250 by root, Sun May 28 02:31:03 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
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
15 38
16sub check_tooltip { 39sub check_tooltip {
17 if (!$GRAB) { 40 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
23 46
24 my $tip = $widget->{tooltip}; 47 my $tip = $widget->{tooltip};
25 48
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 49 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 50
28 $TOOLTIP->set_markup ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 52 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
31 } 62 }
32 63
33 return; 64 return;
34 } 65 }
35 } 66 }
… …
39 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
40} 71}
41 72
42# class methods for events 73# class methods for events
43sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 76 if $FOCUS;
46} 77}
47 78
48sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 81 if $FOCUS;
51} 82}
52 83
53sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
54 my ($ev) = @_; 85 my ($ev) = @_;
… …
63 check_tooltip; 94 check_tooltip;
64 } 95 }
65 96
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 98
68 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 101}
73 102
74sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
75 my ($ev) = @_; 104 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
77 106
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 108
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 110
82 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 113
87 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 116 $grab->update if $grab;
90 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 134
108 check_tooltip; 135 check_tooltip;
109 } 136 }
110 137
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 139 if $HOVER;
115} 140}
116 141
117# convert position array to integers 142# convert position array to integers
118sub harmonize { 143sub harmonize {
119 my ($vals) = @_; 144 my ($vals) = @_;
… …
123 for (@$vals) { 148 for (@$vals) {
124 my $i = int $_ + $rem; 149 my $i = int $_ + $rem;
125 $rem += $_ - $i; 150 $rem += $_ - $i;
126 $_ = $i; 151 $_ = $i;
127 } 152 }
153}
154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
183 }
184 }
185
186 reconfigure_widgets;
128} 187}
129 188
130############################################################################# 189#############################################################################
131 190
132package CFClient::UI::Base; 191package CFClient::UI::Base;
… …
145 can_events => 1, 204 can_events => 1,
146 @_ 205 @_
147 }, $class; 206 }, $class;
148 207
149 for (keys %$self) { 208 for (keys %$self) {
150 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
152 } 211 }
153 } 212 }
154 213
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
155 $self 223 $self
156} 224}
157 225
158sub destroy { 226sub destroy {
159 my ($self) = @_; 227 my ($self) = @_;
… …
168 return if $self->{parent}; 236 return if $self->{parent};
169 237
170 $CFClient::UI::ROOT->add ($self); 238 $CFClient::UI::ROOT->add ($self);
171} 239}
172 240
173sub hide { 241sub center {
174 my ($self) = @_; 242 my ($self) = @_;
243
244 $CFClient::UI::ROOT->on_post_alloc (
245 "center_$self" => sub {
246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247 },
248 );
249
250 $self->update;
251}
252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262}
263
264sub set_invisible {
265 my ($self) = @_;
266
267 return unless $self->{visible};
268
269 # broken show/hide model
270
271 delete $self->{root};
272 delete $self->{visible};
175 273
176 undef $GRAB if $GRAB == $self; 274 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 275 undef $HOVER if $HOVER == $self;
276
277 CFClient::UI::check_tooltip
278 if $CFClient::UI::TOOLTIP->{owner} == $self;
279
280 $self->focus_out;
281
282 $self->emit (visibility_change => 0);
283}
284
285sub set_visibility {
286 my ($self, $visible) = @_;
287
288 return if $self->{visible} == $visible;
289
290 $visible ? $self->hide
291 : $self->show;
292}
293
294sub toggle_visibility {
295 my ($self) = @_;
296
297 $self->{visible}
298 ? $self->hide
299 : $self->show;
300}
301
302sub hide {
303 my ($self) = @_;
304
305 $self->set_invisible;
178 306
179 $self->{parent}->remove ($self) 307 $self->{parent}->remove ($self)
180 if $self->{parent}; 308 if $self->{parent};
181} 309}
182 310
… …
191} 319}
192 320
193sub set_size { 321sub set_size {
194 my ($self, $w, $h) = @_; 322 my ($self, $w, $h) = @_;
195 323
196 $self->{user_w} = $w; 324 $self->{def_w} = $w;
197 $self->{user_h} = $h; 325 $self->{def_h} = $h;
198 326
199 $self->check_size; 327 $self->check_size;
200} 328}
201 329
202sub size_request { 330sub size_request {
… …
224 $self->{y} = $y; 352 $self->{y} = $y;
225 $self->update; 353 $self->update;
226 } 354 }
227 355
228 if ($self->{w} != $w || $self->{h} != $h) { 356 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 358 }
235} 359}
236 360
237sub size_allocate { 361sub size_allocate {
238 # nothing to be done 362 # nothing to be done
239} 363}
240 364
365sub reconfigure {
366 my ($self) = @_;
367
368 $self->check_size (1);
369 $self->update;
370}
371
241sub children { 372sub children {
242} 373}
243 374
244sub set_max_size { 375sub set_max_size {
245 my ($self, $w, $h) = @_; 376 my ($self, $w, $h) = @_;
246 377
247 delete $self->{max_w}; $self->{max_w} = $w if $w; 378 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h; 379 delete $self->{max_h}; $self->{max_h} = $h if $h;
249} 380}
250 381
251# return top left coordinates 382sub set_tooltip {
252sub _topleft {
253 my ($self, $x, $y) = @_; 383 my ($self, $tooltip) = @_;
254 384
255 $self->{parent} 385 $tooltip =~ s/^\s+//;
256 or Carp::confess "no parent widget in _topleft\n";#d# 386 $tooltip =~ s/\s+$//;
257 387
258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 388 return if $self->{tooltip} eq $tooltip;
389
390 $self->{tooltip} = $tooltip;
391
392 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
393 delete $CFClient::UI::TOOLTIP->{owner};
394 CFClient::UI::check_tooltip;
395 }
259} 396}
260 397
261# translate global coordinates to local coordinate system 398# translate global coordinates to local coordinate system
262sub coord2local { 399sub coord2local {
263 my ($self, $x, $y) = @_; 400 my ($self, $x, $y) = @_;
264 401
265 my ($X, $Y) = $self->_topleft; 402 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266 ($x - $X, $y - $Y)
267} 403}
268 404
269# translate local coordinates to global coordinate system 405# translate local coordinates to global coordinate system
270sub coord2global { 406sub coord2global {
271 my ($self, $x, $y) = @_; 407 my ($self, $x, $y) = @_;
272 408
273 my ($X, $Y) = $self->_topleft; 409 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274 ($x + $X, $y + $Y)
275} 410}
276 411
277sub focus_in { 412sub focus_in {
278 my ($self) = @_; 413 my ($self) = @_;
279 414
280 return if $FOCUS == $self; 415 return if $FOCUS == $self;
281 return unless $self->{can_focus}; 416 return unless $self->{can_focus};
282 417
283 my $focus = $FOCUS; $FOCUS = $self; 418 my $focus = $FOCUS; $FOCUS = $self;
284 419
285 $self->emit (focus_in => $focus); 420 $self->_emit (focus_in => $focus);
286 421
287 $focus->update if $focus; 422 $focus->update if $focus;
288 $FOCUS->update; 423 $FOCUS->update;
289} 424}
290 425
… …
293 428
294 return unless $FOCUS == $self; 429 return unless $FOCUS == $self;
295 430
296 my $focus = $FOCUS; undef $FOCUS; 431 my $focus = $FOCUS; undef $FOCUS;
297 432
298 $self->emit (focus_out => $focus); 433 $self->_emit (focus_out => $focus);
299 434
300 $focus->update if $focus; #? 435 $focus->update if $focus; #?
436
437 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
438 unless $FOCUS;
301} 439}
302 440
303sub mouse_motion { } 441sub mouse_motion { }
304sub button_up { } 442sub button_up { }
305sub key_down { } 443sub key_down { }
306sub key_up { } 444sub key_up { }
307 445
308sub button_down { 446sub button_down {
309 my ($self, $ev, $x, $y) = @_; 447 my ($self, $ev, $x, $y) = @_;
310 448
311 $self->focus_in; 449 $self->focus_in;
… …
345 if ($ENV{PCLIENT_DEBUG}) { 483 if ($ENV{PCLIENT_DEBUG}) {
346 glPushMatrix; 484 glPushMatrix;
347 glColor 1, 1, 0, 1; 485 glColor 1, 1, 0, 1;
348 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 486 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
349 glBegin GL_LINE_LOOP; 487 glBegin GL_LINE_LOOP;
350 glVertex 0 , 0; 488 glVertex 0 , 0;
351 glVertex $self->{w}, 0; 489 glVertex $self->{w} - 1, 0;
352 glVertex $self->{w}, $self->{h}; 490 glVertex $self->{w} - 1, $self->{h} - 1;
353 glVertex 0 , $self->{h}; 491 glVertex 0 , $self->{h} - 1;
354 glEnd; 492 glEnd;
355 glPopMatrix; 493 glPopMatrix;
356 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 494 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
357 } 495 }
358} 496}
359 497
360sub _draw { 498sub _draw {
361 my ($self) = @_; 499 my ($self) = @_;
… …
377 515
378sub set_parent { 516sub set_parent {
379 my ($self, $parent) = @_; 517 my ($self, $parent) = @_;
380 518
381 Scalar::Util::weaken ($self->{parent} = $parent); 519 Scalar::Util::weaken ($self->{parent} = $parent);
520
521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523 $self->check_size;
382} 524}
383 525
384sub check_size { 526sub check_size {
385 my ($self) = @_; 527 my ($self, $forced) = @_;
386 528
387 $self->{parent} 529 $self->{force_alloc} = 1 if $forced;
388 or return 1; 530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
389
390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
393
394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
395 $self->{req_w} = $w;
396 $self->{req_h} = $h;
397
398 $self->{parent}->check_size
399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
407 }
408} 531}
409 532
410sub update { 533sub update {
411 my ($self) = @_; 534 my ($self) = @_;
412 535
… …
418 my ($self, $signal, $cb) = @_; 541 my ($self, $signal, $cb) = @_;
419 542
420 push @{ $self->{signal_cb}{$signal} }, $cb; 543 push @{ $self->{signal_cb}{$signal} }, $cb;
421} 544}
422 545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
423sub emit { 552sub emit {
424 my ($self, $signal, @args) = @_; 553 my ($self, $signal, @args) = @_;
425 554
426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 555 $self->_emit ($signal, @args)
556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
427} 561}
428 562
429sub DESTROY { 563sub DESTROY {
430 my ($self) = @_; 564 my ($self) = @_;
431 565
566 delete $WIDGET{$self+0};
432 #$self->deactivate; 567 #$self->deactivate;
433} 568}
434 569
435############################################################################# 570#############################################################################
436 571
… …
445 my $class = shift; 580 my $class = shift;
446 581
447 # range [value, low, high, page] 582 # range [value, low, high, page]
448 583
449 $class->SUPER::new ( 584 $class->SUPER::new (
450 bg => [0, 0, 0, 0.2], 585 #bg => [0, 0, 0, 0.2],
451 active_bg => [1, 1, 1, 0.5], 586 #active_bg => [1, 1, 1, 0.5],
452 @_ 587 @_
453 ) 588 )
454} 589}
455 590
456sub _draw { 591sub _draw {
457 my ($self) = @_; 592 my ($self) = @_;
458 593
594 my $color = $FOCUS == $self && $self->{active_bg}
595 ? $self->{active_bg}
596 : $self->{bg};
597
598 if ($color && (@$color < 4 || $color->[3])) {
459 my ($w, $h) = @$self{qw(w h)}; 599 my ($w, $h) = @$self{qw(w h)};
460 600
461 glEnable GL_BLEND; 601 glEnable GL_BLEND;
462 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
463 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 603 glColor @$color;
464 604
465 glBegin GL_QUADS; 605 glBegin GL_QUADS;
466 glVertex 0 , 0; 606 glVertex 0 , 0;
467 glVertex 0 , $h; 607 glVertex 0 , $h;
468 glVertex $w, $h; 608 glVertex $w, $h;
469 glVertex $w, 0; 609 glVertex $w, 0;
470 glEnd; 610 glEnd;
471 611
472 glDisable GL_BLEND; 612 glDisable GL_BLEND;
613 }
473} 614}
474 615
475############################################################################# 616#############################################################################
476 617
477package CFClient::UI::Empty; 618package CFClient::UI::Empty;
… …
509 650
510 $self 651 $self
511} 652}
512 653
513sub add { 654sub add {
514 my ($self, $child) = @_; 655 my ($self, @widgets) = @_;
515 656
516 $child->set_parent ($self); 657 $_->set_parent ($self)
658 for @widgets;
517 659
518 use sort 'stable'; 660 use sort 'stable';
519 661
520 $self->{children} = [ 662 $self->{children} = [
521 sort { $a->{z} <=> $b->{z} } 663 sort { $a->{z} <=> $b->{z} }
522 @{$self->{children}}, $child 664 @{$self->{children}}, @widgets
523 ]; 665 ];
524 666
525 $child->check_size; 667 $self->check_size (1);
668 $self->update;
526} 669}
527 670
528sub children { 671sub children {
529 @{ $_[0]{children} } 672 @{ $_[0]{children} }
530} 673}
… …
535 delete $child->{parent}; 678 delete $child->{parent};
536 $child->hide; 679 $child->hide;
537 680
538 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
539 682
540 $self->check_size; 683 $self->check_size (1);
541 $self->update; 684 $self->update;
542} 685}
543 686
544sub clear { 687sub clear {
545 my ($self) = @_; 688 my ($self) = @_;
… …
549 692
550 for (@$children) { 693 for (@$children) {
551 delete $_->{parent}; 694 delete $_->{parent};
552 $_->hide; 695 $_->hide;
553 } 696 }
697
698 $self->check_size;
699 $self->update;
554} 700}
555 701
556sub find_widget { 702sub find_widget {
557 my ($self, $x, $y) = @_; 703 my ($self, $x, $y) = @_;
558 704
… …
633} 779}
634 780
635sub update { 781sub update {
636 my ($self) = @_; 782 my ($self) = @_;
637 783
638 # we want to do this delayed... 784 $ROOT->on_post_alloc ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 785 $self->SUPER::update;
641}
642
643sub render_chld {
644 my ($self) = @_;
645
646 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647 glClearColor 0, 0, 0, 1;
648 glClear GL_COLOR_BUFFER_BIT;
649 $self->child->draw;
650 };
651} 786}
652 787
653sub size_allocate { 788sub size_allocate {
654 my ($self, $w, $h) = @_; 789 my ($self, $w, $h) = @_;
655 790
656 $self->child->configure (0, 0, $w, $h); 791 $self->SUPER::size_allocate ($w, $h);
792 $self->update;
793}
657 794
795sub _render {
796 $_[0]{children}[0]->draw;
797}
798
799sub render_child {
800 my ($self) = @_;
801
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT;
805
658 $self->render_chld; 806 $self->_render;
807 };
659} 808}
660 809
661sub _draw { 810sub _draw {
662 my ($self) = @_; 811 my ($self) = @_;
663 812
664 my ($w, $h) = ($self->w, $self->h); 813 my ($w, $h) = ($self->w, $self->h);
665 814
666 my $tex = $self->{texture} 815 my $tex = $self->{texture}
667 or return; 816 or return;
668 817
669 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 818 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1;
673 821
674 $tex->draw_quad (0, 0, $w, $h); 822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675 823
676 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 824 glDisable GL_TEXTURE_2D;
678} 825}
679 826
680############################################################################# 827#############################################################################
681 828
682package CFClient::UI::ViewPort; 829package CFClient::UI::ViewPort;
683 830
684our @ISA = CFClient::UI::Window::; 831our @ISA = CFClient::UI::Window::;
685
686sub new { die }
687
688sub size_request {
689 my ($self) = @_;
690
691 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
693
694 @$self{qw(child_w child_h)}
695}
696
697sub _draw {
698 my ($self) = @_;
699
700 $self->{children}[1]->draw;
701}
702
703
704#############################################################################
705
706package CFClient::UI::Frame;
707
708our @ISA = CFClient::UI::Bin::;
709
710use CFClient::OpenGL;
711 832
712sub new { 833sub new {
713 my $class = shift; 834 my $class = shift;
714 835
836 $class->SUPER::new (
837 scroll_x => 0,
838 scroll_y => 1,
839 @_,
840 )
841}
842
843sub size_request {
844 my ($self) = @_;
845
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
847
848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
852}
853
854sub size_allocate {
855 my ($self, $w, $h) = @_;
856
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
859
860 $self->child->configure (0, 0, $w, $h);
861 $self->update;
862}
863
864sub set_offset {
865 my ($self, $x, $y) = @_;
866
867 $self->{view_x} = int $x;
868 $self->{view_y} = int $y;
869
870 $self->update;
871}
872
873# hmm, this does not work for topleft of $self... but we should not ask for that
874sub coord2local {
875 my ($self, $x, $y) = @_;
876
877 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
878}
879
880sub coord2global {
881 my ($self, $x, $y) = @_;
882
883 $x = List::Util::min $self->{w}, $x - $self->{view_x};
884 $y = List::Util::min $self->{h}, $y - $self->{view_y};
885
886 $self->SUPER::coord2global ($x, $y)
887}
888
889sub find_widget {
890 my ($self, $x, $y) = @_;
891
892 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
893 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
894 ) {
895 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
896 } else {
897 $self->CFClient::UI::Base::find_widget ($x, $y)
898 }
899}
900
901sub _render {
902 my ($self) = @_;
903
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905
906 $self->SUPER::_render;
907}
908
909#############################################################################
910
911package CFClient::UI::ScrolledWindow;
912
913our @ISA = CFClient::UI::HBox::;
914
915sub new {
916 my $class = shift;
917
918 my $self;
919
920 my $slider = new CFClient::UI::Slider
921 vertical => 1,
922 range => [0, 0, 1, 0.01], # HACK fix
923 on_changed => sub {
924 $self->{vp}->set_offset (0, $_[1]);
925 },
926 ;
927
715 my $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
716 bg => [1, 1, 1, 1], 929 vp => (new CFClient::UI::ViewPort expand => 1),
717 border_bg => [1, 1, 1, 1], 930 slider => $slider,
718 border => 0.8,
719 @_ 931 @_,
720 ); 932 );
721 933
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider});
937
722 $self 938 $self
723} 939}
724 940
941sub update {
942 my ($self) = @_;
943
944 $self->SUPER::update;
945
946 # todo: overwrite size_allocate of child
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949}
950
951sub size_allocate {
952 my ($self, $w, $h) = @_;
953
954 $self->SUPER::size_allocate ($w, $h);
955
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
960#TODO# update range on size_allocate depending on child
961# update viewport offset on scroll
962
963#############################################################################
964
965package CFClient::UI::Frame;
966
967our @ISA = CFClient::UI::Bin::;
968
969use CFClient::OpenGL;
970
971sub new {
972 my $class = shift;
973
974 $class->SUPER::new (
975 bg => undef,
976 @_,
977 )
978}
979
725sub _draw { 980sub _draw {
726 my ($self) = @_; 981 my ($self) = @_;
727 982
728 my ($w, $h) = ($self->{w}, $self->{h}); 983 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)};
729 985
730 glEnable GL_BLEND; 986 glEnable GL_BLEND;
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
732 glEnable GL_TEXTURE_2D; 988 glColor @{ $self->{bg} };
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734 989
735# glBegin GL_QUADS; 990 glBegin GL_QUADS;
736# glColor 0, 0, 0, 0;
737# glVertex 0 , 0; 991 glVertex 0 , 0;
738# glVertex 0 , $h; 992 glVertex 0 , $h;
739# glVertex $w, $h; 993 glVertex $w, $h;
740# glVertex $w, 0; 994 glVertex $w, 0;
741# glEnd; 995 glEnd;
742 996
743
744 $self->child->draw;
745 glDisable GL_BLEND; 997 glDisable GL_BLEND;
746 glDisable GL_TEXTURE_2D; 998 }
999
1000 $self->SUPER::_draw;
747} 1001}
748 1002
749############################################################################# 1003#############################################################################
750 1004
751package CFClient::UI::FancyFrame; 1005package CFClient::UI::FancyFrame;
… …
759 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
760 1014
761sub new { 1015sub new {
762 my $class = shift; 1016 my $class = shift;
763 1017
764 # TODO: user_x, user_y, overwrite moveto?
765
766 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
769 border => 0.8, 1021 border => 0.6,
1022 is_toplevel => 1,
770 can_events => 1, 1023 can_events => 1,
771 @_ 1024 @_
772 ); 1025 );
773 1026
774 $self->{title} &&= new CFClient::UI::Label 1027 $self->{title} &&= new CFClient::UI::Label
775 align => 0, 1028 align => 0,
776 valign => 1, 1029 valign => 1,
777 text => $self->{title}, 1030 text => $self->{title},
778 fontsize => 1; 1031 fontsize => $self->{border};
779 1032
780 $self 1033 $self
781} 1034}
782 1035
783sub border { 1036sub border {
… …
799 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h) = @_;
800 1053
801 $h -= List::Util::max 0, $self->border * 2; 1054 $h -= List::Util::max 0, $self->border * 2;
802 $w -= List::Util::max 0, $self->border * 2; 1055 $w -= List::Util::max 0, $self->border * 2;
803 1056
804 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
805 if $self->{title}; 1058 if $self->{title};
806 1059
807 $self->child->configure ($self->border, $self->border, $w, $h); 1060 $self->child->configure ($self->border, $self->border, $w, $h);
808} 1061}
809 1062
810sub button_down { 1063sub button_down {
811 my ($self, $ev, $x, $y) = @_; 1064 my ($self, $ev, $x, $y) = @_;
812 1065
1066 my ($w, $h) = @$self{qw(w h)};
813 my $border = $self->border; 1067 my $border = $self->border;
814 1068
815 if ($x < $self->{w} && $x >= $self->{w} - $border 1069 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816 && $y < $self->{h} && $y >= $self->{h} - $border) { 1070 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817 1071
1072 if ($lr & $td) {
1073 my ($wx, $wy) = ($self->{x}, $self->{y});
818 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1074 my ($ox, $oy) = ($ev->{x}, $ev->{y});
819 my ($bw, $bh) = ($self->{w}, $self->{h}); 1075 my ($bw, $bh) = ($self->{w}, $self->{h});
820 1076
1077 my $mx = $x < $border;
1078 my $my = $y < $border;
1079
821 $self->{motion} = sub { 1080 $self->{motion} = sub {
822 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
823 1082
824 ($x, $y) = ($ev->{x}, $ev->{y}); 1083 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy;
825 1085
826 $self->{user_w} = $bw + $x - $ox; 1086 $self->{user_x} = $wx + $dx * $mx;
827 $self->{user_h} = $bh + $y - $oy; 1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y});
828 $self->check_size; 1091 $self->check_size;
829 }; 1092 };
830 1093
831 } elsif ($x >= 0 && $x < $self->{w} 1094 } elsif ($lr ^ $td) {
832 && $y >= 0 && $y < $border) {
833
834 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
835 my ($bx, $by) = ($self->{x}, $self->{y}); 1096 my ($bx, $by) = ($self->{x}, $self->{y});
836 1097
837 $self->{motion} = sub { 1098 $self->{motion} = sub {
838 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
839 1100
840 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
841 1102
842 $self->move ($bx + $x - $ox, $by + $y - $oy); 1103 $self->{user_x} = $bx + $x - $ox;
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
843 $self->update; 1107 $self->update;
844 }; 1108 };
845 } 1109 }
846} 1110}
847 1111
… …
861 my ($self) = @_; 1125 my ($self) = @_;
862 1126
863 my ($w, $h ) = ($self->{w}, $self->{h}); 1127 my ($w, $h ) = ($self->{w}, $self->{h});
864 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
865 1129
866 glEnable GL_BLEND;
867 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
868 glEnable GL_TEXTURE_2D; 1130 glEnable GL_TEXTURE_2D;
869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
870 1132
871 my $border = $self->border; 1133 my $border = $self->border;
872 1134
873 glColor @{ $self->{border_bg} }; 1135 glColor @{ $self->{border_bg} };
874 $tex[1]->draw_quad (0, 0, $w, $border); 1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
875 $tex[3]->draw_quad (0, $border, $border, $ch); 1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
877 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
878 1140
1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
879 my $bg = $tex[0]; 1142 my $bg = $tex[0];
880 1143
881 # TODO: repeat texture not scale 1144 # TODO: repeat texture not scale
882 my $rep_x = $cw / $bg->{w}; 1145 my $rep_x = $cw / $bg->{w};
883 my $rep_y = $ch / $bg->{h}; 1146 my $rep_y = $ch / $bg->{h};
884 1147
885 glColor @{ $self->{bg} }; 1148 glColor @{ $self->{bg} };
886 1149
887 $bg->{s} = $rep_x; 1150 $bg->{s} = $rep_x;
888 $bg->{t} = $rep_y; 1151 $bg->{t} = $rep_y;
889 $bg->{wrap_mode} = 1; 1152 $bg->{wrap_mode} = 1;
890 $bg->draw_quad ($border, $border, $cw, $ch); 1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 }
891 1155
892 glDisable GL_TEXTURE_2D; 1156 glDisable GL_TEXTURE_2D;
893 glDisable GL_BLEND;
894 1157
895 $self->{title}->draw if $self->{title}; 1158 $self->{title}->draw if $self->{title};
1159
896 $self->child->draw; 1160 $self->child->draw;
897} 1161}
898 1162
899############################################################################# 1163#############################################################################
900 1164
… …
909sub new { 1173sub new {
910 my $class = shift; 1174 my $class = shift;
911 1175
912 $class->SUPER::new ( 1176 $class->SUPER::new (
913 col_expand => [], 1177 col_expand => [],
914 @_ 1178 @_,
915 ) 1179 )
1180}
1181
1182sub children {
1183 grep $_, map @$_, grep $_, @{ $_[0]{children} }
916} 1184}
917 1185
918sub add { 1186sub add {
919 my ($self, $x, $y, $child) = @_; 1187 my ($self, $x, $y, $child) = @_;
920 1188
921 $child->set_parent ($self); 1189 $child->set_parent ($self);
922 $self->{children}[$y][$x] = $child; 1190 $self->{children}[$y][$x] = $child;
923 1191
924 $child->check_size; 1192 $self->check_size (1);
925} 1193}
926 1194
927sub children {
928 grep $_, map @$_, grep $_, @{ $_[0]{children} }
929}
930
931# TODO: move to container class maybe? send childs a signal on removal? 1195# TODO: move to container class maybe? send children a signal on removal?
932sub clear { 1196sub clear {
933 my ($self) = @_; 1197 my ($self) = @_;
934 1198
935 my @children = $self->children; 1199 my @children = $self->children;
936 delete $self->{children}; 1200 delete $self->{children};
… …
938 for (@children) { 1202 for (@children) {
939 delete $_->{parent}; 1203 delete $_->{parent};
940 $_->hide; 1204 $_->hide;
941 } 1205 }
942 1206
1207 $self->check_size (1);
943 $self->update; 1208 $self->update;
944} 1209}
945 1210
946sub get_wh { 1211sub get_wh {
947 my ($self) = @_; 1212 my ($self) = @_;
… …
979sub size_allocate { 1244sub size_allocate {
980 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h) = @_;
981 1246
982 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
983 1248
984 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
985 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
986 1251
987 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
988 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
989 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
990 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1044 } 1309 }
1045} 1310}
1046 1311
1047############################################################################# 1312#############################################################################
1048 1313
1049package CFClient::UI::HBox; 1314package CFClient::UI::Box;
1050
1051# TODO: wrap into common Box base class
1052 1315
1053our @ISA = CFClient::UI::Container::; 1316our @ISA = CFClient::UI::Container::;
1054 1317
1055sub size_request { 1318sub size_request {
1056 my ($self) = @_; 1319 my ($self) = @_;
1057 1320
1058 my @alloc = map [$_->size_request], @{$self->{children}}; 1321 $self->{vertical}
1059 1322 ? (
1060 ( 1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1061 (List::Util::sum map $_->[0], @alloc), 1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1062 (List::Util::max map $_->[1], @alloc), 1325 )
1063 ) 1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1064} 1330}
1065 1331
1066sub size_allocate { 1332sub size_allocate {
1067 my ($self, $w, $h) = @_; 1333 my ($self, $w, $h) = @_;
1068 1334
1069 ($h, $w) = ($w, $h); 1335 my $space = $self->{vertical} ? $h : $w;
1070
1071 my $children = $self->{children}; 1336 my $children = $self->{children};
1072 1337
1073 my @h = map $_->{req_w}, @$children; 1338 my @req;
1074 1339
1075 my $req_h = List::Util::sum @h; 1340 if ($self->{homogeneous}) {
1076 1341 @req = ($space / (@$children || 1)) x @$children;
1077 if ($req_h > $h) {
1078 # ah well, not enough space
1079 $_ *= $h / $req_h for @h;
1080 } else { 1342 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1344 my $req = List::Util::sum @req;
1345
1346 if ($req > $space) {
1347 # ah well, not enough space
1348 $_ *= $space / $req for @req;
1349 } else {
1081 my $exp = List::Util::sum map $_->{expand}, @$children; 1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1082 $exp ||= 1;
1083 1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1084 for (0 .. $#$children) { 1355 for 0 .. $#$children;
1085 my $child = $children->[$_];
1086
1087 my $alloc_h = $h[$_];
1088 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1089 $h[$_] = $alloc_h;
1090 } 1356 }
1091 } 1357 }
1092 1358
1093 CFClient::UI::harmonize \@h; 1359 CFClient::UI::harmonize \@req;
1094 1360
1095 my $y = 0; 1361 my $pos = 0;
1096 for (0 .. $#$children) { 1362 for (0 .. $#$children) {
1097 my $child = $children->[$_];
1098 my $h = $h[$_]; 1363 my $alloc = $req[$_];
1099 $child->configure ($y, 0, $h, $w); 1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1100 1365
1101 $y += $h; 1366 $pos += $alloc;
1102 } 1367 }
1103 1368
1104 1 1369 1
1105} 1370}
1106 1371
1107############################################################################# 1372#############################################################################
1108 1373
1374package CFClient::UI::HBox;
1375
1376our @ISA = CFClient::UI::Box::;
1377
1378sub new {
1379 my $class = shift;
1380
1381 $class->SUPER::new (
1382 vertical => 0,
1383 @_,
1384 )
1385}
1386
1387#############################################################################
1388
1109package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1110 1390
1111# TODO: wrap into common Box base class
1112
1113our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1114 1392
1115sub size_request { 1393sub new {
1116 my ($self) = @_; 1394 my $class = shift;
1117 1395
1118 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1119 1397 vertical => 1,
1120 ( 1398 @_,
1121 (List::Util::max map $_->[0], @alloc),
1122 (List::Util::sum map $_->[1], @alloc),
1123 ) 1399 )
1124} 1400}
1125 1401
1126sub size_allocate {
1127 my ($self, $w, $h) = @_;
1128
1129 my $children = $self->{children};
1130
1131 my @h = map $_->{req_h}, @$children;
1132
1133 my $req_h = List::Util::sum @h;
1134
1135 if ($req_h > $h) {
1136 # ah well, not enough space
1137 $_ *= $h / $req_h for @h;
1138 } else {
1139 my $exp = List::Util::sum map $_->{expand}, @$children;
1140 $exp ||= 1;
1141
1142 for (0 .. $#$children) {
1143 my $child = $children->[$_];
1144
1145 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1146 }
1147 }
1148
1149 CFClient::UI::harmonize \@h;
1150
1151 my $y = 0;
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154 my $h = $h[$_];
1155 $child->configure (0, $y, $w, $h);
1156
1157 $y += $h;
1158 }
1159
1160 1
1161}
1162
1163############################################################################# 1402#############################################################################
1164 1403
1165package CFClient::UI::Label; 1404package CFClient::UI::Label;
1166 1405
1167our @ISA = CFClient::UI::Base::; 1406our @ISA = CFClient::UI::DrawBG::;
1168 1407
1169use CFClient::OpenGL; 1408use CFClient::OpenGL;
1170 1409
1171sub new { 1410sub new {
1172 my ($class, %arg) = @_; 1411 my ($class, %arg) = @_;
1173 1412
1174 my $self = $class->SUPER::new ( 1413 my $self = $class->SUPER::new (
1175 fg => [1, 1, 1], 1414 fg => [1, 1, 1],
1415 #bg => none
1416 #active_bg => none
1176 #font => default_font 1417 #font => default_font
1418 #text => initial text
1419 #markup => initial narkup
1420 #max_w => maximum pixel width
1421 ellipsise => 3, # end
1422 layout => (new CFClient::Layout),
1177 fontsize => 1, 1423 fontsize => 1,
1178 text => "",
1179 align => -1, 1424 align => -1,
1180 valign => -1, 1425 valign => -1,
1181 padding => 2, 1426 padding => 2,
1182 layout => new CFClient::Layout,
1183 can_events => 0, 1427 can_events => 0,
1184 %arg 1428 %arg
1185 ); 1429 );
1186 1430
1187 if (exists $self->{template}) { 1431 if (exists $self->{template}) {
1188 my $layout = new CFClient::Layout; 1432 my $layout = new CFClient::Layout;
1189 $layout->set_text (delete $self->{template}); 1433 $layout->set_text (delete $self->{template});
1190 $self->{template} = $layout; 1434 $self->{template} = $layout;
1191 } 1435 }
1192 1436
1193 $self->set_text (delete $self->{text}) if exists $self->{text}; 1437 if (exists $self->{markup}) {
1194 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1438 $self->set_markup (delete $self->{markup});
1439 } else {
1440 $self->set_text (delete $self->{text});
1441 }
1195 1442
1196 $self 1443 $self
1197} 1444}
1198 1445
1199sub escape { 1446sub escape($) {
1200 local $_ = $_[1]; 1447 local $_ = $_[0];
1201 1448
1202 s/&/&amp;/g; 1449 s/&/&amp;/g;
1203 s/>/&gt;/g; 1450 s/>/&gt;/g;
1204 s/</&lt;/g; 1451 s/</&lt;/g;
1205 1452
1206 $_[1] 1453 $_
1454}
1455
1456sub update {
1457 my ($self) = @_;
1458
1459 delete $self->{texture};
1460 $self->SUPER::update;
1207} 1461}
1208 1462
1209sub set_text { 1463sub set_text {
1210 my ($self, $text) = @_; 1464 my ($self, $text) = @_;
1211 1465
1466 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text";
1468
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1212 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1213 1471
1214 delete $self->{texture}; 1472 $self->update;
1215 $self->check_size; 1473 $self->check_size;
1216 $self->update;
1217} 1474}
1218 1475
1219sub set_markup { 1476sub set_markup {
1220 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1221 1478
1479 return if $self->{text} eq "M$markup";
1480 $self->{text} = "M$markup";
1481
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1222 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1223 1486
1224 delete $self->{texture}; 1487 $self->update;
1225 $self->check_size; 1488 $self->check_size;
1226 $self->update;
1227} 1489}
1228 1490
1229sub size_request { 1491sub size_request {
1230 my ($self) = @_; 1492 my ($self) = @_;
1231 1493
1232 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1494 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $self->{layout}->set_width ($self->{max_w} || -1); 1495 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1235 1499
1236 my ($w, $h) = $self->{layout}->size; 1500 my ($w, $h) = $self->{layout}->size;
1237 1501
1238 if (exists $self->{template}) { 1502 if (exists $self->{template}) {
… …
1260sub set_fontsize { 1524sub set_fontsize {
1261 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1262 1526
1263 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1264 delete $self->{texture}; 1528 delete $self->{texture};
1529
1530 $self->update;
1265 $self->check_size; 1531 $self->check_size;
1266 $self->update;
1267} 1532}
1268 1533
1269sub _draw { 1534sub _draw {
1270 my ($self) = @_; 1535 my ($self) = @_;
1271 1536
1537 $self->SUPER::_draw; # draw background, if applicable
1538
1272 my $tex = $self->{texture} ||= do { 1539 my $tex = $self->{texture} ||= do {
1540 $self->{layout}->set_foreground (@{$self->{fg}});
1273 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1541 $self->{layout}->set_font ($self->{font}) if $self->{font};
1274 $self->{layout}->set_width ($self->{w}); 1542 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546
1276 new_from_layout CFClient::Texture $self->{layout} 1547 my $tex = new_from_layout CFClient::Texture $self->{layout};
1548
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1551 : ($self->{w} - $tex->{w}) * 0.5);
1552
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1555 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1277 }; 1558 };
1278 1559
1279 glEnable GL_BLEND;
1280 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1281 glEnable GL_TEXTURE_2D; 1560 glEnable GL_TEXTURE_2D;
1282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283 1562
1563 if ($tex->{format} == GL_ALPHA) {
1284 glColor @{$self->{fg}}; 1564 glColor @{$self->{fg}};
1285
1286 $self->{ox} = int (
1287 $self->{align} < 0 ? $self->{padding}
1288 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1289 : ($self->{w} - $tex->{w}) * 0.5
1290 );
1291
1292 $self->{oy} = int (
1293 $self->{valign} < 0 ? $self->{padding}
1294 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1295 : ($self->{h} - $tex->{h}) * 0.5
1296 );
1297
1298 $tex->draw_quad ($self->{ox}, $self->{oy}); 1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 }
1299 1569
1300 glDisable GL_TEXTURE_2D; 1570 glDisable GL_TEXTURE_2D;
1301 glDisable GL_BLEND;
1302} 1571}
1303 1572
1304############################################################################# 1573#############################################################################
1305 1574
1306package CFClient::UI::EntryBase; 1575package CFClient::UI::EntryBase;
… …
1319 active_fg => [0, 0, 0], 1588 active_fg => [0, 0, 0],
1320 can_hover => 1, 1589 can_hover => 1,
1321 can_focus => 1, 1590 can_focus => 1,
1322 valign => 0, 1591 valign => 0,
1323 can_events => 1, 1592 can_events => 1,
1593 #text => ...
1324 @_ 1594 @_
1325 ) 1595 )
1326} 1596}
1327 1597
1328sub _set_text { 1598sub _set_text {
… …
1338 $self->{text} = $text; 1608 $self->{text} = $text;
1339 1609
1340 $text =~ s/./*/g if $self->{hidden}; 1610 $text =~ s/./*/g if $self->{hidden};
1341 $self->{layout}->set_text ("$text "); 1611 $self->{layout}->set_text ("$text ");
1342 1612
1343 $self->emit (changed => $self->{text}); 1613 $self->_emit (changed => $self->{text});
1344}
1345
1346sub get_text {
1347 $_[0]{text}
1348}
1349
1350sub size_request {
1351 my ($self) = @_;
1352
1353 my ($w, $h) = $self->SUPER::size_request;
1354
1355 ($w + 1, $h) # add 1 for cursor
1356}
1357
1358sub size_allocate {
1359 my ($self, $w, $h) = @_;
1360
1361 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1362} 1614}
1363 1615
1364sub set_text { 1616sub set_text {
1365 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1366 1618
1367 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1368 $self->_set_text ($text); 1620 $self->_set_text ($text);
1369 $self->update; 1621 $self->update;
1622 $self->check_size;
1623}
1624
1625sub get_text {
1626 $_[0]{text}
1627}
1628
1629sub size_request {
1630 my ($self) = @_;
1631
1632 my ($w, $h) = $self->SUPER::size_request;
1633
1634 ($w + 1, $h) # add 1 for cursor
1370} 1635}
1371 1636
1372sub key_down { 1637sub key_down {
1373 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1374 1639
… …
1376 my $sym = $ev->{sym}; 1641 my $sym = $ev->{sym};
1377 my $uni = $ev->{unicode}; 1642 my $uni = $ev->{unicode};
1378 1643
1379 my $text = $self->get_text; 1644 my $text = $self->get_text;
1380 1645
1381 if ($sym == 8) { 1646 if ($uni == 8) {
1382 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1647 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1383 } elsif ($sym == 127) { 1648 } elsif ($uni == 127) {
1384 substr $text, $self->{cursor}, 1, ""; 1649 substr $text, $self->{cursor}, 1, "";
1385 } elsif ($sym == CFClient::SDLK_LEFT) { 1650 } elsif ($sym == CFClient::SDLK_LEFT) {
1386 --$self->{cursor} if $self->{cursor}; 1651 --$self->{cursor} if $self->{cursor};
1387 } elsif ($sym == CFClient::SDLK_RIGHT) { 1652 } elsif ($sym == CFClient::SDLK_RIGHT) {
1388 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1653 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1389 } elsif ($sym == CFClient::SDLK_HOME) { 1654 } elsif ($sym == CFClient::SDLK_HOME) {
1390 $self->{cursor} = 0; 1655 $self->{cursor} = 0;
1391 } elsif ($sym == CFClient::SDLK_END) { 1656 } elsif ($sym == CFClient::SDLK_END) {
1392 $self->{cursor} = length $text; 1657 $self->{cursor} = length $text;
1393 } elsif ($sym == 27) { 1658 } elsif ($uni == 27) {
1394 $self->emit ('escape'); 1659 $self->_emit ('escape');
1395 } elsif ($uni) { 1660 } elsif ($uni) {
1396 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1397 } 1662 }
1398 1663
1399 $self->_set_text ($text); 1664 $self->_set_text ($text);
1400 $self->update; 1665 $self->update;
1666 $self->check_size;
1401} 1667}
1402 1668
1403sub focus_in { 1669sub focus_in {
1404 my ($self) = @_; 1670 my ($self) = @_;
1405 1671
… …
1485 if ($sym == 13) { 1751 if ($sym == 13) {
1486 unshift @{$self->{history}}, 1752 unshift @{$self->{history}},
1487 my $txt = $self->get_text; 1753 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1; 1754 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = ''; 1755 $self->{history_saveback} = '';
1490 $self->emit (activate => $txt); 1756 $self->_emit (activate => $txt);
1491 $self->update; 1757 $self->update;
1492 1758
1493 } elsif ($sym == CFClient::SDLK_UP) { 1759 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) { 1760 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text; 1761 $self->{history_saveback} = $self->get_text;
… …
1534 my $class = shift; 1800 my $class = shift;
1535 1801
1536 $class->SUPER::new ( 1802 $class->SUPER::new (
1537 padding => 4, 1803 padding => 4,
1538 fg => [1, 1, 1], 1804 fg => [1, 1, 1],
1539 bg => [1, 1, 1, 0.2],
1540 active_fg => [0, 0, 1], 1805 active_fg => [0, 0, 1],
1541 can_hover => 1, 1806 can_hover => 1,
1542 align => 0, 1807 align => 0,
1543 valign => 0, 1808 valign => 0,
1544 can_events => 1, 1809 can_events => 1,
1545 @_ 1810 @_
1546 ) 1811 )
1547} 1812}
1548 1813
1814sub activate { }
1815
1549sub button_up { 1816sub button_up {
1550 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1551 1818
1819 $self->emit ("activate")
1552 if ($x >= 0 && $x < $self->{w} 1820 if $x >= 0 && $x < $self->{w}
1553 && $y >= 0 && $y < $self->{h}) { 1821 && $y >= 0 && $y < $self->{h};
1554 $self->emit ("activate");
1555 }
1556} 1822}
1557 1823
1558sub _draw { 1824sub _draw {
1559 my ($self) = @_; 1825 my ($self) = @_;
1560 1826
… …
1562 1828
1563 if ($GRAB == $self) { 1829 if ($GRAB == $self) {
1564 $self->{fg} = $self->{active_fg}; 1830 $self->{fg} = $self->{active_fg};
1565 } 1831 }
1566 1832
1567 glEnable GL_BLEND;
1568 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569 glEnable GL_TEXTURE_2D; 1833 glEnable GL_TEXTURE_2D;
1570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571 glColor 0, 0, 0, 1; 1835 glColor 0, 0, 0, 1;
1572 1836
1573 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1837 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574 1838
1575 glDisable GL_TEXTURE_2D; 1839 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577 1840
1578 $self->SUPER::_draw; 1841 $self->SUPER::_draw;
1579} 1842}
1580 1843
1581############################################################################# 1844#############################################################################
… …
1595 1858
1596 $class->SUPER::new ( 1859 $class->SUPER::new (
1597 padding => 2, 1860 padding => 2,
1598 fg => [1, 1, 1], 1861 fg => [1, 1, 1],
1599 active_fg => [1, 1, 0], 1862 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5],
1600 state => 0, 1865 state => 0,
1601 can_hover => 1, 1866 can_hover => 1,
1602 @_ 1867 @_
1603 ) 1868 )
1604} 1869}
… …
1613 my ($self, $ev, $x, $y) = @_; 1878 my ($self, $ev, $x, $y) = @_;
1614 1879
1615 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1616 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1617 $self->{state} = !$self->{state}; 1882 $self->{state} = !$self->{state};
1618 $self->emit (changed => $self->{state}); 1883 $self->_emit (changed => $self->{state});
1619 } 1884 }
1620} 1885}
1621 1886
1622sub _draw { 1887sub _draw {
1623 my ($self) = @_; 1888 my ($self) = @_;
… …
1628 1893
1629 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1630 1895
1631 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632 1897
1633 glEnable GL_BLEND; 1898 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899
1634 glEnable GL_TEXTURE_2D; 1900 glEnable GL_TEXTURE_2D;
1635 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1636
1637 my $tex = $self->{state} ? $tex[1] : $tex[0];
1638
1639 $tex->draw_quad (0, 0, $s, $s); 1901 $tex->draw_quad_alpha (0, 0, $s, $s);
1640
1641 glDisable GL_TEXTURE_2D; 1902 glDisable GL_TEXTURE_2D;
1642 glDisable GL_BLEND;
1643} 1903}
1644 1904
1645############################################################################# 1905#############################################################################
1646 1906
1647package CFClient::UI::Image; 1907package CFClient::UI::Image;
… …
1690 glTranslate 0, -$self->{w}, 0; 1950 glTranslate 0, -$self->{w}, 0;
1691 1951
1692 ($w, $h) = ($h, $w); 1952 ($w, $h) = ($h, $w);
1693 } 1953 }
1694 1954
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D; 1955 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699 1957
1700 $tex->draw_quad (0, 0, $w, $h); 1958 $tex->draw_quad_alpha (0, 0, $w, $h);
1701 1959
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D; 1960 glDisable GL_TEXTURE_2D;
1704} 1961}
1705 1962
1706############################################################################# 1963#############################################################################
1707 1964
… …
1755} 2012}
1756 2013
1757sub set_max { 2014sub set_max {
1758 my ($self, $max) = @_; 2015 my ($self, $max) = @_;
1759 2016
2017 return if $self->{max_val} == $max;
2018
1760 $self->{max_val} = $max; 2019 $self->{max_val} = $max;
2020 $self->update;
1761} 2021}
1762 2022
1763sub set_value { 2023sub set_value {
1764 my ($self, $val, $max) = @_; 2024 my ($self, $val, $max) = @_;
1765 2025
1766 $self->set_max ($max) 2026 $self->set_max ($max)
1767 if defined $max; 2027 if defined $max;
1768 2028
1769 $max = $self->{max_val}; 2029 return if $self->{val} == $val;
2030
1770 $self->{val} = $val; 2031 $self->{val} = $val;
1771
1772 $self->update; 2032 $self->update;
1773} 2033}
1774 2034
1775sub _draw { 2035sub _draw {
1776 my ($self) = @_; 2036 my ($self) = @_;
… …
1859 2119
1860 $self->{value}->set_fontsize ($fsize); 2120 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 2121 $self->{max} ->set_fontsize ($fsize);
1862} 2122}
1863 2123
2124sub set_max {
2125 my ($self, $max) = @_;
2126
2127 $self->{gauge}->set_max ($max);
2128 $self->{max}->set_text ($max);
2129}
2130
1864sub set_value { 2131sub set_value {
1865 my ($self, $val, $max) = @_; 2132 my ($self, $val, $max) = @_;
1866 2133
1867 $self->set_max ($max) 2134 $self->set_max ($max)
1868 if defined $max; 2135 if defined $max;
1869 2136
1870 $self->{gauge}->set_value ($val, $max); 2137 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 2138 $self->{value}->set_text ($val);
1872}
1873
1874sub set_max {
1875 my ($self, $max) = @_;
1876
1877 $self->{gauge}->set_max ($max);
1878 $self->{max}->set_text ($max);
1879} 2139}
1880 2140
1881############################################################################# 2141#############################################################################
1882 2142
1883package CFClient::UI::Slider; 2143package CFClient::UI::Slider;
… …
1893 qw(s1_slider.png s1_slider_bg.png); 2153 qw(s1_slider.png s1_slider_bg.png);
1894 2154
1895sub new { 2155sub new {
1896 my $class = shift; 2156 my $class = shift;
1897 2157
1898 # range [value, low, high, page] 2158 # range [value, low, high, page, unit]
1899 2159
1900 # TODO: 0-width page 2160 # TODO: 0-width page
1901 # TODO: req_w/h are wrong with vertical 2161 # TODO: req_w/h are wrong with vertical
1902 # TODO: calculations are off 2162 # TODO: calculations are off
1903 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
1904 fg => [1, 1, 1], 2164 fg => [1, 1, 1],
1905 active_fg => [0, 0, 0], 2165 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5],
1906 range => [0, 0, 100, 10], 2168 range => [0, 0, 100, 10, 0],
1907 req_w => 20, 2169 req_w => $::WIDTH / 80,
1908 req_h => 20, 2170 req_h => $::WIDTH / 80,
1909 vertical => 0, 2171 vertical => 0,
1910 can_hover => 1, 2172 can_hover => 1,
1911 inner_pad => 5, 2173 inner_pad => 0.02,
1912 @_ 2174 @_
1913 ); 2175 );
1914 2176
2177 $self->set_value ($self->{range}[0]);
2178 $self->update;
2179
1915 $self 2180 $self
2181}
2182
2183sub set_range {
2184 my ($self, $range) = @_;
2185
2186 ($range, $self->{range}) = ($self->{range}, $range);
2187
2188 $self->update
2189 if "@$range" ne "@{$self->{range}}";
2190}
2191
2192sub set_value {
2193 my ($self, $value) = @_;
2194
2195 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2196
2197 $hi = $lo + 1 if $hi <= $lo;
2198
2199 $page = $hi - $lo if $page > $hi - $lo;
2200
2201 $value = $lo if $value < $lo;
2202 $value = $hi - $page if $value > $hi - $page;
2203
2204 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2205 if $unit;
2206
2207 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2208
2209 if ($value != $old_value) {
2210 $self->_emit (changed => $value);
2211 $self->update;
2212 }
1916} 2213}
1917 2214
1918sub size_request { 2215sub size_request {
1919 my ($self) = @_; 2216 my ($self) = @_;
1920 2217
… …
1926 2223
1927sub button_down { 2224sub button_down {
1928 my ($self, $ev, $x, $y) = @_; 2225 my ($self, $ev, $x, $y) = @_;
1929 2226
1930 $self->SUPER::button_down ($ev, $x, $y); 2227 $self->SUPER::button_down ($ev, $x, $y);
2228
2229 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230
1931 $self->mouse_motion ($ev, $x, $y); 2231 $self->mouse_motion ($ev, $x, $y);
1932} 2232}
1933 2233
1934sub mouse_motion { 2234sub mouse_motion {
1935 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
1936 2236
1937 if ($GRAB == $self) { 2237 if ($GRAB == $self) {
2238 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2239
2240 my (undef, $lo, $hi, $page) = @{$self->{range}};
2241
2242 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243
2244 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2245 }
2246}
2247
2248sub update {
2249 my ($self) = @_;
2250
2251 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2252 $self->set_value ($self->{range}[0]);
2253
1938 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2254 my ($value, $lo, $hi, $page) = @{$self->{range}};
2255 my $range = ($hi - $page - $lo) || 1e-100;
1939 2256
1940 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2257 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1941 2258
1942 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2259 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1943 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2260 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1944 2261
1945 $x -= $inner_pad_px; # substract the padding 2262 $value = ($value - $lo) / $range;
1946 $x = $x * ($hi - $lo) / $inner_w + $lo; 2263 $value = $value * $self->{scale} + $self->{offset};
1947 $x = $lo if $x < $lo;
1948 $x = $hi - $page if $x > $hi - $page;
1949 $self->{range}[0] = $x;
1950 2264
1951 $self->emit (changed => $x); 2265 $self->{knob_x} = $value - $knob_w * 0.5;
1952 $self->update; 2266 $self->{knob_w} = $knob_w;
1953 } 2267 });
1954}
1955 2268
1956# the inner_* stuff is for generating a padding for the slider handle, 2269 $self->SUPER::update;
1957# so that the handle doesn't leave the texture. This calculation isn't 100%
1958# correct propably, but it does the job for now
1959sub _calc_inner_pad_px {
1960 my ($self, $w) = @_;
1961 ($w / 100) * $self->{inner_pad} # % to pixels
1962} 2270}
1963 2271
1964sub _draw { 2272sub _draw {
1965 my ($self) = @_; 2273 my ($self) = @_;
1966 2274
1967 $self->SUPER::_draw (); 2275 $self->SUPER::_draw ();
1968 2276
1969 my ($w, $h) = @$self{qw(w h)}; 2277 glScale $self->{w}, $self->{h};
1970 2278
1971 if ($self->{vertical}) { 2279 if ($self->{vertical}) {
1972 # draw a vertical slider like a rotated horizontal slider 2280 # draw a vertical slider like a rotated horizontal slider
1973 2281
2282 glTranslate 1, 0, 0;
1974 glRotate 90, 0, 0, 1; 2283 glRotate 90, 0, 0, 1;
1975 glTranslate 0, -$self->{w}, 0;
1976
1977 ($w, $h) = ($h, $w);
1978 } 2284 }
1979 2285
1980 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2286 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1981 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2287 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1982 2288
1983 my ($value, $lo, $hi, $page) = @{$self->{range}};
1984
1985 $hi = $value + 1 if $lo == $hi;
1986
1987 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1988 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1989
1990 $page = int $page * $inner_w / ($hi - $lo);
1991 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1992
1993 $w -= $page;
1994 $page &= ~1;
1995 glTranslate $page * 0.5, 0, 0;
1996 $page ||= 2;
1997
1998 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1999 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2000
2001 glEnable GL_BLEND;
2002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2003 glEnable GL_TEXTURE_2D; 2289 glEnable GL_TEXTURE_2D;
2004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2290 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005 2291
2006 # draw background 2292 # draw background
2007 $tex[1]->draw_quad (0, 0, $w, $h); 2293 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2008 2294
2009 # draw handle 2295 # draw handle
2010 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2296 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2011 2297
2012 glDisable GL_BLEND;
2013 glDisable GL_TEXTURE_2D; 2298 glDisable GL_TEXTURE_2D;
2014} 2299}
2300
2301#############################################################################
2302
2303package CFClient::UI::ValSlider;
2304
2305our @ISA = CFClient::UI::HBox::;
2306
2307sub new {
2308 my ($class, %arg) = @_;
2309
2310 my $range = delete $arg{range};
2311
2312 my $self = $class->SUPER::new (
2313 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2314 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2315 to_value => sub { shift },
2316 from_value => sub { shift },
2317 %arg,
2318 );
2319
2320 $self->{slider}->connect (changed => sub {
2321 my ($self, $value) = @_;
2322 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2323 $self->{parent}->emit (changed => $value);
2324 });
2325
2326# $self->{entry}->connect (changed => sub {
2327# my ($self, $value) = @_;
2328# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2329# $self->{parent}->emit (changed => $value);
2330# });
2331
2332 $self->add ($self->{slider}, $self->{entry});
2333
2334 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2335
2336 $self
2337}
2338
2339sub set_range { shift->{slider}->set_range (@_) }
2340sub set_value { shift->{slider}->set_value (@_) }
2015 2341
2016############################################################################# 2342#############################################################################
2017 2343
2018package CFClient::UI::TextView; 2344package CFClient::UI::TextView;
2019 2345
… …
2028 fontsize => 1, 2354 fontsize => 1,
2029 can_events => 0, 2355 can_events => 0,
2030 #font => default_font 2356 #font => default_font
2031 @_, 2357 @_,
2032 2358
2033 layout => (new CFClient::Layout), 2359 layout => (new CFClient::Layout 1),
2034 par => [], 2360 par => [],
2035 height => 0, 2361 height => 0,
2036 children => [ 2362 children => [
2037 (new CFClient::UI::Empty expand => 1), 2363 (new CFClient::UI::Empty expand => 1),
2038 (new CFClient::UI::Slider vertical => 1), 2364 (new CFClient::UI::Slider vertical => 1),
2039 ], 2365 ],
2040 ); 2366 );
2041 2367
2042 $self->{children}[1]->connect (changed => sub { 2368 $self->{children}[1]->connect (changed => sub { $self->update });
2043 $self->update;
2044 });
2045 2369
2046 $self 2370 $self
2047} 2371}
2048 2372
2049sub set_fontsize { 2373sub set_fontsize {
2050 my ($self, $fontsize) = @_; 2374 my ($self, $fontsize) = @_;
2051 2375
2052 $self->{fontsize} = $fontsize; 2376 $self->{fontsize} = $fontsize;
2053 $self->reflow; 2377 $self->reflow;
2054}
2055
2056sub text_height {
2057 my ($self, $text) = @_;
2058
2059 my $layout = $self->{layout};
2060
2061 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062 $layout->set_width ($self->{w});
2063 $layout->set_text ($text);
2064
2065 ($layout->size)[1]
2066}
2067
2068sub reflow {
2069 my ($self) = @_;
2070
2071 $self->{need_reflow}++;
2072 $self->update;
2073} 2378}
2074 2379
2075sub size_allocate { 2380sub size_allocate {
2076 my ($self, $w, $h) = @_; 2381 my ($self, $w, $h) = @_;
2077 2382
… …
2082 $self->{layout}->set_width ($self->{children}[0]{w}); 2387 $self->{layout}->set_width ($self->{children}[0]{w});
2083 2388
2084 $self->reflow; 2389 $self->reflow;
2085} 2390}
2086 2391
2392sub text_size {
2393 my ($self, $text, $indent) = @_;
2394
2395 my $layout = $self->{layout};
2396
2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398 $layout->set_width ($self->{children}[0]{w} - $indent);
2399 $layout->set_markup ($text);
2400
2401 $layout->size
2402}
2403
2404sub reflow {
2405 my ($self) = @_;
2406
2407 $self->{need_reflow}++;
2408 $self->update;
2409}
2410
2411sub set_offset {
2412 my ($self, $offset) = @_;
2413
2414 # todo: base offset on lines or so, not on pixels
2415 $self->{children}[1]->set_value ($offset);
2416}
2417
2418sub clear {
2419 my ($self) = @_;
2420
2421 $self->{par} = [];
2422 $self->{height} = 0;
2423 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2424}
2425
2087sub add_paragraph { 2426sub add_paragraph {
2088 my ($self, $color, $text) = @_; 2427 my ($self, $color, $text, $indent) = @_;
2089 2428
2090 #TODO: intelligently "reformat" paragraph 2429 for my $line (split /\n/, $text) {
2091 2430 my ($w, $h) = $self->text_size ($line);
2092 my $height = $self->text_height ($text);
2093
2094 $self->{height} += $height; 2431 $self->{height} += $h;
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2433 }
2095 2434
2096 push @{$self->{par}}, [$height, $color, $text];
2097
2098 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2435 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2099 $self->{children}[1]->update;
2100} 2436}
2101 2437
2102sub update { 2438sub update {
2103 my ($self) = @_; 2439 my ($self) = @_;
2104 2440
… …
2106 2442
2107 return unless $self->{h} > 0; 2443 return unless $self->{h} > 0;
2108 2444
2109 delete $self->{texture}; 2445 delete $self->{texture};
2110 2446
2111 $ROOT->on_refresh ($self, sub { 2447 $ROOT->on_post_alloc ($self, sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449
2112 if (delete $self->{need_reflow}) { 2450 if (delete $self->{need_reflow}) {
2113 my $height = 0; 2451 my $height = 0;
2114 2452
2115 $height += $_->[0] = $self->text_height ($_->[2]) 2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2116 for @{$self->{par}}; 2457 for (@{$self->{par}}) {
2458 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2459 $layout->set_width ($W - $_->[3]);
2460 $layout->set_markup ($_->[4]);
2461 my ($w, $h) = $layout->size;
2462 $_->[0] = $w + $_->[3];
2463 $_->[1] = $h;
2464 }
2465
2466 $height += $_->[1];
2467 }
2117 2468
2118 $self->{height} = $height; 2469 $self->{height} = $height;
2119 2470
2120 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2121 2472
2122 delete $self->{texture}; 2473 delete $self->{texture};
2123 } 2474 }
2124 2475
2125 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2126 glClearColor 0, 0, 0, 1; 2477 glClearColor 0.5, 0.5, 0.5, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2478 glClear GL_COLOR_BUFFER_BIT;
2128 2479
2480 my $top = int $self->{children}[1]{range}[0];
2481
2482 my $y0 = $top;
2483 my $y1 = $top + $H;
2484
2485 my $y = 0;
2486
2487 my $layout = $self->{layout};
2488
2489 $layout->set_font ($self->{font}) if $self->{font};
2490
2129 glEnable GL_BLEND; 2491 glEnable GL_BLEND;
2492 #TODO# not correct in windows where rgba is forced off
2130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2493 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2131 glEnable GL_TEXTURE_2D;
2132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133
2134 my $top = int $self->{children}[1]{range}[0];
2135
2136 my $y0 = $top;
2137 my $y1 = $top + $self->{h};
2138
2139 my $y = 0;
2140
2141 my $layout = $self->{layout};
2142
2143 $layout->set_font ($self->{font}) if $self->{font};
2144 2494
2145 for my $par (@{$self->{par}}) { 2495 for my $par (@{$self->{par}}) {
2146 my $h = $par->[0]; 2496 my $h = $par->[1];
2147 2497
2148 if ($y0 < $y + $h && $y < $y1) { 2498 if ($y0 < $y + $h && $y < $y1) {
2499 $layout->set_foreground (@{ $par->[2] });
2500 $layout->set_width ($W - $par->[3]);
2149 $layout->set_text ($par->[2]); 2501 $layout->set_markup ($par->[4]);
2150 2502
2151 glColor @{ $par->[1] }; 2503 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2152 my ($W, $H) = $layout->size; 2504
2153 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2505 glRasterPos $par->[3], $y - $y0;
2506 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2154 } 2507 }
2155 2508
2156 $y += $h; 2509 $y += $h;
2157 } 2510 }
2158 2511
2159 glDisable GL_TEXTURE_2D;
2160 glDisable GL_BLEND; 2512 glDisable GL_BLEND;
2161 }; 2513 };
2162 }); 2514 });
2163} 2515}
2164 2516
2165sub _draw { 2517sub _draw {
2166 my ($self) = @_; 2518 my ($self) = @_;
2167 2519
2168 if ($self->{texture}) {
2169 glEnable GL_TEXTURE_2D; 2520 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2522 glColor 1, 1, 1, 1;
2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2173 glDisable GL_TEXTURE_2D; 2524 glDisable GL_TEXTURE_2D;
2174 }
2175 2525
2176 $self->{children}[1]->draw; 2526 $self->{children}[1]->draw;
2177 2527
2178} 2528}
2179 2529
… …
2227 2577
2228sub new { 2578sub new {
2229 my $class = shift; 2579 my $class = shift;
2230 2580
2231 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2232 state => 0, 2582 state => 0,
2233 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2234 @_ 2584 @_
2235 ); 2585 );
2236 2586
2237 if ($self->{state}) {
2238 $self->{state} = 0;
2239 $self->toggle_flopper;
2240 }
2241
2242 $self 2587 $self
2243} 2588}
2244 2589
2245sub toggle_flopper { 2590sub toggle_flopper {
2246 my ($self) = @_; 2591 my ($self) = @_;
2247 2592
2248 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2249 if ($self->{state} = !$self->{state}) {
2250 $CFClient::UI::ROOT->add ($self->{other});
2251 $self->{other}->move ($self->coord2global (0, $self->{h}));
2252 $self->emit ("open");
2253 } else {
2254 $CFClient::UI::ROOT->remove ($self->{other});
2255 $self->emit ("close");
2256 }
2257
2258 $self->emit (changed => $self->{state});
2259} 2594}
2260 2595
2261############################################################################# 2596#############################################################################
2262 2597
2263package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2273 @_, 2608 @_,
2274 can_events => 0, 2609 can_events => 0,
2275 ) 2610 )
2276} 2611}
2277 2612
2278sub set_markup { 2613sub set_tooltip_from {
2279 my ($self, $text) = @_; 2614 my ($self, $widget) = @_;
2280 2615
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2616 $self->add (new CFClient::UI::Label
2282 $self->{label}->set_markup ($text); 2617 markup => $widget->{tooltip},
2283 $self->add ($self->{label}); 2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8,
2620 fg => [0, 0, 0, 1],
2621 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP),
2623 );
2284} 2624}
2285 2625
2286sub size_request { 2626sub size_request {
2287 my ($self) = @_; 2627 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290 2628
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2629 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292 2630
2293 ($w + 4, $h + 4) 2631 ($w + 4, $h + 4)
2294} 2632}
… …
2300} 2638}
2301 2639
2302sub _draw { 2640sub _draw {
2303 my ($self) = @_; 2641 my ($self) = @_;
2304 2642
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375; 2643 glTranslate 0.375, 0.375;
2307 2644
2308 my ($w, $h) = @$self{qw(w h)}; 2645 my ($w, $h) = @$self{qw(w h)};
2309 2646
2310 glColor 1, 0.8, 0.4; 2647 glColor 1, 0.8, 0.4;
… …
2321 glVertex 0 , $h; 2658 glVertex 0 , $h;
2322 glVertex $w, $h; 2659 glVertex $w, $h;
2323 glVertex $w, 0; 2660 glVertex $w, 0;
2324 glEnd; 2661 glEnd;
2325 2662
2326 glPopMatrix; 2663 glTranslate 2 - 0.375, 2 - 0.375;
2327
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw; 2664 $self->SUPER::_draw;
2330} 2665}
2331 2666
2332############################################################################# 2667#############################################################################
2333 2668
… …
2338use CFClient::OpenGL; 2673use CFClient::OpenGL;
2339 2674
2340sub new { 2675sub new {
2341 my $class = shift; 2676 my $class = shift;
2342 2677
2343 $class->SUPER::new ( 2678 my $self = $class->SUPER::new (
2344 aspect => 1, 2679 aspect => 1,
2680 can_events => 0,
2345 @_, 2681 @_,
2346 ) 2682 );
2683
2684 if ($self->{anim} && $self->{animspeed}) {
2685 Scalar::Util::weaken (my $widget = $self);
2686
2687 $self->{timer} = Event->timer (
2688 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2689 hard => 1,
2690 interval => $self->{animspeed},
2691 cb => sub {
2692 ++$widget->{frame};
2693 $widget->update;
2694 },
2695 );
2696 }
2697
2698 $self
2347} 2699}
2348 2700
2349sub size_request { 2701sub size_request {
2350 (32, 8) 2702 (32, 8)
2351} 2703}
2352 2704
2705sub update {
2706 my ($self) = @_;
2707
2708 return unless $self->{visible};
2709
2710 $self->SUPER::update;
2711}
2712
2353sub draw { 2713sub _draw {
2354 my ($self) = @_; 2714 my ($self) = @_;
2355 2715
2716 return unless $::CONN;
2717
2718 my $face;
2719
2720 if ($self->{frame}) {
2721 my $anim = $::CONN->{anim}[$self->{anim}];
2722
2723 $face = $anim->[ $self->{frame} % @$anim ]
2724 if $anim && @$anim;
2725 }
2726
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2727 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2357 2728
2358 if ($tex) { 2729 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D; 2730 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1; 2732 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2733 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D; 2734 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND; 2735 }
2736}
2737
2738sub DESTROY {
2739 my ($self) = @_;
2740
2741 $self->{timer}->cancel
2742 if $self->{timer};
2743
2744 $self->SUPER::DESTROY;
2745}
2746
2747#############################################################################
2748
2749package CFClient::UI::Inventory;
2750
2751our @ISA = CFClient::UI::ScrolledWindow::;
2752
2753sub new {
2754 my $class = shift;
2755
2756 my $self = $class->SUPER::new (
2757 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2758 @_,
2759 );
2760
2761 $self
2762}
2763
2764sub set_items {
2765 my ($self, $items) = @_;
2766
2767 $self->{scrolled}->clear;
2768 return unless $items;
2769
2770 my @items = sort {
2771 ($a->{type} <=> $b->{type})
2772 or ($a->{name} cmp $b->{name})
2773 } @$items;
2774
2775 $self->{real_items} = \@items;
2776
2777 my $row = 0;
2778 for my $item (@items) {
2779 CFClient::Item::update_widgets $item;
2780
2781 $self->{scrolled}->add (0, $row, $item->{face_widget});
2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2784
2785 $row++;
2786 }
2787}
2788
2789#############################################################################
2790
2791package CFClient::UI::Menu;
2792
2793our @ISA = CFClient::UI::FancyFrame::;
2794
2795use CFClient::OpenGL;
2796
2797sub new {
2798 my $class = shift;
2799
2800 my $self = $class->SUPER::new (
2801 items => [],
2802 z => 100,
2803 @_,
2804 );
2805
2806 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2807
2808 for my $item (@{ $self->{items} }) {
2809 my ($widget, $cb) = @$item;
2810
2811 # handle various types of items, only text for now
2812 if (!ref $widget) {
2813 $widget = new CFClient::UI::Label
2814 can_hover => 1,
2815 can_events => 1,
2816 text => $widget;
2817 }
2818
2819 $self->{item}{$widget} = $item;
2820
2821 $self->{vbox}->add ($widget);
2822 }
2823
2824 $self
2825}
2826
2827# popup given the event (must be a mouse button down event currently)
2828sub popup {
2829 my ($self, $ev) = @_;
2830
2831 $self->_emit ("popdown");
2832
2833 # maybe save $GRAB? must be careful about events...
2834 $GRAB = $self;
2835 $self->{button} = $ev->{button};
2836
2837 $self->show;
2838 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2839}
2840
2841sub mouse_motion {
2842 my ($self, $ev, $x, $y) = @_;
2843
2844 # TODO: should use vbox->find_widget or so
2845 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2846 $self->{hover} = $self->{item}{$HOVER};
2847}
2848
2849sub button_up {
2850 my ($self, $ev, $x, $y) = @_;
2851
2852 if ($ev->{button} == $self->{button}) {
2853 undef $GRAB;
2854 $self->hide;
2855
2856 $self->_emit ("popdown");
2857 $self->{hover}[1]->() if $self->{hover};
2858 }
2859}
2860
2861#############################################################################
2862
2863package CFClient::UI::Statusbox;
2864
2865our @ISA = CFClient::UI::VBox::;
2866
2867sub new {
2868 my $class = shift;
2869
2870 $class->SUPER::new (
2871 fontsize => 0.8,
2872 @_,
2367 } 2873 )
2874}
2875
2876sub reorder {
2877 my ($self) = @_;
2878 my $NOW = time;
2879
2880 while (my ($k, $v) = each %{ $self->{item} }) {
2881 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2882 }
2883
2884 my @widgets;
2885
2886 my @items = sort {
2887 $a->{pri} <=> $b->{pri}
2888 or $b->{id} <=> $a->{id}
2889 } values %{ $self->{item} };
2890
2891 my $count = 10 + 1;
2892 for my $item (@items) {
2893 last unless --$count;
2894
2895 push @widgets, $item->{label} ||= do {
2896 # TODO: doesn't handle markup well (read as: at all)
2897 my $short = $item->{count} > 1
2898 ? "<b>$item->{count} ×</b> $item->{text}"
2899 : $item->{text};
2900
2901 for ($short) {
2902 s/^\s+//;
2903 s/\s+/ /g;
2904 }
2905
2906 new CFClient::UI::Label
2907 markup => $short,
2908 tooltip => $item->{tooltip},
2909 tooltip_font => $::FONT_PROP,
2910 tooltip_width => 0.67,
2911 fontsize => $item->{fontsize} || $self->{fontsize},
2912 max_w => $::WIDTH * 0.44,
2913 fg => $item->{fg},
2914 can_events => 1,
2915 can_hover => 1
2916 };
2917 }
2918
2919 $self->clear;
2920 $self->SUPER::add (reverse @widgets);
2921}
2922
2923sub add {
2924 my ($self, $text, %arg) = @_;
2925
2926 $text =~ s/^\s+//;
2927 $text =~ s/\s+$//;
2928
2929 return unless $text;
2930
2931 my $timeout = time + ((delete $arg{timeout}) || 60);
2932
2933 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2934
2935 if (my $item = $self->{item}{$group}) {
2936 if ($item->{text} eq $text) {
2937 $item->{count}++;
2938 } else {
2939 $item->{count} = 1;
2940 $item->{text} = $item->{tooltip} = $text;
2941 }
2942 $item->{id} = ++$self->{id};
2943 $item->{timeout} = $timeout;
2944 delete $item->{label};
2945 } else {
2946 $self->{item}{$group} = {
2947 id => ++$self->{id},
2948 text => $text,
2949 timeout => $timeout,
2950 tooltip => $text,
2951 fg => [0.8, 0.8, 0.8, 0.8],
2952 pri => 0,
2953 count => 1,
2954 %arg,
2955 };
2956 }
2957
2958 $self->reorder;
2959}
2960
2961sub reconfigure {
2962 my ($self) = @_;
2963
2964 delete $_->{label}
2965 for values %{ $self->{item} || {} };
2966
2967 $self->reorder;
2968 $self->SUPER::reconfigure;
2368} 2969}
2369 2970
2370############################################################################# 2971#############################################################################
2371 2972
2372package CFClient::UI::Root; 2973package CFClient::UI::Root;
2373 2974
2374our @ISA = CFClient::UI::Container::; 2975our @ISA = CFClient::UI::Container::;
2375 2976
2376use CFClient::OpenGL; 2977use CFClient::OpenGL;
2377 2978
2378sub check_size { 2979sub new {
2379 my ($self) = @_; 2980 my $class = shift;
2380 2981
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2982 $class->SUPER::new (
2382} 2983 visible => 1,
2383 2984 @_,
2384sub size_request { 2985 )
2385 ($::WIDTH, $::HEIGHT)
2386} 2986}
2387 2987
2388sub configure { 2988sub configure {
2389 my ($self, $x, $y, $w, $h) = @_; 2989 my ($self, $x, $y, $w, $h) = @_;
2390 2990
2391 $self->SUPER::configure ($x, $y, $w, $h); 2991 $self->{w} = $w;
2992 $self->{h} = $h;
2993}
2392 2994
2995sub check_size {
2996 my ($self) = @_;
2997
2998 $self->size_allocate ($self->{w}, $self->{h})
2999 if $self->{w};
3000}
3001
3002sub size_request {
3003 my ($self) = @_;
3004
3005 ($self->{w}, $self->{h})
3006}
3007
3008sub size_allocate {
3009 my ($self, $w, $h) = @_;
3010
2393 for my $child (@{$self->{children}}) { 3011 for my $child ($self->children) {
2394 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3012 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395 3013
3014 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3015 if exists $child->{req_x};
3016
3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3018 if exists $child->{req_y};
3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2397 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024
2398 $child->configure ($X, $Y, $W,$H); 3025 $child->configure ($X, $Y, $W, $H);
2399 } 3026 }
2400} 3027}
2401 3028
2402sub _topleft { 3029sub coord2local {
2403 my ($self, $x, $y) = @_; 3030 my ($self, $x, $y) = @_;
2404 3031
2405 ($x, $y) 3032 ($x, $y)
2406} 3033}
2407 3034
3035sub coord2global {
3036 my ($self, $x, $y) = @_;
3037
3038 ($x, $y)
3039}
3040
2408sub update { 3041sub update {
2409 my ($self) = @_; 3042 my ($self) = @_;
2410 3043
2411 $self->check_size; 3044 $self->check_size;
2412 ::refresh (); 3045 $::WANT_REFRESH++;
2413} 3046}
2414 3047
2415sub add { 3048sub add {
2416 my ($self, $child) = @_; 3049 my ($self, @children) = @_;
2417 3050
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1;
3053
2418 # integerize window positions 3054 # integerise window positions
2419 $child->{x} = int $child->{x}; 3055 $child->{x} = int $child->{x};
2420 $child->{y} = int $child->{y}; 3056 $child->{y} = int $child->{y};
3057 }
2421 3058
2422 $self->SUPER::add ($child); 3059 $self->SUPER::add (@children);
3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3066}
3067
3068sub remove {
3069 my ($self, @children) = @_;
3070
3071 $self->SUPER::remove (@children);
3072
3073 while (@children) {
3074 my $w = pop @children;
3075 push @children, $w->children;
3076 $w->set_invisible;
3077 }
2423} 3078}
2424 3079
2425sub on_refresh { 3080sub on_refresh {
2426 my ($self, $id, $cb) = @_; 3081 my ($self, $id, $cb) = @_;
2427 3082
2428 $self->{refresh_hook}{$id} = $cb; 3083 $self->{refresh_hook}{$id} = $cb;
2429} 3084}
2430 3085
3086sub on_post_alloc {
3087 my ($self, $id, $cb) = @_;
3088
3089 $self->{post_alloc_hook}{$id} = $cb;
3090}
3091
2431sub draw { 3092sub draw {
2432 my ($self) = @_; 3093 my ($self) = @_;
2433 3094
2434 while (my $rcb = delete $self->{refresh_hook}) { 3095 while ($self->{refresh_hook}) {
2435 $_->() for values %$rcb; 3096 $_->()
3097 for values %{delete $self->{refresh_hook}};
3098 }
3099
3100 if ($self->{check_size}) {
3101 my @queue;
3102
3103 while () {
3104 if ($self->{check_size}) {
3105 #TODO use array-of-depth approach
3106
3107 @queue = sort { $a->{visible} <=> $b->{visible} }
3108 @queue, values %{delete $self->{check_size}};
3109 }
3110
3111 my $widget = pop @queue || last;
3112
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3116 ? @$widget{qw(def_w def_h)}
3117 : $widget->size_request;
3118
3119 if (delete $widget->{force_alloc}
3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3122
3123 $widget->{req_w} = $w;
3124 $widget->{req_h} = $h;
3125
3126 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3127
3128 $widget->{parent}->check_size
3129 if $widget->{parent};
3130 }
3131 }
3132 }
3133
3134 while (my $size_alloc = delete $self->{size_alloc}) {
3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3136 values %$size_alloc;
3137
3138 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last };
3140
3141 $w = 0 if $w < 0;
3142 $h = 0 if $h < 0;
3143
3144 $widget->{w} = $w;
3145 $widget->{h} = $h;
3146 $widget->emit (size_allocate => $w, $h);
3147 }
3148 }
3149
3150 while ($self->{post_alloc_hook}) {
3151 $_->()
3152 for values %{delete $self->{post_alloc_hook}};
2436 } 3153 }
2437 3154
2438 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3155 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3156 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440 glClear GL_COLOR_BUFFER_BIT; 3157 glClear GL_COLOR_BUFFER_BIT;
2441 3158
2442 glMatrixMode GL_PROJECTION; 3159 glMatrixMode GL_PROJECTION;
2443 glLoadIdentity; 3160 glLoadIdentity;
2444 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3161 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2445 glMatrixMode GL_MODELVIEW; 3162 glMatrixMode GL_MODELVIEW;
2446 glLoadIdentity; 3163 glLoadIdentity;
2447 3164
2448 $self->_draw; 3165 $self->_draw;
2449} 3166}
… …
2451############################################################################# 3168#############################################################################
2452 3169
2453package CFClient::UI; 3170package CFClient::UI;
2454 3171
2455$ROOT = new CFClient::UI::Root; 3172$ROOT = new CFClient::UI::Root;
2456$TOOLTIP = new CFClient::UI::Tooltip; 3173$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2457 3174
24581 31751
2459 3176

Diff Legend

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