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.173 by root, Tue Apr 25 10:30:48 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
241sub children { 365sub children {
242}
243
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252} 366}
253 367
254sub set_max_size { 368sub set_max_size {
255 my ($self, $w, $h) = @_; 369 my ($self, $w, $h) = @_;
256 370
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 371 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 372 delete $self->{max_h}; $self->{max_h} = $h if $h;
259} 373}
260 374
261# return top left coordinates 375sub set_tooltip {
262sub _topleft {
263 my ($self, $x, $y) = @_; 376 my ($self, $tooltip) = @_;
264 377
265 $self->{parent} 378 $tooltip =~ s/^\s+//;
266 or Carp::confess "no parent widget in _topleft\n";#d# 379 $tooltip =~ s/\s+$//;
267 380
268 $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 }
269} 389}
270 390
271# translate global coordinates to local coordinate system 391# translate global coordinates to local coordinate system
272sub coord2local { 392sub coord2local {
273 my ($self, $x, $y) = @_; 393 my ($self, $x, $y) = @_;
274 394
275 my ($X, $Y) = $self->_topleft; 395 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 396}
278 397
279# translate local coordinates to global coordinate system 398# translate local coordinates to global coordinate system
280sub coord2global { 399sub coord2global {
281 my ($self, $x, $y) = @_; 400 my ($self, $x, $y) = @_;
282 401
283 my ($X, $Y) = $self->_topleft; 402 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 403}
286 404
287sub focus_in { 405sub focus_in {
288 my ($self) = @_; 406 my ($self) = @_;
289 407
290 return if $FOCUS == $self; 408 return if $FOCUS == $self;
291 return unless $self->{can_focus}; 409 return unless $self->{can_focus};
292 410
293 my $focus = $FOCUS; $FOCUS = $self; 411 my $focus = $FOCUS; $FOCUS = $self;
294 412
295 $self->emit (focus_in => $focus); 413 $self->_emit (focus_in => $focus);
296 414
297 $focus->update if $focus; 415 $focus->update if $focus;
298 $FOCUS->update; 416 $FOCUS->update;
299} 417}
300 418
… …
303 421
304 return unless $FOCUS == $self; 422 return unless $FOCUS == $self;
305 423
306 my $focus = $FOCUS; undef $FOCUS; 424 my $focus = $FOCUS; undef $FOCUS;
307 425
308 $self->emit (focus_out => $focus); 426 $self->_emit (focus_out => $focus);
309 427
310 $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;
311} 432}
312 433
313sub mouse_motion { } 434sub mouse_motion { }
314sub button_up { } 435sub button_up { }
315sub key_down { } 436sub key_down { }
316sub key_up { } 437sub key_up { }
317 438
318sub button_down { 439sub button_down {
319 my ($self, $ev, $x, $y) = @_; 440 my ($self, $ev, $x, $y) = @_;
320 441
321 $self->focus_in; 442 $self->focus_in;
… …
355 if ($ENV{PCLIENT_DEBUG}) { 476 if ($ENV{PCLIENT_DEBUG}) {
356 glPushMatrix; 477 glPushMatrix;
357 glColor 1, 1, 0, 1; 478 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP; 480 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0; 481 glVertex 0 , 0;
361 glVertex $self->{w}, 0; 482 glVertex $self->{w} - 1, 0;
362 glVertex $self->{w}, $self->{h}; 483 glVertex $self->{w} - 1, $self->{h} - 1;
363 glVertex 0 , $self->{h}; 484 glVertex 0 , $self->{h} - 1;
364 glEnd; 485 glEnd;
365 glPopMatrix; 486 glPopMatrix;
366 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;
367 } 488 }
368} 489}
369 490
370sub _draw { 491sub _draw {
371 my ($self) = @_; 492 my ($self) = @_;
… …
387 508
388sub set_parent { 509sub set_parent {
389 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
390 511
391 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;
392} 518}
393 519
394sub check_size { 520sub check_size {
395 my ($self) = @_; 521 my ($self, $forced) = @_;
396 522
397 $self->{parent} 523 $self->{force_alloc} = 1 if $forced;
398 or return 1; 524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418} 525}
419 526
420sub update { 527sub update {
421 my ($self) = @_; 528 my ($self) = @_;
422 529
… …
428 my ($self, $signal, $cb) = @_; 535 my ($self, $signal, $cb) = @_;
429 536
430 push @{ $self->{signal_cb}{$signal} }, $cb; 537 push @{ $self->{signal_cb}{$signal} }, $cb;
431} 538}
432 539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
433sub emit { 546sub emit {
434 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
435 548
436 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) = @_;
437} 555}
438 556
439sub DESTROY { 557sub DESTROY {
440 my ($self) = @_; 558 my ($self) = @_;
441 559
560 delete $WIDGET{$self+0};
442 #$self->deactivate; 561 #$self->deactivate;
443} 562}
444 563
445############################################################################# 564#############################################################################
446 565
… …
455 my $class = shift; 574 my $class = shift;
456 575
457 # range [value, low, high, page] 576 # range [value, low, high, page]
458 577
459 $class->SUPER::new ( 578 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 579 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 580 #active_bg => [1, 1, 1, 0.5],
462 @_ 581 @_
463 ) 582 )
464} 583}
465 584
466sub _draw { 585sub _draw {
467 my ($self) = @_; 586 my ($self) = @_;
468 587
588 my $color = $FOCUS == $self && $self->{active_bg}
589 ? $self->{active_bg}
590 : $self->{bg};
591
592 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 593 my ($w, $h) = @$self{qw(w h)};
470 594
471 glEnable GL_BLEND; 595 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 597 glColor @$color;
474 598
475 glBegin GL_QUADS; 599 glBegin GL_QUADS;
476 glVertex 0 , 0; 600 glVertex 0 , 0;
477 glVertex 0 , $h; 601 glVertex 0 , $h;
478 glVertex $w, $h; 602 glVertex $w, $h;
479 glVertex $w, 0; 603 glVertex $w, 0;
480 glEnd; 604 glEnd;
481 605
482 glDisable GL_BLEND; 606 glDisable GL_BLEND;
607 }
483} 608}
484 609
485############################################################################# 610#############################################################################
486 611
487package CFClient::UI::Empty; 612package CFClient::UI::Empty;
… …
519 644
520 $self 645 $self
521} 646}
522 647
523sub add { 648sub add {
524 my ($self, $child) = @_; 649 my ($self, @widgets) = @_;
525 650
526 $child->set_parent ($self); 651 $_->set_parent ($self)
652 for @widgets;
527 653
528 use sort 'stable'; 654 use sort 'stable';
529 655
530 $self->{children} = [ 656 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 657 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 658 @{$self->{children}}, @widgets
533 ]; 659 ];
534 660
535 $child->check_size; 661 $self->check_size (1);
662 $self->update;
536} 663}
537 664
538sub children { 665sub children {
539 @{ $_[0]{children} } 666 @{ $_[0]{children} }
540} 667}
… …
545 delete $child->{parent}; 672 delete $child->{parent};
546 $child->hide; 673 $child->hide;
547 674
548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
549 676
550 $self->check_size; 677 $self->check_size (1);
551 $self->update; 678 $self->update;
552} 679}
553 680
554sub clear { 681sub clear {
555 my ($self) = @_; 682 my ($self) = @_;
… …
559 686
560 for (@$children) { 687 for (@$children) {
561 delete $_->{parent}; 688 delete $_->{parent};
562 $_->hide; 689 $_->hide;
563 } 690 }
691
692 $self->check_size;
693 $self->update;
564} 694}
565 695
566sub find_widget { 696sub find_widget {
567 my ($self, $x, $y) = @_; 697 my ($self, $x, $y) = @_;
568 698
… …
643} 773}
644 774
645sub update { 775sub update {
646 my ($self) = @_; 776 my ($self) = @_;
647 777
648 # we want to do this delayed... 778 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 779 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 780}
662 781
663sub size_allocate { 782sub size_allocate {
664 my ($self, $w, $h) = @_; 783 my ($self, $w, $h) = @_;
665 784
666 $self->child->configure (0, 0, $w, $h); 785 $self->SUPER::size_allocate ($w, $h);
786 $self->update;
787}
667 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
668 $self->render_chld; 800 $self->_render;
801 };
669} 802}
670 803
671sub _draw { 804sub _draw {
672 my ($self) = @_; 805 my ($self) = @_;
673 806
674 my ($w, $h) = ($self->w, $self->h); 807 my ($w, $h) = ($self->w, $self->h);
675 808
676 my $tex = $self->{texture} 809 my $tex = $self->{texture}
677 or return; 810 or return;
678 811
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 812 glEnable GL_TEXTURE_2D;
682 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;
683 815
684 $tex->draw_quad (0, 0, $w, $h); 816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 817
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 818 glDisable GL_TEXTURE_2D;
688} 819}
689 820
690############################################################################# 821#############################################################################
691 822
692package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
693 824
694our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
695
696sub new { die }
697
698sub size_request {
699 my ($self) = @_;
700
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
703
704 @$self{qw(child_w child_h)}
705}
706
707sub _draw {
708 my ($self) = @_;
709
710 $self->{children}[1]->draw;
711}
712
713
714#############################################################################
715
716package CFClient::UI::Frame;
717
718our @ISA = CFClient::UI::Bin::;
719
720use CFClient::OpenGL;
721 826
722sub new { 827sub new {
723 my $class = shift; 828 my $class = shift;
724 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
725 my $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
726 bg => [1, 1, 1, 1], 920 vp => (new CFClient::UI::ViewPort expand => 1),
727 border_bg => [1, 1, 1, 1], 921 slider => $slider,
728 border => 0.8,
729 @_ 922 @_,
730 ); 923 );
731 924
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider});
928
732 $self 929 $self
733} 930}
734 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
735sub _draw { 971sub _draw {
736 my ($self) = @_; 972 my ($self) = @_;
737 973
738 my ($w, $h) = ($self->{w}, $self->{h}); 974 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)};
739 976
740 glEnable GL_BLEND; 977 glEnable GL_BLEND;
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D; 979 glColor @{ $self->{bg} };
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 980
745# glBegin GL_QUADS; 981 glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0; 982 glVertex 0 , 0;
748# glVertex 0 , $h; 983 glVertex 0 , $h;
749# glVertex $w, $h; 984 glVertex $w, $h;
750# glVertex $w, 0; 985 glVertex $w, 0;
751# glEnd; 986 glEnd;
752 987
753
754 $self->child->draw;
755 glDisable GL_BLEND; 988 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D; 989 }
990
991 $self->SUPER::_draw;
757} 992}
758 993
759############################################################################# 994#############################################################################
760 995
761package CFClient::UI::FancyFrame; 996package CFClient::UI::FancyFrame;
… …
769 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);
770 1005
771sub new { 1006sub new {
772 my $class = shift; 1007 my $class = shift;
773 1008
774 # TODO: user_x, user_y, overwrite moveto?
775
776 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 1010 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 1011 border_bg => [1, 1, 1, 1],
779 border => 0.8, 1012 border => 0.6,
1013 is_toplevel => 1,
780 can_events => 1, 1014 can_events => 1,
781 @_ 1015 @_
782 ); 1016 );
783 1017
784 $self->{title} &&= new CFClient::UI::Label 1018 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 1019 align => 0,
786 valign => 1, 1020 valign => 1,
787 text => $self->{title}, 1021 text => $self->{title},
788 fontsize => 1; 1022 fontsize => $self->{border};
789 1023
790 $self 1024 $self
791} 1025}
792 1026
793sub border { 1027sub border {
… …
809 my ($self, $w, $h) = @_; 1043 my ($self, $w, $h) = @_;
810 1044
811 $h -= List::Util::max 0, $self->border * 2; 1045 $h -= List::Util::max 0, $self->border * 2;
812 $w -= List::Util::max 0, $self->border * 2; 1046 $w -= List::Util::max 0, $self->border * 2;
813 1047
814 $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)
815 if $self->{title}; 1049 if $self->{title};
816 1050
817 $self->child->configure ($self->border, $self->border, $w, $h); 1051 $self->child->configure ($self->border, $self->border, $w, $h);
818} 1052}
819 1053
820sub button_down { 1054sub button_down {
821 my ($self, $ev, $x, $y) = @_; 1055 my ($self, $ev, $x, $y) = @_;
822 1056
1057 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 1058 my $border = $self->border;
824 1059
825 if ($x < $self->{w} && $x >= $self->{w} - $border 1060 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 1061 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 1062
1063 if ($lr & $td) {
1064 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1065 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 1066 my ($bw, $bh) = ($self->{w}, $self->{h});
830 1067
1068 my $mx = $x < $border;
1069 my $my = $y < $border;
1070
831 $self->{motion} = sub { 1071 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 1072 my ($ev, $x, $y) = @_;
833 1073
834 ($x, $y) = ($ev->{x}, $ev->{y}); 1074 my $dx = $ev->{x} - $ox;
1075 my $dy = $ev->{y} - $oy;
835 1076
836 $self->{user_w} = $bw + $x - $ox; 1077 $self->{user_x} = $wx + $dx * $mx;
837 $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});
838 $self->check_size; 1082 $self->check_size;
839 }; 1083 };
840 1084
841 } elsif ($x >= 0 && $x < $self->{w} 1085 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1086 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 1087 my ($bx, $by) = ($self->{x}, $self->{y});
846 1088
847 $self->{motion} = sub { 1089 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 1090 my ($ev, $x, $y) = @_;
849 1091
850 ($x, $y) = ($ev->{x}, $ev->{y}); 1092 ($x, $y) = ($ev->{x}, $ev->{y});
851 1093
852 $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});
853 $self->update; 1098 $self->update;
854 }; 1099 };
855 } 1100 }
856} 1101}
857 1102
… …
871 my ($self) = @_; 1116 my ($self) = @_;
872 1117
873 my ($w, $h ) = ($self->{w}, $self->{h}); 1118 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1119 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
875 1120
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 1121 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1122 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 1123
881 my $border = $self->border; 1124 my $border = $self->border;
882 1125
883 glColor @{ $self->{border_bg} }; 1126 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 1127 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 1128 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1129 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1130 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
888 1131
1132 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
889 my $bg = $tex[0]; 1133 my $bg = $tex[0];
890 1134
891 # TODO: repeat texture not scale 1135 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 1136 my $rep_x = $cw / $bg->{w};
893 my $rep_y = $ch / $bg->{h}; 1137 my $rep_y = $ch / $bg->{h};
894 1138
895 glColor @{ $self->{bg} }; 1139 glColor @{ $self->{bg} };
896 1140
897 $bg->{s} = $rep_x; 1141 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y; 1142 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1; 1143 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 1144 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145 }
901 1146
902 glDisable GL_TEXTURE_2D; 1147 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 1148
905 $self->{title}->draw if $self->{title}; 1149 $self->{title}->draw if $self->{title};
1150
906 $self->child->draw; 1151 $self->child->draw;
907} 1152}
908 1153
909############################################################################# 1154#############################################################################
910 1155
… …
919sub new { 1164sub new {
920 my $class = shift; 1165 my $class = shift;
921 1166
922 $class->SUPER::new ( 1167 $class->SUPER::new (
923 col_expand => [], 1168 col_expand => [],
924 @_ 1169 @_,
925 ) 1170 )
1171}
1172
1173sub children {
1174 grep $_, map @$_, grep $_, @{ $_[0]{children} }
926} 1175}
927 1176
928sub add { 1177sub add {
929 my ($self, $x, $y, $child) = @_; 1178 my ($self, $x, $y, $child) = @_;
930 1179
931 $child->set_parent ($self); 1180 $child->set_parent ($self);
932 $self->{children}[$y][$x] = $child; 1181 $self->{children}[$y][$x] = $child;
933 1182
934 $child->check_size; 1183 $self->check_size (1);
935} 1184}
936 1185
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
941# 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?
942sub clear { 1187sub clear {
943 my ($self) = @_; 1188 my ($self) = @_;
944 1189
945 my @children = $self->children; 1190 my @children = $self->children;
946 delete $self->{children}; 1191 delete $self->{children};
… …
948 for (@children) { 1193 for (@children) {
949 delete $_->{parent}; 1194 delete $_->{parent};
950 $_->hide; 1195 $_->hide;
951 } 1196 }
952 1197
1198 $self->check_size (1);
953 $self->update; 1199 $self->update;
954} 1200}
955 1201
956sub get_wh { 1202sub get_wh {
957 my ($self) = @_; 1203 my ($self) = @_;
… …
989sub size_allocate { 1235sub size_allocate {
990 my ($self, $w, $h) = @_; 1236 my ($self, $w, $h) = @_;
991 1237
992 my ($ws, $hs) = $self->get_wh; 1238 my ($ws, $hs) = $self->get_wh;
993 1239
994 my $req_w = sum @$ws; 1240 my $req_w = (sum @$ws) || 1;
995 my $req_h = sum @$hs; 1241 my $req_h = (sum @$hs) || 1;
996 1242
997 # TODO: nicer code && do row_expand 1243 # TODO: nicer code && do row_expand
998 my @col_expand = @{$self->{col_expand}}; 1244 my @col_expand = @{$self->{col_expand}};
999 @col_expand = (1) x @$ws unless @col_expand; 1245 @col_expand = (1) x @$ws unless @col_expand;
1000 my $col_expand = (sum @col_expand) || 1; 1246 my $col_expand = (sum @col_expand) || 1;
… …
1054 } 1300 }
1055} 1301}
1056 1302
1057############################################################################# 1303#############################################################################
1058 1304
1059package CFClient::UI::HBox; 1305package CFClient::UI::Box;
1060
1061# TODO: wrap into common Box base class
1062 1306
1063our @ISA = CFClient::UI::Container::; 1307our @ISA = CFClient::UI::Container::;
1064 1308
1065sub size_request { 1309sub size_request {
1066 my ($self) = @_; 1310 my ($self) = @_;
1067 1311
1068 my @alloc = map [$_->size_request], @{$self->{children}}; 1312 $self->{vertical}
1069 1313 ? (
1070 ( 1314 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1071 (List::Util::sum map $_->[0], @alloc), 1315 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1072 (List::Util::max map $_->[1], @alloc), 1316 )
1073 ) 1317 : (
1318 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1320 )
1074} 1321}
1075 1322
1076sub size_allocate { 1323sub size_allocate {
1077 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1078 1325
1079 ($h, $w) = ($w, $h); 1326 my $space = $self->{vertical} ? $h : $w;
1080
1081 my $children = $self->{children}; 1327 my $children = $self->{children};
1082 1328
1083 my @h = map $_->{req_w}, @$children; 1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1084
1085 my $req_h = List::Util::sum @h; 1330 my $req = List::Util::sum @req;
1086 1331
1087 if ($req_h > $h) { 1332 if ($req > $space) {
1088 # ah well, not enough space 1333 # ah well, not enough space
1089 $_ *= $h / $req_h for @h; 1334 $_ *= $space / $req for @req;
1090 } else { 1335 } else {
1091 my $exp = List::Util::sum map $_->{expand}, @$children; 1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1092 $exp ||= 1;
1093 1337
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1094 for (0 .. $#$children) { 1339 for 0 .. $#$children;
1095 my $child = $children->[$_];
1096
1097 my $alloc_h = $h[$_];
1098 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1099 $h[$_] = $alloc_h;
1100 }
1101 } 1340 }
1102 1341
1103 CFClient::UI::harmonize \@h; 1342 CFClient::UI::harmonize \@req;
1104 1343
1105 my $y = 0; 1344 my $pos = 0;
1106 for (0 .. $#$children) { 1345 for (0 .. $#$children) {
1107 my $child = $children->[$_];
1108 my $h = $h[$_]; 1346 my $alloc = $req[$_];
1109 $child->configure ($y, 0, $h, $w); 1347 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1110 1348
1111 $y += $h; 1349 $pos += $alloc;
1112 } 1350 }
1113 1351
1114 1 1352 1
1115} 1353}
1116 1354
1117############################################################################# 1355#############################################################################
1118 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
1119package CFClient::UI::VBox; 1372package CFClient::UI::VBox;
1120 1373
1121# TODO: wrap into common Box base class
1122
1123our @ISA = CFClient::UI::Container::; 1374our @ISA = CFClient::UI::Box::;
1124 1375
1125sub size_request { 1376sub new {
1126 my ($self) = @_; 1377 my $class = shift;
1127 1378
1128 my @alloc = map [$_->size_request], @{$self->{children}}; 1379 $class->SUPER::new (
1129 1380 vertical => 1,
1130 ( 1381 @_,
1131 (List::Util::max map $_->[0], @alloc),
1132 (List::Util::sum map $_->[1], @alloc),
1133 ) 1382 )
1134} 1383}
1135 1384
1136sub size_allocate {
1137 my ($self, $w, $h) = @_;
1138
1139 my $children = $self->{children};
1140
1141 my @h = map $_->{req_h}, @$children;
1142
1143 my $req_h = List::Util::sum @h;
1144
1145 if ($req_h > $h) {
1146 # ah well, not enough space
1147 $_ *= $h / $req_h for @h;
1148 } else {
1149 my $exp = List::Util::sum map $_->{expand}, @$children;
1150 $exp ||= 1;
1151
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154
1155 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1156 }
1157 }
1158
1159 CFClient::UI::harmonize \@h;
1160
1161 my $y = 0;
1162 for (0 .. $#$children) {
1163 my $child = $children->[$_];
1164 my $h = $h[$_];
1165 $child->configure (0, $y, $w, $h);
1166
1167 $y += $h;
1168 }
1169
1170 1
1171}
1172
1173############################################################################# 1385#############################################################################
1174 1386
1175package CFClient::UI::Label; 1387package CFClient::UI::Label;
1176 1388
1177our @ISA = CFClient::UI::Base::; 1389our @ISA = CFClient::UI::DrawBG::;
1178 1390
1179use CFClient::OpenGL; 1391use CFClient::OpenGL;
1180 1392
1181sub new { 1393sub new {
1182 my ($class, %arg) = @_; 1394 my ($class, %arg) = @_;
1183 1395
1184 my $self = $class->SUPER::new ( 1396 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1397 fg => [1, 1, 1],
1398 #bg => none
1399 #active_bg => none
1186 #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),
1187 fontsize => 1, 1406 fontsize => 1,
1188 text => "",
1189 align => -1, 1407 align => -1,
1190 valign => -1, 1408 valign => -1,
1191 padding => 2, 1409 padding => 2,
1192 layout => new CFClient::Layout,
1193 can_events => 0, 1410 can_events => 0,
1194 %arg 1411 %arg
1195 ); 1412 );
1196 1413
1197 if (exists $self->{template}) { 1414 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1415 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1416 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1417 $self->{template} = $layout;
1201 } 1418 }
1202 1419
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1420 if (exists $self->{markup}) {
1204 $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 }
1205 1425
1206 $self 1426 $self
1207} 1427}
1208 1428
1209sub escape { 1429sub escape($) {
1210 local $_ = $_[1]; 1430 local $_ = $_[0];
1211 1431
1212 s/&/&amp;/g; 1432 s/&/&amp;/g;
1213 s/>/&gt;/g; 1433 s/>/&gt;/g;
1214 s/</&lt;/g; 1434 s/</&lt;/g;
1215 1435
1216 $_[1] 1436 $_
1217} 1437}
1218 1438
1219sub update { 1439sub update {
1220 my ($self) = @_; 1440 my ($self) = @_;
1221 1441
1222 delete $self->{texture}; 1442 delete $self->{texture};
1223 $self->SUPER::update; 1443 $self->SUPER::update;
1224} 1444}
1225 1445
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1446sub set_text {
1233 my ($self, $text) = @_; 1447 my ($self, $text) = @_;
1234 1448
1235 return if $self->{text} eq "T$text"; 1449 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1450 $self->{text} = "T$text";
1237 1451
1452 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1453 $self->{layout}->set_text ($text);
1239 1454
1240 delete $self->{texture};
1241 $self->update; 1455 $self->update;
1242 $self->check_size; 1456 $self->check_size;
1243} 1457}
1244 1458
1245sub set_markup { 1459sub set_markup {
1246 my ($self, $markup) = @_; 1460 my ($self, $markup) = @_;
1247 1461
1248 return if $self->{text} eq "M$markup"; 1462 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1463 $self->{text} = "M$markup";
1250 1464
1465 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466
1467 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1468 $self->{layout}->set_markup ($markup);
1252 1469
1253 delete $self->{texture};
1254 $self->update; 1470 $self->update;
1255 $self->check_size; 1471 $self->check_size;
1256} 1472}
1257 1473
1258sub size_request { 1474sub size_request {
1259 my ($self) = @_; 1475 my ($self) = @_;
1260 1476
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1477 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $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});
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1481 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264 1482
1265 my ($w, $h) = $self->{layout}->size; 1483 my ($w, $h) = $self->{layout}->size;
1266 1484
1267 if (exists $self->{template}) { 1485 if (exists $self->{template}) {
… …
1289sub set_fontsize { 1507sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1508 my ($self, $fontsize) = @_;
1291 1509
1292 $self->{fontsize} = $fontsize; 1510 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1511 delete $self->{texture};
1512
1513 $self->update;
1294 $self->check_size; 1514 $self->check_size;
1295 $self->update;
1296} 1515}
1297 1516
1298sub _draw { 1517sub _draw {
1299 my ($self) = @_; 1518 my ($self) = @_;
1300 1519
1520 $self->SUPER::_draw; # draw background, if applicable
1521
1301 my $tex = $self->{texture} ||= do { 1522 my $tex = $self->{texture} ||= do {
1523 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1524 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $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});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529
1305 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
1306 }; 1541 };
1307 1542
1308 glEnable GL_BLEND;
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D; 1543 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1545
1546 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1547 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $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 }
1328 1552
1329 glDisable GL_TEXTURE_2D; 1553 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1554}
1332 1555
1333############################################################################# 1556#############################################################################
1334 1557
1335package CFClient::UI::EntryBase; 1558package CFClient::UI::EntryBase;
… …
1348 active_fg => [0, 0, 0], 1571 active_fg => [0, 0, 0],
1349 can_hover => 1, 1572 can_hover => 1,
1350 can_focus => 1, 1573 can_focus => 1,
1351 valign => 0, 1574 valign => 0,
1352 can_events => 1, 1575 can_events => 1,
1576 #text => ...
1353 @_ 1577 @_
1354 ) 1578 )
1355} 1579}
1356 1580
1357sub _set_text { 1581sub _set_text {
… …
1367 $self->{text} = $text; 1591 $self->{text} = $text;
1368 1592
1369 $text =~ s/./*/g if $self->{hidden}; 1593 $text =~ s/./*/g if $self->{hidden};
1370 $self->{layout}->set_text ("$text "); 1594 $self->{layout}->set_text ("$text ");
1371 1595
1372 $self->emit (changed => $self->{text}); 1596 $self->_emit (changed => $self->{text});
1373}
1374
1375sub get_text {
1376 $_[0]{text}
1377}
1378
1379sub size_request {
1380 my ($self) = @_;
1381
1382 my ($w, $h) = $self->SUPER::size_request;
1383
1384 ($w + 1, $h) # add 1 for cursor
1385}
1386
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391} 1597}
1392 1598
1393sub set_text { 1599sub set_text {
1394 my ($self, $text) = @_; 1600 my ($self, $text) = @_;
1395 1601
1396 $self->{cursor} = length $text; 1602 $self->{cursor} = length $text;
1397 $self->_set_text ($text); 1603 $self->_set_text ($text);
1398 $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
1399} 1618}
1400 1619
1401sub key_down { 1620sub key_down {
1402 my ($self, $ev) = @_; 1621 my ($self, $ev) = @_;
1403 1622
… …
1405 my $sym = $ev->{sym}; 1624 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 1625 my $uni = $ev->{unicode};
1407 1626
1408 my $text = $self->get_text; 1627 my $text = $self->get_text;
1409 1628
1410 if ($sym == 8) { 1629 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1630 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 1631 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 1632 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 1633 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 1634 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 1635 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1636 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 1637 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0; 1638 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) { 1639 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text; 1640 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 1641 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 1642 $self->_emit ('escape');
1424 } elsif ($uni) { 1643 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 1644 substr $text, $self->{cursor}++, 0, chr $uni;
1426 } 1645 }
1427 1646
1428 $self->_set_text ($text); 1647 $self->_set_text ($text);
1429 $self->update; 1648 $self->update;
1649 $self->check_size;
1430} 1650}
1431 1651
1432sub focus_in { 1652sub focus_in {
1433 my ($self) = @_; 1653 my ($self) = @_;
1434 1654
… …
1514 if ($sym == 13) { 1734 if ($sym == 13) {
1515 unshift @{$self->{history}}, 1735 unshift @{$self->{history}},
1516 my $txt = $self->get_text; 1736 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1; 1737 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = ''; 1738 $self->{history_saveback} = '';
1519 $self->emit (activate => $txt); 1739 $self->_emit (activate => $txt);
1520 $self->update; 1740 $self->update;
1521 1741
1522 } elsif ($sym == CFClient::SDLK_UP) { 1742 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) { 1743 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text; 1744 $self->{history_saveback} = $self->get_text;
… …
1563 my $class = shift; 1783 my $class = shift;
1564 1784
1565 $class->SUPER::new ( 1785 $class->SUPER::new (
1566 padding => 4, 1786 padding => 4,
1567 fg => [1, 1, 1], 1787 fg => [1, 1, 1],
1568 bg => [1, 1, 1, 0.2],
1569 active_fg => [0, 0, 1], 1788 active_fg => [0, 0, 1],
1570 can_hover => 1, 1789 can_hover => 1,
1571 align => 0, 1790 align => 0,
1572 valign => 0, 1791 valign => 0,
1573 can_events => 1, 1792 can_events => 1,
1574 @_ 1793 @_
1575 ) 1794 )
1576} 1795}
1577 1796
1797sub activate { }
1798
1578sub button_up { 1799sub button_up {
1579 my ($self, $ev, $x, $y) = @_; 1800 my ($self, $ev, $x, $y) = @_;
1580 1801
1802 $self->emit ("activate")
1581 if ($x >= 0 && $x < $self->{w} 1803 if $x >= 0 && $x < $self->{w}
1582 && $y >= 0 && $y < $self->{h}) { 1804 && $y >= 0 && $y < $self->{h};
1583 $self->emit ("activate");
1584 }
1585} 1805}
1586 1806
1587sub _draw { 1807sub _draw {
1588 my ($self) = @_; 1808 my ($self) = @_;
1589 1809
… …
1591 1811
1592 if ($GRAB == $self) { 1812 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg}; 1813 $self->{fg} = $self->{active_fg};
1594 } 1814 }
1595 1815
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 1816 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 1818 glColor 0, 0, 0, 1;
1601 1819
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1820 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 1821
1604 glDisable GL_TEXTURE_2D; 1822 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 1823
1607 $self->SUPER::_draw; 1824 $self->SUPER::_draw;
1608} 1825}
1609 1826
1610############################################################################# 1827#############################################################################
… …
1624 1841
1625 $class->SUPER::new ( 1842 $class->SUPER::new (
1626 padding => 2, 1843 padding => 2,
1627 fg => [1, 1, 1], 1844 fg => [1, 1, 1],
1628 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],
1629 state => 0, 1848 state => 0,
1630 can_hover => 1, 1849 can_hover => 1,
1631 @_ 1850 @_
1632 ) 1851 )
1633} 1852}
… …
1642 my ($self, $ev, $x, $y) = @_; 1861 my ($self, $ev, $x, $y) = @_;
1643 1862
1644 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1863 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1645 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1864 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1646 $self->{state} = !$self->{state}; 1865 $self->{state} = !$self->{state};
1647 $self->emit (changed => $self->{state}); 1866 $self->_emit (changed => $self->{state});
1648 } 1867 }
1649} 1868}
1650 1869
1651sub _draw { 1870sub _draw {
1652 my ($self) = @_; 1871 my ($self) = @_;
… …
1657 1876
1658 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;
1659 1878
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1879 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 1880
1662 glEnable GL_BLEND; 1881 my $tex = $self->{state} ? $tex[1] : $tex[0];
1882
1663 glEnable GL_TEXTURE_2D; 1883 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 1884 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 1885 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 1886}
1673 1887
1674############################################################################# 1888#############################################################################
1675 1889
1676package CFClient::UI::Image; 1890package CFClient::UI::Image;
… …
1719 glTranslate 0, -$self->{w}, 0; 1933 glTranslate 0, -$self->{w}, 0;
1720 1934
1721 ($w, $h) = ($h, $w); 1935 ($w, $h) = ($h, $w);
1722 } 1936 }
1723 1937
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 1938 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1939 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 1940
1729 $tex->draw_quad (0, 0, $w, $h); 1941 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 1942
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 1943 glDisable GL_TEXTURE_2D;
1733} 1944}
1734 1945
1735############################################################################# 1946#############################################################################
1736 1947
… …
1925 qw(s1_slider.png s1_slider_bg.png); 2136 qw(s1_slider.png s1_slider_bg.png);
1926 2137
1927sub new { 2138sub new {
1928 my $class = shift; 2139 my $class = shift;
1929 2140
1930 # range [value, low, high, page] 2141 # range [value, low, high, page, unit]
1931 2142
1932 # TODO: 0-width page 2143 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 2144 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 2145 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2146 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2147 fg => [1, 1, 1],
1937 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],
1938 range => [0, 0, 100, 10], 2151 range => [0, 0, 100, 10, 0],
1939 req_w => 20, 2152 req_w => $::WIDTH / 80,
1940 req_h => 20, 2153 req_h => $::WIDTH / 80,
1941 vertical => 0, 2154 vertical => 0,
1942 can_hover => 1, 2155 can_hover => 1,
1943 inner_pad => 5, 2156 inner_pad => 0.02,
1944 @_ 2157 @_
1945 ); 2158 );
1946 2159
2160 $self->set_value ($self->{range}[0]);
2161 $self->update;
2162
1947 $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 }
1948} 2196}
1949 2197
1950sub size_request { 2198sub size_request {
1951 my ($self) = @_; 2199 my ($self) = @_;
1952 2200
… …
1958 2206
1959sub button_down { 2207sub button_down {
1960 my ($self, $ev, $x, $y) = @_; 2208 my ($self, $ev, $x, $y) = @_;
1961 2209
1962 $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
1963 $self->mouse_motion ($ev, $x, $y); 2214 $self->mouse_motion ($ev, $x, $y);
1964} 2215}
1965 2216
1966sub mouse_motion { 2217sub mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
1968 2219
1969 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
1970 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2237 my ($value, $lo, $hi, $page) = @{$self->{range}};
2238 my $range = ($hi - $page - $lo) || 1e-100;
1971 2239
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2240 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1973 2241
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2242 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2243 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1976 2244
1977 $x -= $inner_pad_px; # substract the padding 2245 $value = ($value - $lo) / $range;
1978 $x = $x * ($hi - $lo) / $inner_w + $lo; 2246 $value = $value * $self->{scale} + $self->{offset};
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 2247
1983 $self->emit (changed => $x); 2248 $self->{knob_x} = $value - $knob_w * 0.5;
1984 $self->update; 2249 $self->{knob_w} = $knob_w;
1985 } 2250 });
1986}
1987 2251
1988# the inner_* stuff is for generating a padding for the slider handle, 2252 $self->SUPER::update;
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1994} 2253}
1995 2254
1996sub _draw { 2255sub _draw {
1997 my ($self) = @_; 2256 my ($self) = @_;
1998 2257
1999 $self->SUPER::_draw (); 2258 $self->SUPER::_draw ();
2000 2259
2001 my ($w, $h) = @$self{qw(w h)}; 2260 glScale $self->{w}, $self->{h};
2002 2261
2003 if ($self->{vertical}) { 2262 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 2263 # draw a vertical slider like a rotated horizontal slider
2005 2264
2265 glTranslate 1, 0, 0;
2006 glRotate 90, 0, 0, 1; 2266 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 2267 }
2011 2268
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2269 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2270 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 2271
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2272 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2274
2038 # draw background 2275 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2276 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 2277
2041 # draw handle 2278 # draw handle
2042 $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);
2043 2280
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2281 glDisable GL_TEXTURE_2D;
2046} 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 (@_) }
2047 2324
2048############################################################################# 2325#############################################################################
2049 2326
2050package CFClient::UI::TextView; 2327package CFClient::UI::TextView;
2051 2328
… …
2060 fontsize => 1, 2337 fontsize => 1,
2061 can_events => 0, 2338 can_events => 0,
2062 #font => default_font 2339 #font => default_font
2063 @_, 2340 @_,
2064 2341
2065 layout => (new CFClient::Layout), 2342 layout => (new CFClient::Layout 1),
2066 par => [], 2343 par => [],
2067 height => 0, 2344 height => 0,
2068 children => [ 2345 children => [
2069 (new CFClient::UI::Empty expand => 1), 2346 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2347 (new CFClient::UI::Slider vertical => 1),
2071 ], 2348 ],
2072 ); 2349 );
2073 2350
2074 $self->{children}[1]->connect (changed => sub { 2351 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2352
2078 $self 2353 $self
2079} 2354}
2080 2355
2081sub set_fontsize { 2356sub set_fontsize {
2082 my ($self, $fontsize) = @_; 2357 my ($self, $fontsize) = @_;
2083 2358
2084 $self->{fontsize} = $fontsize; 2359 $self->{fontsize} = $fontsize;
2085 $self->reflow; 2360 $self->reflow;
2086}
2087
2088sub text_height {
2089 my ($self, $text) = @_;
2090
2091 my $layout = $self->{layout};
2092
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w});
2095 $layout->set_text ($text);
2096
2097 ($layout->size)[1]
2098}
2099
2100sub reflow {
2101 my ($self) = @_;
2102
2103 $self->{need_reflow}++;
2104 $self->update;
2105} 2361}
2106 2362
2107sub size_allocate { 2363sub size_allocate {
2108 my ($self, $w, $h) = @_; 2364 my ($self, $w, $h) = @_;
2109 2365
… …
2114 $self->{layout}->set_width ($self->{children}[0]{w}); 2370 $self->{layout}->set_width ($self->{children}[0]{w});
2115 2371
2116 $self->reflow; 2372 $self->reflow;
2117} 2373}
2118 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
2119sub add_paragraph { 2409sub add_paragraph {
2120 my ($self, $color, $text) = @_; 2410 my ($self, $color, $text, $indent) = @_;
2121 2411
2122 #TODO: intelligently "reformat" paragraph 2412 for my $line (split /\n/, $text) {
2123 2413 my ($w, $h) = $self->text_size ($line);
2124 my $height = $self->text_height ($text);
2125
2126 $self->{height} += $height; 2414 $self->{height} += $h;
2415 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2416 }
2127 2417
2128 push @{$self->{par}}, [$height, $color, $text];
2129
2130 $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]);
2131 $self->{children}[1]->update;
2132} 2419}
2133 2420
2134sub update { 2421sub update {
2135 my ($self) = @_; 2422 my ($self) = @_;
2136 2423
… …
2138 2425
2139 return unless $self->{h} > 0; 2426 return unless $self->{h} > 0;
2140 2427
2141 delete $self->{texture}; 2428 delete $self->{texture};
2142 2429
2143 $ROOT->on_refresh ($self, sub { 2430 $ROOT->on_post_alloc ($self, sub {
2431 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2432
2144 if (delete $self->{need_reflow}) { 2433 if (delete $self->{need_reflow}) {
2145 my $height = 0; 2434 my $height = 0;
2146 2435
2147 $height += $_->[0] = $self->text_height ($_->[2]) 2436 my $layout = $self->{layout};
2437
2438 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2439
2148 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 }
2149 2451
2150 $self->{height} = $height; 2452 $self->{height} = $height;
2151 2453
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2454 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2153 2455
2154 delete $self->{texture}; 2456 delete $self->{texture};
2155 } 2457 }
2156 2458
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2459 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2158 glClearColor 0, 0, 0, 1; 2460 glClearColor 0.5, 0.5, 0.5, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2461 glClear GL_COLOR_BUFFER_BIT;
2160 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
2161 glEnable GL_BLEND; 2474 glEnable GL_BLEND;
2475 #TODO# not correct in windows where rgba is forced off
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2476 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165
2166 my $top = int $self->{children}[1]{range}[0];
2167
2168 my $y0 = $top;
2169 my $y1 = $top + $self->{h};
2170
2171 my $y = 0;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176 2477
2177 for my $par (@{$self->{par}}) { 2478 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0]; 2479 my $h = $par->[1];
2179 2480
2180 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]);
2181 $layout->set_text ($par->[2]); 2484 $layout->set_markup ($par->[4]);
2182 2485
2183 glColor @{ $par->[1] }; 2486 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2184 my ($W, $H) = $layout->size; 2487
2185 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;
2186 } 2490 }
2187 2491
2188 $y += $h; 2492 $y += $h;
2189 } 2493 }
2190 2494
2191 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND; 2495 glDisable GL_BLEND;
2193 }; 2496 };
2194 }); 2497 });
2195} 2498}
2196 2499
2197sub _draw { 2500sub _draw {
2198 my ($self) = @_; 2501 my ($self) = @_;
2199 2502
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 2503 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2505 glColor 1, 1, 1, 1;
2204 $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});
2205 glDisable GL_TEXTURE_2D; 2507 glDisable GL_TEXTURE_2D;
2206 }
2207 2508
2208 $self->{children}[1]->draw; 2509 $self->{children}[1]->draw;
2209 2510
2210} 2511}
2211 2512
… …
2259 2560
2260sub new { 2561sub new {
2261 my $class = shift; 2562 my $class = shift;
2262 2563
2263 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2264 state => 0, 2565 state => 0,
2265 connect_activate => \&toggle_flopper, 2566 on_activate => \&toggle_flopper,
2266 @_ 2567 @_
2267 ); 2568 );
2268 2569
2269 if ($self->{state}) {
2270 $self->{state} = 0;
2271 $self->toggle_flopper;
2272 }
2273
2274 $self 2570 $self
2275} 2571}
2276 2572
2277sub toggle_flopper { 2573sub toggle_flopper {
2278 my ($self) = @_; 2574 my ($self) = @_;
2279 2575
2280 # TODO: use animation 2576 $self->{other}->toggle_visibility;
2281 if ($self->{state} = !$self->{state}) {
2282 $CFClient::UI::ROOT->add ($self->{other});
2283 $self->{other}->move ($self->coord2global (0, $self->{h}));
2284 $self->emit ("open");
2285 } else {
2286 $CFClient::UI::ROOT->remove ($self->{other});
2287 $self->emit ("close");
2288 }
2289
2290 $self->emit (changed => $self->{state});
2291} 2577}
2292 2578
2293############################################################################# 2579#############################################################################
2294 2580
2295package CFClient::UI::Tooltip; 2581package CFClient::UI::Tooltip;
… …
2305 @_, 2591 @_,
2306 can_events => 0, 2592 can_events => 0,
2307 ) 2593 )
2308} 2594}
2309 2595
2310sub set_markup { 2596sub set_tooltip_from {
2311 my ($self, $text) = @_; 2597 my ($self, $widget) = @_;
2312 2598
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2599 $self->add (new CFClient::UI::Label
2314 $self->{label}->set_markup ($text); 2600 markup => $widget->{tooltip},
2315 $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 );
2316} 2607}
2317 2608
2318sub size_request { 2609sub size_request {
2319 my ($self) = @_; 2610 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322 2611
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2612 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 2613
2325 ($w + 4, $h + 4) 2614 ($w + 4, $h + 4)
2326} 2615}
… …
2332} 2621}
2333 2622
2334sub _draw { 2623sub _draw {
2335 my ($self) = @_; 2624 my ($self) = @_;
2336 2625
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 2626 glTranslate 0.375, 0.375;
2339 2627
2340 my ($w, $h) = @$self{qw(w h)}; 2628 my ($w, $h) = @$self{qw(w h)};
2341 2629
2342 glColor 1, 0.8, 0.4; 2630 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 2641 glVertex 0 , $h;
2354 glVertex $w, $h; 2642 glVertex $w, $h;
2355 glVertex $w, 0; 2643 glVertex $w, 0;
2356 glEnd; 2644 glEnd;
2357 2645
2358 glPopMatrix; 2646 glTranslate 2 - 0.375, 2 - 0.375;
2359
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 2647 $self->SUPER::_draw;
2362} 2648}
2363 2649
2364############################################################################# 2650#############################################################################
2365 2651
… …
2370use CFClient::OpenGL; 2656use CFClient::OpenGL;
2371 2657
2372sub new { 2658sub new {
2373 my $class = shift; 2659 my $class = shift;
2374 2660
2375 $class->SUPER::new ( 2661 my $self = $class->SUPER::new (
2376 aspect => 1, 2662 aspect => 1,
2663 can_events => 0,
2377 @_, 2664 @_,
2378 ) 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
2379} 2682}
2380 2683
2381sub size_request { 2684sub size_request {
2382 (32, 8) 2685 (32, 8)
2383} 2686}
2384 2687
2688sub update {
2689 my ($self) = @_;
2690
2691 return unless $self->{visible};
2692
2693 $self->SUPER::update;
2694}
2695
2385sub draw { 2696sub _draw {
2386 my ($self) = @_; 2697 my ($self) = @_;
2387 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
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2710 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2389 2711
2390 if ($tex) { 2712 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2713 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 2715 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2716 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2398 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 @_,
2399 } 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;
2400} 2952}
2401 2953
2402############################################################################# 2954#############################################################################
2403 2955
2404package CFClient::UI::Root; 2956package CFClient::UI::Root;
2405 2957
2406our @ISA = CFClient::UI::Container::; 2958our @ISA = CFClient::UI::Container::;
2407 2959
2408use CFClient::OpenGL; 2960use CFClient::OpenGL;
2409 2961
2410sub check_size { 2962sub new {
2411 my ($self) = @_; 2963 my $class = shift;
2412 2964
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2965 $class->SUPER::new (
2414} 2966 visible => 1,
2415 2967 @_,
2416sub size_request { 2968 )
2417 ($::WIDTH, $::HEIGHT)
2418} 2969}
2419 2970
2420sub configure { 2971sub configure {
2421 my ($self, $x, $y, $w, $h) = @_; 2972 my ($self, $x, $y, $w, $h) = @_;
2422 2973
2423 $self->SUPER::configure ($x, $y, $w, $h); 2974 $self->{w} = $w;
2975 $self->{h} = $h;
2976}
2424 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
2425 for my $child (@{$self->{children}}) { 2994 for my $child ($self->children) {
2426 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)};
2427 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
2428 $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;
2429 $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
2430 $child->configure ($X, $Y, $W,$H); 3008 $child->configure ($X, $Y, $W, $H);
2431 } 3009 }
2432} 3010}
2433 3011
2434sub _topleft { 3012sub coord2local {
2435 my ($self, $x, $y) = @_; 3013 my ($self, $x, $y) = @_;
2436 3014
2437 ($x, $y) 3015 ($x, $y)
2438} 3016}
2439 3017
3018sub coord2global {
3019 my ($self, $x, $y) = @_;
3020
3021 ($x, $y)
3022}
3023
2440sub update { 3024sub update {
2441 my ($self) = @_; 3025 my ($self) = @_;
2442 3026
2443 $self->check_size; 3027 $self->check_size;
2444 ::refresh (); 3028 $::WANT_REFRESH++;
2445} 3029}
2446 3030
2447sub add { 3031sub add {
2448 my ($self, $child) = @_; 3032 my ($self, @children) = @_;
2449 3033
3034 for my $child (@children) {
3035 $child->{is_toplevel} = 1;
3036
2450 # integerize window positions 3037 # integerise window positions
2451 $child->{x} = int $child->{x}; 3038 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y}; 3039 $child->{y} = int $child->{y};
3040 }
2453 3041
2454 $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 }
2455} 3061}
2456 3062
2457sub on_refresh { 3063sub on_refresh {
2458 my ($self, $id, $cb) = @_; 3064 my ($self, $id, $cb) = @_;
2459 3065
2460 $self->{refresh_hook}{$id} = $cb; 3066 $self->{refresh_hook}{$id} = $cb;
2461} 3067}
2462 3068
3069sub on_post_alloc {
3070 my ($self, $id, $cb) = @_;
3071
3072 $self->{post_alloc_hook}{$id} = $cb;
3073}
3074
2463sub draw { 3075sub draw {
2464 my ($self) = @_; 3076 my ($self) = @_;
2465 3077
2466 while (my $rcb = delete $self->{refresh_hook}) { 3078 while ($self->{refresh_hook}) {
2467 $_->() 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}};
2468 } 3133 }
2469 3134
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3135 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3136 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 3137 glClear GL_COLOR_BUFFER_BIT;
2473 3138
2474 glMatrixMode GL_PROJECTION; 3139 glMatrixMode GL_PROJECTION;
2475 glLoadIdentity; 3140 glLoadIdentity;
2476 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3141 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2477 glMatrixMode GL_MODELVIEW; 3142 glMatrixMode GL_MODELVIEW;
2478 glLoadIdentity; 3143 glLoadIdentity;
2479 3144
2480 $self->_draw; 3145 $self->_draw;
2481} 3146}
… …
2483############################################################################# 3148#############################################################################
2484 3149
2485package CFClient::UI; 3150package CFClient::UI;
2486 3151
2487$ROOT = new CFClient::UI::Root; 3152$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 3153$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2489 3154
24901 31551
2491 3156

Diff Legend

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