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

Diff Legend

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