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

Diff Legend

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