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.332 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 UTC

1package CFClient::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFClient; 8use DC;
9use DC::Pod;
11use CFClient::Texture; 10use DC::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 29 $TOOLTIP->hide;
28 30
29 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 33
31 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
32 35
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show; 37 $TOOLTIP->show;
39 } 38 }
40 39
41 return; 40 return;
42 } 41 }
43 } 42 }
44 } 43 }
45 44
46 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48}); 48};
49 49
50sub get_layout { 50sub get_layout {
51 my $layout; 51 my $layout;
52 52
53 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
88 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
89 89
90 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92 92
93 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
94 } 94 }
95} 95}
96 96
97sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
98 my ($ev) = @_; 98 my ($ev) = @_;
99 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
100 100
101 unless ($BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
102 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
103 105
104 $GRAB = $widget; 106 $GRAB = $widget;
105 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
106 108
107 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
108 } 110 }
109
110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
111 111
112 if ($GRAB) { 112 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
117 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
118 } else { 122 } else {
119 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
120 } 124 }
121 } 125 }
… …
135 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
136 $grab->update if $grab; 140 $grab->update if $grab;
137 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
138 142
139 check_hover $widget; 143 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
141 } 145 }
142} 146}
143 147
144sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
145 my ($ev) = @_; 149 my ($ev) = @_;
… …
207 reconfigure_widgets; 211 reconfigure_widgets;
208} 212}
209 213
210############################################################################# 214#############################################################################
211 215
212package CFClient::UI::Event; 216package DC::UI::Event;
213 217
214sub xy { 218sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 220}
217 221
218############################################################################# 222#############################################################################
219 223
220package CFClient::UI::Base; 224package DC::UI::Base;
221 225
222use strict; 226use strict;
223 227
224use CFClient::OpenGL; 228use DC::OpenGL;
225 229
226sub new { 230sub new {
227 my $class = shift; 231 my $class = shift;
228 232
229 my $self = bless { 233 my $self = bless {
… …
234 h => undef, 238 h => undef,
235 can_events => 1, 239 can_events => 1,
236 @_ 240 @_
237 }, $class; 241 }, $class;
238 242
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
240 244
241 for (keys %$self) { 245 for (keys %$self) {
242 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
244 } 248 }
245 } 249 }
246 250
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
252 256
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 259
256 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
261 265
262sub destroy { 266sub destroy {
263 my ($self) = @_; 267 my ($self) = @_;
264 268
265 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
266 %$self = (); 271 %$self = ();
267} 272}
268 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
269sub show { 278sub show {
270 my ($self) = @_; 279 my ($self) = @_;
271 280
272 return if $self->{parent}; 281 return if $self->{parent};
273 282
274 $CFClient::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
275} 284}
276 285
277sub set_visible { 286sub set_visible {
278 my ($self) = @_; 287 my ($self) = @_;
279 288
… …
300 delete $self->{root}; 309 delete $self->{root};
301 310
302 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
303 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
304 313
305 $CFClient::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
306 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
307 316
308 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
310} 319}
… …
312sub set_visibility { 321sub set_visibility {
313 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
314 323
315 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
316 325
317 $visible ? $self->hide 326 $visible ? $self->show
318 : $self->show; 327 : $self->hide;
319} 328}
320 329
321sub toggle_visibility { 330sub toggle_visibility {
322 my ($self) = @_; 331 my ($self) = @_;
323 332
… …
329sub hide { 338sub hide {
330 my ($self) = @_; 339 my ($self) = @_;
331 340
332 $self->set_invisible; 341 $self->set_invisible;
333 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
334 $self->{parent}->remove ($self) 346 $parent->remove ($self);
335 if $self->{parent}; 347 }
336} 348}
337 349
338sub move_abs { 350sub move_abs {
339 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
340 352
… …
352 $self->{force_h} = $h; 364 $self->{force_h} = $h;
353 365
354 $self->realloc; 366 $self->realloc;
355} 367}
356 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 my ($w, $h) = @$self{qw(max_w max_h)};
374
375 if ($w <= 0 || $h <= 0) {
376 my ($mw, $mh) = $self->{parent}
377 ? $self->{parent}->get_max_wh
378 : ($::WIDTH, $::HEIGHT);
379
380 $w = $mw if $w <= 0;
381 $h = $mh if $h <= 0;
382 }
383
384 ($w, $h)
385}
386
357sub size_request { 387sub size_request {
358 require Carp; 388 require Carp;
359 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
360} 390}
361 391
… …
367 my ($self, $x, $y, $w, $h) = @_; 397 my ($self, $x, $y, $w, $h) = @_;
368 398
369 if ($self->{aspect}) { 399 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 400 my ($ow, $oh) = ($w, $h);
371 401
372 $w = List::Util::min $w, int $h * $self->{aspect}; 402 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, int $w / $self->{aspect}; 403 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
374 404
375 # use alignment to adjust x, y 405 # use alignment to adjust x, y
376 406
377 $x += int 0.5 * ($ow - $w); 407 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 408 $y += int 0.5 * ($oh - $h);
… …
419 449
420 return if $self->{tooltip} eq $tooltip; 450 return if $self->{tooltip} eq $tooltip;
421 451
422 $self->{tooltip} = $tooltip; 452 $self->{tooltip} = $tooltip;
423 453
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 454 if ($DC::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner}; 455 delete $DC::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 456 $DC::UI::TOOLTIP_WATCHER->invoke;
427 } 457 }
428} 458}
429 459
430# translate global coordinates to local coordinate system 460# translate global coordinates to local coordinate system
431sub coord2local { 461sub coord2local {
432 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
433 463
434 Carp::confess unless $self->{parent};#d# 464 return (undef, undef) unless $self->{parent};
435 465
436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 466 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
437} 467}
438 468
439# translate local coordinates to global coordinate system 469# translate local coordinates to global coordinate system
440sub coord2global { 470sub coord2global {
441 my ($self, $x, $y) = @_; 471 my ($self, $x, $y) = @_;
442 472
443 Carp::confess unless $self->{parent};#d# 473 return (undef, undef) unless $self->{parent};
444 474
445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 475 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
446} 476}
447 477
448sub invoke_focus_in { 478sub invoke_focus_in {
… …
497sub connect { 527sub connect {
498 my ($self, $signal, $cb) = @_; 528 my ($self, $signal, $cb) = @_;
499 529
500 push @{ $self->{signal_cb}{$signal} }, $cb; 530 push @{ $self->{signal_cb}{$signal} }, $cb;
501 531
502 defined wantarray and CFClient::guard { 532 defined wantarray and DC::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 534 @{ $self->{signal_cb}{$signal} };
505 } 535 }
536}
537
538sub disconnect_all {
539 my ($self, $signal) = @_;
540
541 delete $self->{signal_cb}{$signal};
506} 542}
507 543
508my %has_coords = ( 544my %has_coords = (
509 button_down => 1, 545 button_down => 1,
510 button_up => 1, 546 button_up => 1,
… …
513); 549);
514 550
515sub emit { 551sub emit {
516 my ($self, $signal, @args) = @_; 552 my ($self, $signal, @args) = @_;
517 553
518 # I do not really like this solution, but I dislike duplication 554 # I do not really like this solution, but I do not like duplication
519 # and needlessly verbose code, too. 555 # and needlessly verbose code, either.
520 my @append 556 my @append
521 = $has_coords{$signal} 557 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 558 ? $args[0]->xy ($self)
523 : (); 559 : ();
524 560
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 561 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526 562
527 #d##TODO# stop propagating at first true, do not use sum 563 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 564 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 565 ($self->can ("invoke_$signal") || sub { 1 }), # closure
566 ) {
567 return $cb->($self, @args, @append) || next;
568 }
569
570 # parent
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 571 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 572}
532 573
533sub find_widget { 574#sub find_widget {
534 my ($self, $x, $y) = @_; 575# in .xs
535
536 return () unless $self->{can_events};
537
538 return $self
539 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542 ()
543}
544 576
545sub set_parent { 577sub set_parent {
546 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
547 579
548 Scalar::Util::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 581 $self->set_visible if $parent->{visible};
550} 582}
551 583
552sub realloc { 584sub realloc {
553 my ($self) = @_; 585 my ($self) = @_;
… …
579 611
580# using global variables seems a bit hacky, but passing through all drawing 612# using global variables seems a bit hacky, but passing through all drawing
581# functions seems pointless. 613# functions seems pointless.
582our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 614our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583 615
584sub draw { 616#sub draw {
585 my ($self) = @_; 617#CFPlus.xs
586
587 return unless $self->{h} && $self->{w};
588
589 # update screen rectangle
590 local $draw_x = $draw_x + $self->{x};
591 local $draw_y = $draw_y + $self->{y};
592
593 # skip widgets that are entirely outside the drawing area
594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
596
597 glPushMatrix;
598 glTranslate $self->{x}, $self->{y}, 0;
599
600 if ($self == $HOVER && $self->{can_hover}) {
601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
602 glEnable GL_BLEND;
603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604 glBegin GL_QUADS;
605 glVertex 0 , 0;
606 glVertex $self->{w}, 0;
607 glVertex $self->{w}, $self->{h};
608 glVertex 0 , $self->{h};
609 glEnd;
610 glDisable GL_BLEND;
611 }
612
613 if ($ENV{CFPLUS_DEBUG} & 1) {
614 glPushMatrix;
615 glColor 1, 1, 0, 1;
616 glTranslate 0.375, 0.375;
617 glBegin GL_LINE_LOOP;
618 glVertex 0 , 0;
619 glVertex $self->{w} - 1, 0;
620 glVertex $self->{w} - 1, $self->{h} - 1;
621 glVertex 0 , $self->{h} - 1;
622 glEnd;
623 glPopMatrix;
624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625 }
626
627 $self->_draw;
628 glPopMatrix;
629}
630 618
631sub _draw { 619sub _draw {
632 my ($self) = @_; 620 my ($self) = @_;
633 621
634 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
635} 623}
636 624
637sub DESTROY { 625sub DESTROY {
638 my ($self) = @_; 626 my ($self) = @_;
639 627
640 return if CFClient::in_destruct; 628 return if DC::in_destruct;
641 629
642 delete $WIDGET{$self+0}; 630 local $@;
643
644 eval { $self->destroy }; 631 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 632 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
633
634 delete $WIDGET{$self+0};
646} 635}
647 636
648############################################################################# 637#############################################################################
649 638
650package CFClient::UI::DrawBG; 639package DC::UI::DrawBG;
651 640
652our @ISA = CFClient::UI::Base::; 641our @ISA = DC::UI::Base::;
653 642
654use strict; 643use strict;
655use CFClient::OpenGL; 644use DC::OpenGL;
656 645
657sub new { 646sub new {
658 my $class = shift; 647 my $class = shift;
659
660 # range [value, low, high, page]
661 648
662 $class->SUPER::new ( 649 $class->SUPER::new (
663 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
664 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
665 @_ 652 @_
… …
677 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
678 665
679 glEnable GL_BLEND; 666 glEnable GL_BLEND;
680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
681 glColor_premultiply @$color; 668 glColor_premultiply @$color;
682
683 glBegin GL_QUADS;
684 glVertex 0 , 0;
685 glVertex 0 , $h;
686 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
687 glVertex $w, 0;
688 glEnd;
689
690 glDisable GL_BLEND; 670 glDisable GL_BLEND;
691 } 671 }
692} 672}
693 673
694############################################################################# 674#############################################################################
695 675
696package CFClient::UI::Empty; 676package DC::UI::Empty;
697 677
698our @ISA = CFClient::UI::Base::; 678our @ISA = DC::UI::Base::;
699 679
700sub new { 680sub new {
701 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
703} 683}
… …
710 690
711sub draw { } 691sub draw { }
712 692
713############################################################################# 693#############################################################################
714 694
715package CFClient::UI::Container; 695package DC::UI::Container;
716 696
717our @ISA = CFClient::UI::Base::; 697our @ISA = DC::UI::Base::;
718 698
719sub new { 699sub new {
720 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
721 701
722 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
… …
726 can_events => 0, 706 can_events => 0,
727 %arg, 707 %arg,
728 ); 708 );
729 709
730 $self->add (@$children) 710 $self->add (@$children)
731 if $children; 711 if $children && @$children;
732 712
733 $self 713 $self
734} 714}
735 715
736sub realloc { 716sub realloc {
… …
745 my ($self, @widgets) = @_; 725 my ($self, @widgets) = @_;
746 726
747 $_->set_parent ($self) 727 $_->set_parent ($self)
748 for @widgets; 728 for @widgets;
749 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
750 use sort 'stable'; 731 use sort 'stable';
751 732
752 $self->{children} = [ 733 $self->{children} = [
753 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
754 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
755 ]; 736 ];
756 737
757 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
758} 743}
759 744
760sub children { 745sub children {
761 @{ $_[0]{children} } 746 @{ $_[0]{children} }
762} 747}
763 748
764sub remove { 749sub remove {
765 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
766 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
767 delete $child->{parent}; 755 delete $child->{parent};
768 $child->hide; 756 $child->hide;
769
770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
771 759
772 $self->realloc; 760 $self->realloc;
773} 761}
774 762
775sub clear { 763sub clear {
776 my ($self) = @_; 764 my ($self) = @_;
777 765
778 my $children = delete $self->{children}; 766 my $children = $self->{children};
779 $self->{children} = []; 767 $self->{children} = [];
780 768
781 for (@$children) { 769 for (@$children) {
782 delete $_->{parent}; 770 delete $_->{parent};
783 $_->hide; 771 $_->hide;
… …
803} 791}
804 792
805sub _draw { 793sub _draw {
806 my ($self) = @_; 794 my ($self) = @_;
807 795
808 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
809} 797}
810 798
811############################################################################# 799#############################################################################
812 800
813package CFClient::UI::Bin; 801package DC::UI::Bin;
814 802
815our @ISA = CFClient::UI::Container::; 803our @ISA = DC::UI::Container::;
816 804
817sub new { 805sub new {
818 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
819 807
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
821 809
822 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
823} 811}
824 812
825sub add { 813sub add {
826 my ($self, $child) = @_; 814 my ($self, $child) = @_;
827 815
828 $self->SUPER::remove ($_) for @{ $self->{children} }; 816 $self->clear;
829 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
830} 818}
831 819
832sub remove { 820sub remove {
833 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
834 822
835 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
836 824
837 $self->{children} = [new CFClient::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
838 unless @{$self->{children}}; 826 unless @{$self->{children}};
839} 827}
840 828
841sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
842 830
… …
851 839
852 1 840 1
853} 841}
854 842
855############################################################################# 843#############################################################################
856
857# back-buffered drawing area 844# back-buffered drawing area
858 845
859package CFClient::UI::Window; 846package DC::UI::Window;
860 847
861our @ISA = CFClient::UI::Bin::; 848our @ISA = DC::UI::Bin::;
862 849
863use CFClient::OpenGL; 850use DC::OpenGL;
864 851
865sub new { 852sub new {
866 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
867 854
868 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
… …
890} 877}
891 878
892sub render_child { 879sub render_child {
893 my ($self) = @_; 880 my ($self) = @_;
894 881
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 882 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
898 885
899 { 886 {
900 package CFClient::UI::Base; 887 package DC::UI::Base;
901 888
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
891
892 $self->_render;
904 } 893 }
905
906 $self->_render;
907 }; 894 };
908} 895}
909 896
910sub _draw { 897sub _draw {
911 my ($self) = @_; 898 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 899
915 my $tex = $self->{texture} 900 my $tex = $self->{texture}
916 or return; 901 or return;
917 902
918 glEnable GL_TEXTURE_2D; 903 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 904 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 905 glColor 0, 0, 0, 1;
921 906
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 907 $tex->draw_quad_alpha_premultiplied (0, 0);
923 908
924 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
925} 910}
926 911
927############################################################################# 912#############################################################################
928 913
929package CFClient::UI::ViewPort; 914package DC::UI::ViewPort;
930 915
916use List::Util qw(min max);
917
931our @ISA = CFClient::UI::Window::; 918our @ISA = DC::UI::Window::;
932 919
933sub new { 920sub new {
934 my $class = shift; 921 my $class = shift;
935 922
936 $class->SUPER::new ( 923 $class->SUPER::new (
… …
943sub size_request { 930sub size_request {
944 my ($self) = @_; 931 my ($self) = @_;
945 932
946 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 933 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947 934
948 $w = 10 if $self->{scroll_x}; 935 $w = 1 if $self->{scroll_x};
949 $h = 10 if $self->{scroll_y}; 936 $h = 1 if $self->{scroll_y};
950 937
951 ($w, $h) 938 ($w, $h)
952} 939}
953 940
954sub invoke_size_allocate { 941sub invoke_size_allocate {
… …
966} 953}
967 954
968sub set_offset { 955sub set_offset {
969 my ($self, $x, $y) = @_; 956 my ($self, $x, $y) = @_;
970 957
958 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
959 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
960
961 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 962 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 963 $self->{view_y} = $y;
973 964
965 $self->emit (changed => $x, $y);
974 $self->update; 966 $self->update;
967 }
968}
969
970sub set_center {
971 my ($self, $x, $y) = @_;
972
973 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
974}
975
976sub make_visible {
977 my ($self, $x, $y, $border) = @_;
978
979 if ( $x < $self->{view_x} + $self->{w} * $border
980 || $x > $self->{view_x} + $self->{w} * (1 - $border)
981 || $y < $self->{view_y} + $self->{h} * $border
982 || $y > $self->{view_y} + $self->{h} * (1 - $border)
983 ) {
984 $self->set_center ($x, $y);
985 }
975} 986}
976 987
977# hmm, this does not work for topleft of $self... but we should not ask for that 988# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 989sub coord2local {
979 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
… …
994 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
995 1006
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1009 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1011 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
1002 } 1013 }
1003} 1014}
1004 1015
1005sub _render { 1016sub _render {
1006 my ($self) = @_; 1017 my ($self) = @_;
1007 1018
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1019 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1009 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1020 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1010 1021
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1023
1013 $self->SUPER::_render; 1024 $self->SUPER::_render;
1014} 1025}
1015 1026
1016############################################################################# 1027#############################################################################
1017 1028
1018package CFClient::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
1019 1030
1020our @ISA = CFClient::UI::HBox::; 1031our @ISA = DC::UI::Table::;
1021 1032
1022sub new { 1033sub new {
1023 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
1024 1035
1025 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
1026 1037
1027 my $self; 1038 my $self;
1028 1039
1029 my $slider = new CFClient::UI::Slider 1040 my $hslider = new DC::UI::Slider
1041 c_col => 0,
1042 c_row => 1,
1043 vertical => 0,
1044 range => [0, 0, 1, 0.01], # HACK fix
1045 on_changed => sub {
1046 $self->{hpos} = $_[1];
1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 },
1049 ;
1050
1051 my $vslider = new DC::UI::Slider
1052 c_col => 1,
1053 c_row => 0,
1030 vertical => 1, 1054 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1056 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1057 $self->{vpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1059 },
1035 ; 1060 ;
1036 1061
1037 $self = $class->SUPER::new ( 1062 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1063 scroll_x => 0,
1064 scroll_y => 1,
1039 can_events => 1, 1065 can_events => 1,
1040 slider => $slider, 1066 hslider => $hslider,
1067 vslider => $vslider,
1068 col_expand => [1, 0],
1069 row_expand => [1, 0],
1041 %arg, 1070 %arg,
1042 ); 1071 );
1043 1072
1073 $self->{vp} = new DC::UI::ViewPort
1074 c_col => 0,
1075 c_row => 0,
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 on_size_allocate => sub {
1088 my ($vp, $w, $h) = @_;
1089 $vp->{parent}->update_slider;
1090 0
1091 },
1092 ;
1093
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1094 $self->SUPER::add ($self->{vp});
1095
1045 $self->add ($child) if $child; 1096 $self->add ($child) if $child;
1046 1097
1047 $self 1098 $self
1048} 1099}
1049
1050#TODO# update range on size_allocate depending on child
1051 1100
1052sub add { 1101sub add {
1053 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1054 1103
1055 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1056} 1105}
1057 1106
1107sub set_offset { shift->{vp}->set_offset (@_) }
1108sub set_center { shift->{vp}->set_center (@_) }
1109sub make_visible { shift->{vp}->make_visible (@_) }
1110
1111sub update_slider {
1112 my ($self) = @_;
1113
1114 my $child = ($self->{vp} or return)->child;
1115
1116 if ($self->{scroll_x}) {
1117 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1118 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1119
1120 my $visible = $w1 > $w2;
1121 if ($visible != $self->{hslider_visible}) {
1122 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->SUPER::remove ($self->{hslider});
1125 }
1126 }
1127
1128 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider})
1136 : $self->SUPER::remove ($self->{vslider});
1137 }
1138 }
1139}
1140
1141sub start_dragging {
1142 my ($self, $ev) = @_;
1143
1144 $self->grab_focus;
1145
1146 my $ox = $self->{vp}{view_x};
1147 my $oy = $self->{vp}{view_y};
1148
1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1156 };
1157}
1158
1058sub invoke_mouse_wheel { 1159sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1160 my ($self, $ev) = @_;
1060 1161
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev); 1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064 1164
1065 1 1165 1
1066} 1166}
1067 1167
1068sub update_slider { 1168sub invoke_button_down {
1069 my ($self) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1070 1170
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1171 if ($ev->{button} == 2) {
1072} 1172 $self->start_dragging ($ev);
1173 return 1;
1174 }
1073 1175
1074sub update { 1176 0
1075 my ($self) = @_; 1177}
1076 1178
1077 $self->SUPER::update; 1179sub invoke_button_up {
1180 my ($self, $ev, $x, $y) = @_;
1078 1181
1079 $self->update_slider; 1182 if (delete $self->{motion}) {
1183 return 1;
1184 }
1185
1186 0
1187}
1188
1189sub invoke_mouse_motion {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($self->{motion}) {
1193 $self->{motion}->($ev, $x, $y);
1194 return 1;
1195 }
1196
1197 0
1080} 1198}
1081 1199
1082sub invoke_size_allocate { 1200sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1084 1202
1085 $self->update_slider; 1203 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1205}
1089 1206
1090############################################################################# 1207#############################################################################
1091 1208
1092package CFClient::UI::Frame; 1209package DC::UI::Frame;
1093 1210
1094our @ISA = CFClient::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1095 1212
1096use CFClient::OpenGL; 1213use DC::OpenGL;
1097 1214
1098sub new { 1215sub new {
1099 my $class = shift; 1216 my $class = shift;
1100 1217
1101 $class->SUPER::new ( 1218 $class->SUPER::new (
… …
1111 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1112 1229
1113 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1115 glColor_premultiply @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1116
1117 glBegin GL_QUADS;
1118 glVertex 0 , 0;
1119 glVertex 0 , $h;
1120 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1121 glVertex $w, 0;
1122 glEnd;
1123
1124 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1125 } 1235 }
1126 1236
1127 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1128} 1238}
1129 1239
1130############################################################################# 1240#############################################################################
1131 1241
1132package CFClient::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1133 1243
1134our @ISA = CFClient::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1135 1245
1136use CFClient::OpenGL; 1246use DC::OpenGL;
1247
1248sub new {
1249 my ($class, %arg) = @_;
1250
1251 if ((exists $arg{label}) && !ref $arg{label}) {
1252 $arg{label} = new DC::UI::Label
1253 align => 1,
1254 valign => 0.5,
1255 text => $arg{label},
1256 fontsize => ($arg{border} || 0.8) * 0.75;
1257 }
1258
1259 my $self = $class->SUPER::new (
1260 # label => "",
1261 fg => [0.6, 0.3, 0.1],
1262 border => 0.8,
1263 style => 'single',
1264 %arg,
1265 );
1266
1267 $self
1268}
1269
1270sub add {
1271 my ($self, @widgets) = @_;
1272
1273 $self->SUPER::add (@widgets);
1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1275}
1276
1277sub border {
1278 int $_[0]{border} * $::FONTSIZE
1279}
1280
1281sub size_request {
1282 my ($self) = @_;
1283
1284 ($self->{label_w}, undef) = $self->{label}->size_request
1285 if $self->{label};
1286
1287 my ($w, $h) = $self->SUPER::size_request;
1288
1289 (
1290 $w + $self->border * 2,
1291 $h + $self->border * 2,
1292 )
1293}
1294
1295sub invoke_size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 my $border = $self->border;
1299
1300 $w -= List::Util::max 0, $border * 2;
1301 $h -= List::Util::max 0, $border * 2;
1302
1303 if (my $label = $self->{label}) {
1304 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1305 $label->{h} = List::Util::min $h, $border;
1306 $label->invoke_size_allocate ($label->{w}, $label->{h});
1307 }
1308
1309 $self->child->configure ($border, $border, $w, $h);
1310
1311 1
1312}
1313
1314sub _draw {
1315 my ($self) = @_;
1316
1317 my $child = $self->{children}[0];
1318
1319 my $border = $self->border;
1320 my ($w, $h) = ($self->{w}, $self->{h});
1321
1322 $child->draw;
1323
1324 glColor @{$self->{fg}};
1325 glBegin GL_LINE_STRIP;
1326 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1327 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1329 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1330 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1331 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1332 glEnd;
1333
1334 if ($self->{label}) {
1335 glTranslate $border * 2, 0;
1336 $self->{label}->_draw;
1337 }
1338}
1339
1340#############################################################################
1341
1342package DC::UI::Toplevel;
1343
1344our @ISA = DC::UI::Bin::;
1345
1346use DC::OpenGL;
1137 1347
1138my $bg = 1348my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1349 new_from_resource DC::Texture "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1350 mipmap => 1, wrap => 1;
1141 1351
1142my @border = 1352my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1353 map { new_from_resource DC::Texture $_, mipmap => 1 }
1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1354 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1355
1356my @icon =
1357 map { new_from_resource DC::Texture $_, mipmap => 1 }
1358 qw(x1_move.png x1_resize.png);
1145 1359
1146sub new { 1360sub new {
1147 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1148 1362
1149 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
1150 bg => [1, 1, 1, 1], 1364 bg => [1, 1, 1, 1],
1151 border_bg => [1, 1, 1, 1], 1365 border_bg => [1, 1, 1, 1],
1152 border => 0.6, 1366 border => 1,
1153 can_events => 1, 1367 can_events => 1,
1154 min_w => 64, 1368 min_w => 64,
1155 min_h => 32, 1369 min_h => 32,
1156 %arg, 1370 %arg,
1157 ); 1371 );
1158 1372
1159 $self->{title_widget} = new CFClient::UI::Label 1373 $self->{title_widget} = new DC::UI::Label
1160 align => 0, 1374 align => 0.5,
1161 valign => 1, 1375 valign => 1,
1162 text => $self->{title}, 1376 text => $self->{title},
1163 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1164 if exists $self->{title}; 1378 if exists $self->{title};
1165 1379
1166 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1381 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1382 new DC::UI::ImageButton
1169 path => 'x1_close.png', 1383 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1171 1385
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1386 $self->DC::UI::Container::add ($self->{close_button});
1173 } 1387 }
1174 1388
1175 $self 1389 $self
1176} 1390}
1177 1391
1178sub add { 1392sub add {
1179 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1180 1394
1181 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1396 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1397 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1398}
1185 1399
1186sub border { 1400sub border {
1187 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
1402}
1403
1404sub get_max_wh {
1405 my ($self) = @_;
1406
1407 return ($self->{w}, $self->{h})
1408 if $self->{visible} && $self->{w};
1409
1410 $self->SUPER::get_max_wh
1188} 1411}
1189 1412
1190sub size_request { 1413sub size_request {
1191 my ($self) = @_; 1414 my ($self) = @_;
1192 1415
… …
1296 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1519 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297 1520
1298 ! ! $self->{motion} 1521 ! ! $self->{motion}
1299} 1522}
1300 1523
1524sub invoke_visibility_change {
1525 my ($self, $visible) = @_;
1526
1527 delete $self->{motion} unless $visible;
1528
1529 0
1530}
1531
1301sub _draw { 1532sub _draw {
1302 my ($self) = @_; 1533 my ($self) = @_;
1303 1534
1304 my $child = $self->{children}[0]; 1535 my $child = $self->{children}[0];
1305 1536
… …
1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311 1542
1312 my $border = $self->border; 1543 my $border = $self->border;
1313 1544
1314 glColor @{ $self->{border_bg} }; 1545 glColor @{ $self->{border_bg} };
1315 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1549 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1550
1551 # move
1552 my $w2 = ($w - $border) * .5;
1553 my $h2 = ($h - $border) * .5;
1554 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1557
1558 # resize
1559 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1561 unless $self->{has_close_button};
1562 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1319 1564
1320 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321 glColor @{ $self->{bg} }; 1566 glColor @{ $self->{bg} };
1322 1567
1323 # TODO: repeat texture not scale 1568 # TODO: repeat texture not scale
… …
1342 if $self->{close_button}; 1587 if $self->{close_button};
1343} 1588}
1344 1589
1345############################################################################# 1590#############################################################################
1346 1591
1347package CFClient::UI::Table; 1592package DC::UI::Table;
1348 1593
1349our @ISA = CFClient::UI::Base::; 1594our @ISA = DC::UI::Container::;
1350 1595
1351use List::Util qw(max sum); 1596use List::Util qw(max sum);
1352 1597
1353use CFClient::OpenGL; 1598use DC::OpenGL;
1354 1599
1355sub new { 1600sub new {
1356 my $class = shift; 1601 my $class = shift;
1357 1602
1358 $class->SUPER::new ( 1603 $class->SUPER::new (
1359 col_expand => [], 1604 col_expand => [],
1605 row_expand => [],
1360 @_, 1606 @_,
1361 ) 1607 )
1362} 1608}
1363 1609
1364sub children {
1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366}
1367
1368sub add { 1610sub add {
1611 my ($self, @widgets) = @_;
1612
1613 for my $child (@widgets) {
1614 $child->{c_rowspan} ||= 1;
1615 $child->{c_colspan} ||= 1;
1616 }
1617
1618 $self->SUPER::add (@widgets);
1619}
1620
1621sub add_at {
1369 my ($self) = shift; 1622 my $self = shift;
1623
1624 my @widgets;
1370 1625
1371 while (@_) { 1626 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, (); 1627 my ($col, $row, $child) = splice @_, 0, 3, ();
1373 $child->set_parent ($self);
1374 $self->{children}[$y][$x] = $child;
1375 }
1376 1628
1377 $self->{force_realloc} = 1; 1629 $child->{c_row} = $row;
1378 $self->{force_size_alloc} = 1; 1630 $child->{c_col} = $col;
1379 $self->realloc;
1380}
1381 1631
1382sub remove { 1632 push @widgets, $child;
1633 }
1634
1635 $self->add (@widgets);
1636}
1637
1638sub get_wh {
1383 my ($self, $child) = @_; 1639 my ($self) = @_;
1384 1640
1385 # TODO: not yet implemented 1641 my (@w, @h);
1386}
1387
1388# TODO: move to container class maybe? send children a signal on removal?
1389sub clear {
1390 my ($self) = @_;
1391 1642
1392 my @children = $self->children; 1643 my @children = $self->children;
1393 delete $self->{children}; 1644
1645 # first pass, columns
1646 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1647 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1648
1649 my $sw = sum @w[$c .. $c + $cs - 1];
1650
1651 if ($w > $sw) {
1652 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1653 }
1394 1654 }
1395 for (@children) {
1396 delete $_->{parent};
1397 $_->hide;
1398 }
1399 1655
1400 $self->realloc; 1656 # second pass, rows
1401} 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1402
1403sub get_wh {
1404 my ($self) = @_;
1405
1406 my (@w, @h);
1407
1408 for my $y (0 .. $#{$self->{children}}) {
1409 my $row = $self->{children}[$y]
1410 or next;
1411
1412 for my $x (0 .. $#$row) {
1413 my $widget = $row->[$x]
1414 or next;
1415 my ($w, $h) = @$widget{qw(req_w req_h)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1416 1659
1417 $w[$x] = max $w[$x], $w; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1418 $h[$y] = max $h[$y], $h; 1661
1662 if ($h > $sh) {
1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1419 } 1664 }
1420 } 1665 }
1421 1666
1422 (\@w, \@h) 1667 (\@w, \@h)
1423} 1668}
… …
1439 my ($ws, $hs) = $self->get_wh; 1684 my ($ws, $hs) = $self->get_wh;
1440 1685
1441 my $req_w = (sum @$ws) || 1; 1686 my $req_w = (sum @$ws) || 1;
1442 my $req_h = (sum @$hs) || 1; 1687 my $req_h = (sum @$hs) || 1;
1443 1688
1444 # TODO: nicer code && do row_expand 1689 # now linearly scale the rows/columns to the allocated size
1445 my @col_expand = @{$self->{col_expand}}; 1690 my @col_expand = @{$self->{col_expand}};
1446 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1447 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1448 1693
1449 # linearly scale sizes
1450 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452 1695
1453 CFClient::UI::harmonize $ws; 1696 DC::UI::harmonize $ws;
1697
1698 my @row_expand = @{$self->{row_expand}};
1699 @row_expand = (1) x @$ws unless @row_expand;
1700 my $row_expand = (sum @row_expand) || 1;
1701
1702 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1703
1454 CFClient::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1455 1705
1456 my $y; 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1457 1708
1458 for my $r (0 .. $#{$self->{children}}) { 1709 for my $widget ($self->children) {
1459 my $row = $self->{children}[$r] 1710 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1460 or next;
1461 1711
1462 my $x = 0; 1712 $widget->configure (
1463 my $row_h = $hs->[$r]; 1713 $x[$c], $y[$r],
1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1464 1715 );
1465 for my $c (0 .. $#$row) { 1716 }
1466 my $col_w = $ws->[$c];
1467 1717
1468 if (my $widget = $row->[$c]) { 1718 1
1469 $widget->configure ($x, $y, $col_w, $row_h); 1719}
1470 }
1471 1720
1472 $x += $col_w; 1721#############################################################################
1722
1723package DC::UI::Fixed;
1724
1725use List::Util qw(min max);
1726
1727our @ISA = DC::UI::Container::;
1728
1729sub _scale($$$) {
1730 my ($rel, $val, $max) = @_;
1731
1732 $rel ? $val * $max : $val
1733}
1734
1735sub size_request {
1736 my ($self) = @_;
1737
1738 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1739
1740 # determine overall size by querying abs widgets
1741 for my $child ($self->visible_children) {
1742 unless ($child->{c_rel}) {
1743 my $x = $child->{c_x};
1744 my $y = $child->{c_y};
1745
1746 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1747 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1473 } 1748 }
1749 }
1474 1750
1475 $y += $row_h; 1751 my $W = $x2 - $x1;
1752 my $H = $y2 - $y1;
1753
1754 # now layout remaining widgets
1755 for my $child ($self->visible_children) {
1756 if ($child->{c_rel}) {
1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1762 }
1763 }
1764
1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
1768 ($W, $H)
1769}
1770
1771sub invoke_size_allocate {
1772 my ($self, $W, $H) = @_;
1773
1774 for my $child ($self->visible_children) {
1775 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1776 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1777
1778 $x += $child->{c_halign} * $child->{req_w};
1779 $y += $child->{c_valign} * $child->{req_h};
1780
1781 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1476 } 1782 }
1477 1783
1478 1 1784 1
1479} 1785}
1480 1786
1481sub find_widget {
1482 my ($self, $x, $y) = @_;
1483
1484 $x -= $self->{x};
1485 $y -= $self->{y};
1486
1487 my $res;
1488
1489 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1490 $res = $_->find_widget ($x, $y)
1491 and return $res;
1492 }
1493
1494 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1495}
1496
1497sub _draw {
1498 my ($self) = @_;
1499
1500 for (grep $_, @{$self->{children}}) {
1501 $_->draw for grep $_, @$_;
1502 }
1503}
1504
1505############################################################################# 1787#############################################################################
1506 1788
1507package CFClient::UI::Box; 1789package DC::UI::Box;
1508 1790
1509our @ISA = CFClient::UI::Container::; 1791our @ISA = DC::UI::Container::;
1510 1792
1511sub size_request { 1793sub size_request {
1512 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1513 1797
1514 $self->{vertical} 1798 $self->{vertical}
1515 ? ( 1799 ? (
1516 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1517 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1518 ) 1802 )
1519 : ( 1803 : (
1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1521 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1522 ) 1806 )
1523} 1807}
1524 1808
1525sub invoke_size_allocate { 1809sub invoke_size_allocate {
1526 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
… …
1547 $req[$_] += $space * $children[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1548 for 0 .. $#children; 1832 for 0 .. $#children;
1549 } 1833 }
1550 } 1834 }
1551 1835
1552 CFClient::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1553 1837
1554 my $pos = 0; 1838 my $pos = 0;
1555 for (0 .. $#children) { 1839 for (0 .. $#children) {
1556 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1841 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1562 1 1846 1
1563} 1847}
1564 1848
1565############################################################################# 1849#############################################################################
1566 1850
1567package CFClient::UI::HBox; 1851package DC::UI::HBox;
1568 1852
1569our @ISA = CFClient::UI::Box::; 1853our @ISA = DC::UI::Box::;
1570 1854
1571sub new { 1855sub new {
1572 my $class = shift; 1856 my $class = shift;
1573 1857
1574 $class->SUPER::new ( 1858 $class->SUPER::new (
… …
1577 ) 1861 )
1578} 1862}
1579 1863
1580############################################################################# 1864#############################################################################
1581 1865
1582package CFClient::UI::VBox; 1866package DC::UI::VBox;
1583 1867
1584our @ISA = CFClient::UI::Box::; 1868our @ISA = DC::UI::Box::;
1585 1869
1586sub new { 1870sub new {
1587 my $class = shift; 1871 my $class = shift;
1588 1872
1589 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1592 ) 1876 )
1593} 1877}
1594 1878
1595############################################################################# 1879#############################################################################
1596 1880
1597package CFClient::UI::Label; 1881package DC::UI::Label;
1598 1882
1599our @ISA = CFClient::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1600 1884
1601use CFClient::OpenGL; 1885use DC::OpenGL;
1602 1886
1603sub new { 1887sub new {
1604 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1605 1889
1606 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
… …
1609 #active_bg => none 1893 #active_bg => none
1610 #font => default_font 1894 #font => default_font
1611 #text => initial text 1895 #text => initial text
1612 #markup => initial narkup 1896 #markup => initial narkup
1613 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1898 #style => 0, # render flags
1614 ellipsise => 3, # end 1899 ellipsise => 3, # end
1615 layout => (new CFClient::Layout), 1900 layout => (new DC::Layout),
1616 fontsize => 1, 1901 fontsize => 1,
1617 align => -1, 1902 align => 0.5,
1618 valign => -1, 1903 valign => 0.5,
1619 padding_x => 2, 1904 padding_x => 4,
1620 padding_y => 2, 1905 padding_y => 2,
1621 can_events => 0, 1906 can_events => 0,
1622 %arg 1907 %arg
1623 ); 1908 );
1624 1909
1625 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1626 my $layout = new CFClient::Layout; 1911 my $layout = new DC::Layout;
1627 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1628 $self->{template} = $layout; 1913 $self->{template} = $layout;
1629 } 1914 }
1630 1915
1631 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
… …
1635 } 1920 }
1636 1921
1637 $self 1922 $self
1638} 1923}
1639 1924
1640sub escape($) {
1641 local $_ = $_[0];
1642
1643 s/&/&amp;/g;
1644 s/>/&gt;/g;
1645 s/</&lt;/g;
1646
1647 $_
1648}
1649
1650sub update { 1925sub update {
1651 my ($self) = @_; 1926 my ($self) = @_;
1652 1927
1653 delete $self->{texture}; 1928 delete $self->{texture};
1654 $self->SUPER::update; 1929 $self->SUPER::update;
… …
1657sub realloc { 1932sub realloc {
1658 my ($self) = @_; 1933 my ($self) = @_;
1659 1934
1660 delete $self->{ox}; 1935 delete $self->{ox};
1661 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1937}
1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1662} 1943}
1663 1944
1664sub set_text { 1945sub set_text {
1665 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1666 1947
… …
1691 1972
1692sub size_request { 1973sub size_request {
1693 my ($self) = @_; 1974 my ($self) = @_;
1694 1975
1695 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1696 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1697 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1698 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1699 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1700 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1701 1984
1702 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1703 1986
1704 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1705 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
1706 $self->{template}->set_width ($self->{max_w} || -1); 1989 $self->{template}->set_width ($max_w);
1707 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1708 1991
1709 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1710 1993
1711 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
… …
1767 2050
1768 [$self->{layout}->size] 2051 [$self->{layout}->size]
1769 }; 2052 };
1770 2053
1771 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
1772 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2055 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1773 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2056 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1774 : ($self->{w} - $size->[0]) * 0.5);
1775 2057
1776 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1777 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1778 : ($self->{h} - $size->[1]) * 0.5);
1779 }; 2059 };
1780 2060
1781 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2061# unless ($self->{list}) {
1782 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2062# $self->{list} = DC::OpenGL::glGenList;
1783 2063# DC::OpenGL::glNewList $self->{list};
1784 $self->{layout}->render ($self->{ox}, $self->{oy}); 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2065# DC::OpenGL::glEndList;
2066# }
2067#
2068# DC::OpenGL::glCallList $self->{list};
2069
2070 $self->{layout}->draw;
1785} 2071}
2072
2073#sub destroy {
2074# my ($self) = @_;
2075#
2076# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2077#
2078# $self->SUPER::destroy;
2079#}
1786 2080
1787############################################################################# 2081#############################################################################
1788 2082
1789package CFClient::UI::EntryBase; 2083package DC::UI::EntryBase;
1790 2084
1791our @ISA = CFClient::UI::Label::; 2085our @ISA = DC::UI::Label::;
1792 2086
1793use CFClient::OpenGL; 2087use DC::OpenGL;
1794 2088
1795sub new { 2089sub new {
1796 my $class = shift; 2090 my $class = shift;
1797 2091
1798 $class->SUPER::new ( 2092 $class->SUPER::new (
1799 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
1800 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
1801 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
1802 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
1803 can_hover => 1, 2099 can_hover => 1,
1804 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
1805 valign => 0, 2102 valign => 0.5,
1806 can_events => 1, 2103 can_events => 1,
2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
1807 #text => ... 2107 #text => ...
1808 #hidden => "*", 2108 #hidden => "*",
1809 @_ 2109 @_
1810 ) 2110 )
1811} 2111}
… …
1856 my $sym = $ev->{sym}; 2156 my $sym = $ev->{sym};
1857 my $uni = $ev->{unicode}; 2157 my $uni = $ev->{unicode};
1858 2158
1859 my $text = $self->get_text; 2159 my $text = $self->get_text;
1860 2160
1861 if ($uni == 8) { 2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2162
2163 if ($sym == DC::SDLK_BACKSPACE) {
1862 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863 } elsif ($uni == 127) { 2165 } elsif ($sym == DC::SDLK_DELETE) {
1864 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
1865 } elsif ($sym == CFClient::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
1866 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
1867 } elsif ($sym == CFClient::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
1868 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1869 } elsif ($sym == CFClient::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
2172 # what a hack
2173 $self->{cursor} =
2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2175 ? length $1
2176 : 0;
2177 } elsif ($sym == DC::SDLK_END) {
2178 # uh, again
2179 $self->{cursor} =
2180 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2181 ? $self->{cursor} + length $1
2182 : length $self->{text};
2183 } elsif ($uni == 21) { # ctrl-u
2184 $text = "";
1870 $self->{cursor} = 0; 2185 $self->{cursor} = 0;
1871 } elsif ($sym == CFClient::SDLK_END) {
1872 $self->{cursor} = length $text;
1873 } elsif ($uni == 27) { 2186 } elsif ($uni == 27) {
1874 $self->emit ('escape'); 2187 $self->emit ('escape');
1875 } elsif ($uni) { 2188 } elsif ($uni == 0x0d) {
2189 substr $text, $self->{cursor}++, 0, "\012";
2190 } elsif ($uni >= 0x20) {
1876 substr $text, $self->{cursor}++, 0, chr $uni; 2191 substr $text, $self->{cursor}++, 0, chr $uni;
1877 } else { 2192 } else {
1878 return 0; 2193 return 0;
1879 } 2194 }
1880 2195
1881 $self->_set_text ($text); 2196 $self->_set_text ($text);
1882 2197
1883 $self->realloc; 2198 $self->realloc;
2199 $self->update;
1884 2200
1885 1 2201 1
1886} 2202}
1887 2203
1888sub invoke_focus_in { 2204sub invoke_focus_in {
… …
1930 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
1931 } 2247 }
1932 2248
1933 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
1934 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1935 glBegin GL_QUADS;
1936 glVertex 0 , 0;
1937 glVertex 0 , $self->{h};
1938 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
1939 glVertex $self->{w}, 0;
1940 glEnd;
1941 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
1942 2253
1943 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
1944 2255
1945 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
… …
1947 2258
1948 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
1949 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
1950 utf8::encode $text; 2261 utf8::encode $text;
1951 2262
1952 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2263 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1953 } 2264 }
1954 2265
1955 glColor @{$self->{fg}}; 2266 glColor_premultiply @{$self->{active_fg}};
1956 glBegin GL_LINES; 2267 glBegin GL_LINES;
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1958 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2269 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1959 glEnd; 2270 glEnd;
1960 }
1961}
1962 2271
2272 glLineWidth 3;
2273 glColor @{$self->{active_outline}};
2274 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2275 glLineWidth 1;
2276
2277 } else {
2278 glColor @{$self->{outline}};
2279 glBegin GL_LINE_STRIP;
2280 glVertex .5, $self->{h} * .5;
2281 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - .5, $self->{h} * .5;
2284 glEnd;
2285 }
2286}
2287
2288#############################################################################
2289
1963package CFClient::UI::Entry; 2290package DC::UI::Entry;
1964 2291
1965our @ISA = CFClient::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
1966 2293
1967use CFClient::OpenGL; 2294use DC::OpenGL;
2295
2296sub new {
2297 my $class = shift;
2298
2299 $class->SUPER::new (
2300 history_pointer => -1,
2301 @_
2302 )
2303}
2304
1968 2305
1969sub invoke_key_down { 2306sub invoke_key_down {
1970 my ($self, $ev) = @_; 2307 my ($self, $ev) = @_;
1971 2308
1972 my $sym = $ev->{sym}; 2309 my $sym = $ev->{sym};
1973 2310
1974 if ($sym == 13) { 2311 if ($ev->{uni} == 0x0d || $sym == 13) {
1975 unshift @{$self->{history}}, 2312 unshift @{$self->{history}},
1976 my $txt = $self->get_text; 2313 my $txt = $self->get_text;
1977 2314
1978 $self->{history_pointer} = -1; 2315 $self->{history_pointer} = -1;
1979 $self->{history_saveback} = ''; 2316 $self->{history_saveback} = '';
1980 $self->emit (activate => $txt); 2317 $self->emit (activate => $txt);
1981 $self->update; 2318 $self->update;
1982 2319
1983 } elsif ($sym == CFClient::SDLK_UP) { 2320 } elsif ($sym == DC::SDLK_UP) {
1984 if ($self->{history_pointer} < 0) { 2321 if ($self->{history_pointer} < 0) {
1985 $self->{history_saveback} = $self->get_text; 2322 $self->{history_saveback} = $self->get_text;
1986 } 2323 }
1987 if (@{$self->{history} || []} > 0) { 2324 if (@{$self->{history} || []} > 0) {
1988 $self->{history_pointer}++; 2325 $self->{history_pointer}++;
… …
1990 $self->{history_pointer} = @{$self->{history} || []} - 1; 2327 $self->{history_pointer} = @{$self->{history} || []} - 1;
1991 } 2328 }
1992 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2329 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1993 } 2330 }
1994 2331
1995 } elsif ($sym == CFClient::SDLK_DOWN) { 2332 } elsif ($sym == DC::SDLK_DOWN) {
1996 $self->{history_pointer}--; 2333 $self->{history_pointer}--;
1997 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2334 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1998 2335
1999 if ($self->{history_pointer} >= 0) { 2336 if ($self->{history_pointer} >= 0) {
2000 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2337 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2001 } else { 2338 } else {
2339 if (defined $self->{history_saveback}) {
2002 $self->set_text ($self->{history_saveback}); 2340 $self->set_text ($self->{history_saveback});
2341 $self->{history_saveback} = undef;
2342 }
2003 } 2343 }
2004 2344
2005 } else { 2345 } else {
2006 return $self->SUPER::invoke_key_down ($ev) 2346 return $self->SUPER::invoke_key_down ($ev)
2007 } 2347 }
… …
2009 1 2349 1
2010} 2350}
2011 2351
2012############################################################################# 2352#############################################################################
2013 2353
2014package CFClient::UI::Button; 2354package DC::UI::TextEdit;
2015 2355
2016our @ISA = CFClient::UI::Label::; 2356our @ISA = DC::UI::EntryBase::;
2017 2357
2018use CFClient::OpenGL; 2358use DC::OpenGL;
2019
2020my @tex =
2021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2022 qw(b1_button_active.png);
2023 2359
2024sub new { 2360sub new {
2025 my $class = shift; 2361 my $class = shift;
2026 2362
2027 $class->SUPER::new ( 2363 $class->SUPER::new (
2028 padding_x => 4,
2029 padding_y => 4, 2364 padding_y => 4,
2030 fg => [1, 1, 1], 2365
2031 active_fg => [0, 0, 1], 2366 @_
2367 )
2368}
2369
2370sub move_cursor_ver {
2371 my ($self, $dy) = @_;
2372
2373 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2374
2375 $line += $dy;
2376
2377 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2378 $self->{cursor} = $index;
2379 delete $self->{cur_h};
2380 $self->update;
2381 return;
2382 }
2383}
2384
2385sub invoke_key_down {
2386 my ($self, $ev) = @_;
2387
2388 my $sym = $ev->{sym};
2389
2390 if ($sym == DC::SDLK_UP) {
2391 $self->move_cursor_ver (-1);
2392 } elsif ($sym == DC::SDLK_DOWN) {
2393 $self->move_cursor_ver (+1);
2394 } else {
2395 return $self->SUPER::invoke_key_down ($ev)
2396 }
2397
2398 1
2399}
2400
2401#############################################################################
2402
2403package DC::UI::ButtonBin;
2404
2405our @ISA = DC::UI::Bin::;
2406
2407use DC::OpenGL;
2408
2409my @tex =
2410 map { new_from_resource DC::Texture $_, mipmap => 1 }
2411 qw(b1_button_inactive.png b1_button_active.png);
2412
2413sub new {
2414 my $class = shift;
2415
2416 $class->SUPER::new (
2032 can_hover => 1, 2417 can_hover => 1,
2033 align => 0, 2418 align => 0.5,
2034 valign => 0, 2419 valign => 0.5,
2035 can_events => 1, 2420 can_events => 1,
2036 @_ 2421 @_
2037 ) 2422 )
2038} 2423}
2039 2424
… …
2048} 2433}
2049 2434
2050sub _draw { 2435sub _draw {
2051 my ($self) = @_; 2436 my ($self) = @_;
2052 2437
2053 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2054
2055 glEnable GL_TEXTURE_2D; 2438 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 glColor 0, 0, 0, 1; 2440 glColor 0, 0, 0, 1;
2058 2441
2442 my $tex = $tex[$GRAB == $self];
2059 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2443 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2060 2444
2061 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
2062 2446
2063 $self->SUPER::_draw; 2447 $self->SUPER::_draw;
2064} 2448}
2065 2449
2066############################################################################# 2450#############################################################################
2067 2451
2068package CFClient::UI::ImageButton; 2452package DC::UI::Button;
2069 2453
2070our @ISA = CFClient::UI::Image::; 2454our @ISA = DC::UI::Label::;
2071 2455
2072use CFClient::OpenGL; 2456use DC::OpenGL;
2073 2457
2074my %textures; 2458my @tex =
2459 map { new_from_resource DC::Texture $_, mipmap => 1 }
2460 qw(b1_button_inactive.png b1_button_active.png);
2075 2461
2076sub new { 2462sub new {
2077 my $class = shift; 2463 my $class = shift;
2078 2464
2079 my $self = $class->SUPER::new ( 2465 $class->SUPER::new (
2080 padding_x => 4, 2466 padding_x => 8,
2081 padding_y => 4, 2467 padding_y => 4,
2082 fg => [1, 1, 1], 2468 fg => [1.0, 1.0, 1.0],
2083 active_fg => [0, 0, 1], 2469 active_fg => [0.8, 0.8, 0.8],
2084 can_hover => 1, 2470 can_hover => 1,
2085 align => 0, 2471 align => 0.5,
2086 valign => 0, 2472 valign => 0.5,
2087 can_events => 1, 2473 can_events => 1,
2088 @_ 2474 @_
2089 ); 2475 )
2090} 2476}
2091 2477
2092sub invoke_button_up { 2478sub invoke_button_up {
2093 my ($self, $ev, $x, $y) = @_; 2479 my ($self, $ev, $x, $y) = @_;
2094 2480
… …
2097 && $y >= 0 && $y < $self->{h}; 2483 && $y >= 0 && $y < $self->{h};
2098 2484
2099 1 2485 1
2100} 2486}
2101 2487
2488sub _draw {
2489 my ($self) = @_;
2490
2491 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2492
2493 glEnable GL_TEXTURE_2D;
2494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2495 glColor 0, 0, 0, 1;
2496
2497 my $tex = $tex[$GRAB == $self];
2498 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499
2500 glDisable GL_TEXTURE_2D;
2501
2502 $self->SUPER::_draw;
2503}
2504
2102############################################################################# 2505#############################################################################
2103 2506
2104package CFClient::UI::CheckBox; 2507package DC::UI::CheckBox;
2105 2508
2106our @ISA = CFClient::UI::DrawBG::; 2509our @ISA = DC::UI::DrawBG::;
2107 2510
2108my @tex = 2511my @tex =
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2512 map { new_from_resource DC::Texture $_, mipmap => 1 }
2110 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2513 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2111 2514
2112use CFClient::OpenGL; 2515use DC::OpenGL;
2113 2516
2114sub new { 2517sub new {
2115 my $class = shift; 2518 my $class = shift;
2116 2519
2117 $class->SUPER::new ( 2520 $class->SUPER::new (
… …
2157sub _draw { 2560sub _draw {
2158 my ($self) = @_; 2561 my ($self) = @_;
2159 2562
2160 $self->SUPER::_draw; 2563 $self->SUPER::_draw;
2161 2564
2162 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2565 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2163 2566
2164 my ($w, $h) = @$self{qw(w h)}; 2567 my ($w, $h) = @$self{qw(w h)};
2165 2568
2166 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2569 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2167 2570
… …
2174 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
2175} 2578}
2176 2579
2177############################################################################# 2580#############################################################################
2178 2581
2179package CFClient::UI::Image; 2582package DC::UI::Image;
2180 2583
2181our @ISA = CFClient::UI::Base::; 2584our @ISA = DC::UI::Base::;
2182 2585
2183use CFClient::OpenGL; 2586use DC::OpenGL;
2184 2587
2185our %texture_cache; 2588our %texture_cache;
2186 2589
2187sub new { 2590sub new {
2188 my $class = shift; 2591 my $class = shift;
2189 2592
2190 my $self = $class->SUPER::new ( 2593 my $self = $class->SUPER::new (
2191 can_events => 0, 2594 can_events => 0,
2595 scale => 1,
2192 @_, 2596 @_,
2193 ); 2597 );
2194 2598
2195 $self->{path} || $self->{tex} 2599 $self->{path} || $self->{tex}
2196 or Carp::croak "'path' or 'tex' attributes required"; 2600 or Carp::croak "'path' or 'tex' attributes required";
2197 2601
2198 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2602 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2199 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2603 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2200 2604
2201 Scalar::Util::weaken $texture_cache{$self->{path}}; 2605 DC::weaken $texture_cache{$self->{path}};
2202 2606
2203 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2204 2608
2205 $self 2609 $self
2206} 2610}
2207 2611
2612sub STORABLE_freeze {
2613 my ($self, $cloning) = @_;
2614
2615 $self->{path}
2616 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2617
2618 $self->{path}
2619}
2620
2621sub STORABLE_attach {
2622 my ($self, $cloning, $path) = @_;
2623
2624 $self->new (path => $path)
2625}
2626
2208sub size_request { 2627sub size_request {
2209 my ($self) = @_; 2628 my ($self) = @_;
2210 2629
2211 ($self->{tex}{w}, $self->{tex}{h}) 2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2212} 2631}
2213 2632
2214sub _draw { 2633sub _draw {
2215 my ($self) = @_; 2634 my ($self) = @_;
2216 2635
… …
2233 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2234} 2653}
2235 2654
2236############################################################################# 2655#############################################################################
2237 2656
2657package DC::UI::ImageButton;
2658
2659our @ISA = DC::UI::Image::;
2660
2661use DC::OpenGL;
2662
2663my %textures;
2664
2665sub new {
2666 my $class = shift;
2667
2668 my $self = $class->SUPER::new (
2669 padding_x => 4,
2670 padding_y => 4,
2671 fg => [1, 1, 1],
2672 active_fg => [0, 0, 1],
2673 can_hover => 1,
2674 align => 0.5,
2675 valign => 0.5,
2676 can_events => 1,
2677 @_
2678 );
2679}
2680
2681sub invoke_button_down {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 1
2685}
2686
2687sub invoke_button_up {
2688 my ($self, $ev, $x, $y) = @_;
2689
2690 $self->emit ("activate")
2691 if $x >= 0 && $x < $self->{w}
2692 && $y >= 0 && $y < $self->{h};
2693
2694 1
2695}
2696
2697#############################################################################
2698
2238package CFClient::UI::VGauge; 2699package DC::UI::VGauge;
2239 2700
2240our @ISA = CFClient::UI::Base::; 2701our @ISA = DC::UI::Base::;
2241 2702
2242use List::Util qw(min max); 2703use List::Util qw(min max);
2243 2704
2244use CFClient::OpenGL; 2705use DC::OpenGL;
2245 2706
2246my %tex = ( 2707my %tex = (
2247 food => [ 2708 food => [
2248 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2709 map { new_from_resource DC::Texture $_, mipmap => 1 }
2249 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2250 ], 2711 ],
2251 grace => [ 2712 grace => [
2252 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2713 map { new_from_resource DC::Texture $_, mipmap => 1 }
2253 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2714 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2254 ], 2715 ],
2255 hp => [ 2716 hp => [
2256 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2257 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2258 ], 2719 ],
2259 mana => [ 2720 mana => [
2260 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2261 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2722 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2262 ], 2723 ],
2263); 2724);
2264 2725
2265# eg. VGauge->new (gauge => 'food'), default gauge: food 2726# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2368 glDisable GL_TEXTURE_2D; 2829 glDisable GL_TEXTURE_2D;
2369} 2830}
2370 2831
2371############################################################################# 2832#############################################################################
2372 2833
2834package DC::UI::Progress;
2835
2836our @ISA = DC::UI::Label::;
2837
2838use DC::OpenGL;
2839
2840sub new {
2841 my ($class, %arg) = @_;
2842
2843 my $self = $class->SUPER::new (
2844 fg => [1, 1, 1],
2845 bg => [0, 0, 1, 0.2],
2846 bar => [0.7, 0.5, 0.1, 0.8],
2847 outline => [0.4, 0.3, 0],
2848 fontsize => 0.9,
2849 valign => 0.5,
2850 align => 0.5,
2851 can_events => 1,
2852 ellipsise => 1,
2853 label => "%d%%",
2854 %arg,
2855 );
2856
2857 $self->set_value ($arg{value} || -1);
2858
2859 $self
2860}
2861
2862sub set_label {
2863 my ($self, $label) = @_;
2864
2865 return if $self->{label} eq $label;
2866 $self->{label} = $label;
2867
2868 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2869}
2870
2871sub set_value {
2872 my ($self, $value) = @_;
2873
2874 if ($self->{value} ne $value) {
2875 $self->{value} = $value;
2876
2877 if ($value < 0) {
2878 $self->set_text ("-");
2879 } else {
2880 $self->set_text (sprintf $self->{label}, $value * 100);
2881 }
2882
2883 $self->update;
2884 }
2885}
2886
2887sub _draw {
2888 my ($self) = @_;
2889
2890 glEnable GL_BLEND;
2891 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2892
2893 if ($self->{value} >= 0) {
2894 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2895
2896 glColor_premultiply @{$self->{bar}};
2897 glRect 2, 2, $s, $self->{h} - 2;
2898 glColor_premultiply @{$self->{bg}};
2899 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2900 }
2901
2902 glColor_premultiply @{$self->{outline}};
2903 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2904
2905 glDisable GL_BLEND;
2906
2907 {
2908 local $self->{bg}; # do not draw background
2909 $self->SUPER::_draw;
2910 }
2911}
2912
2913#############################################################################
2914
2915package DC::UI::ExperienceProgress;
2916
2917our @ISA = DC::UI::Progress::;
2918
2919sub new {
2920 my ($class, %arg) = @_;
2921
2922 my $self = $class->SUPER::new (
2923 tooltip => sub {
2924 my ($self) = @_;
2925
2926 sprintf "level %d\n%s points\n%s next level\n%s to go",
2927 $self->{lvl},
2928 ::formsep ($self->{exp}),
2929 ::formsep ($self->{nxt}),
2930 ::formsep ($self->{nxt} - $self->{exp}),
2931 },
2932 %arg
2933 );
2934
2935 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2936 if $::CONN;
2937
2938 $self
2939}
2940
2941sub DESTROY {
2942 my ($self) = @_;
2943
2944 delete $::CONN->{on_exp_update}{$self+0}
2945 if $::CONN;
2946
2947 $self->SUPER::DESTROY;
2948}
2949
2950sub set_value {
2951 my ($self, $lvl, $exp) = @_;
2952
2953 $self->{lvl} = $lvl;
2954 $self->{exp} = $exp;
2955
2956 my $v = -1;
2957
2958 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2959 my $l0 = $table->[$lvl - 1];
2960 my $l1 = $table->[$lvl];
2961
2962 $self->{nxt} = $l1;
2963
2964 $v = ($exp - $l0) / ($l1 - $l0);
2965 }
2966
2967 $self->SUPER::set_value ($v);
2968}
2969
2970#############################################################################
2971
2373package CFClient::UI::Gauge; 2972package DC::UI::Gauge;
2374 2973
2375our @ISA = CFClient::UI::VBox::; 2974our @ISA = DC::UI::VBox::;
2376 2975
2377sub new { 2976sub new {
2378 my ($class, %arg) = @_; 2977 my ($class, %arg) = @_;
2379 2978
2380 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
… …
2382 can_hover => 1, 2981 can_hover => 1,
2383 can_events => 1, 2982 can_events => 1,
2384 %arg, 2983 %arg,
2385 ); 2984 );
2386 2985
2387 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2986 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2388 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2987 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2389 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2988 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2390 2989
2391 $self 2990 $self
2392} 2991}
2393 2992
2394sub set_fontsize { 2993sub set_fontsize {
… …
2415 $self->{value}->set_text ($val); 3014 $self->{value}->set_text ($val);
2416} 3015}
2417 3016
2418############################################################################# 3017#############################################################################
2419 3018
2420package CFClient::UI::Slider; 3019package DC::UI::Slider;
2421 3020
2422use strict; 3021use strict;
2423 3022
2424use CFClient::OpenGL; 3023use DC::OpenGL;
2425 3024
2426our @ISA = CFClient::UI::DrawBG::; 3025our @ISA = DC::UI::DrawBG::;
2427 3026
2428my @tex = 3027my @tex =
2429 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3028 map { new_from_resource DC::Texture $_ }
2430 qw(s1_slider.png s1_slider_bg.png); 3029 qw(s1_slider.png s1_slider_bg.png);
2431 3030
2432sub new { 3031sub new {
2433 my $class = shift; 3032 my $class = shift;
2434 3033
… …
2471sub set_value { 3070sub set_value {
2472 my ($self, $value) = @_; 3071 my ($self, $value) = @_;
2473 3072
2474 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3073 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2475 3074
2476 $hi = $lo + 1 if $hi <= $lo; 3075 $hi = $lo if $hi < $lo;
2477 3076
2478 $page = $hi - $lo if $page > $hi - $lo; 3077 $value = $hi - $page if $value > $hi - $page;
2479
2480 $value = $lo if $value < $lo; 3078 $value = $lo if $value < $lo;
2481 $value = $hi - $page if $value > $hi - $page;
2482 3079
2483 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3080 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2484 if $unit; 3081 if $unit;
2485 3082
2486 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3083 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2502 3099
2503 $self->SUPER::invoke_button_down ($ev, $x, $y); 3100 $self->SUPER::invoke_button_down ($ev, $x, $y);
2504 3101
2505 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3102 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2506 3103
2507 $self->invoke_mouse_motion ($ev, $x, $y) 3104 $self->invoke_mouse_motion ($ev, $x, $y);
3105
3106 1
2508} 3107}
2509 3108
2510sub invoke_mouse_motion { 3109sub invoke_mouse_motion {
2511 my ($self, $ev, $x, $y) = @_; 3110 my ($self, $ev, $x, $y) = @_;
2512 3111
… …
2528sub invoke_mouse_wheel { 3127sub invoke_mouse_wheel {
2529 my ($self, $ev) = @_; 3128 my ($self, $ev) = @_;
2530 3129
2531 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3130 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532 3131
3132 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3133
2533 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1); 3134 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2534 3135
2535 ! ! $delta 3136 1
2536} 3137}
2537 3138
2538sub update { 3139sub update {
2539 my ($self) = @_; 3140 my ($self) = @_;
2540 3141
… …
2546 my ($self) = @_; 3147 my ($self) = @_;
2547 3148
2548 unless ($self->{knob_w}) { 3149 unless ($self->{knob_w}) {
2549 $self->set_value ($self->{range}[0]); 3150 $self->set_value ($self->{range}[0]);
2550 3151
2551 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3152 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2552 my $range = ($hi - $page - $lo) || 1e-100; 3153 my $range = ($hi - $page - $lo) || 1e-10;
2553 3154
2554 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3155 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2555 3156
2556 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3157 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2557 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3158 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2558 3159
2559 $value = ($value - $lo) / $range; 3160 $value = ($value - $lo) / $range;
… …
2589 glDisable GL_TEXTURE_2D; 3190 glDisable GL_TEXTURE_2D;
2590} 3191}
2591 3192
2592############################################################################# 3193#############################################################################
2593 3194
2594package CFClient::UI::ValSlider; 3195package DC::UI::ValSlider;
2595 3196
2596our @ISA = CFClient::UI::HBox::; 3197our @ISA = DC::UI::HBox::;
2597 3198
2598sub new { 3199sub new {
2599 my ($class, %arg) = @_; 3200 my ($class, %arg) = @_;
2600 3201
2601 my $range = delete $arg{range}; 3202 my $range = delete $arg{range};
2602 3203
2603 my $self = $class->SUPER::new ( 3204 my $self = $class->SUPER::new (
2604 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3205 slider => (new DC::UI::Slider expand => 1, range => $range),
2605 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3206 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2606 to_value => sub { shift }, 3207 to_value => sub { shift },
2607 from_value => sub { shift }, 3208 from_value => sub { shift },
2608 %arg, 3209 %arg,
2609 ); 3210 );
2610 3211
… …
2630sub set_range { shift->{slider}->set_range (@_) } 3231sub set_range { shift->{slider}->set_range (@_) }
2631sub set_value { shift->{slider}->set_value (@_) } 3232sub set_value { shift->{slider}->set_value (@_) }
2632 3233
2633############################################################################# 3234#############################################################################
2634 3235
2635package CFClient::UI::TextScroller; 3236package DC::UI::TextScroller;
2636 3237
2637our @ISA = CFClient::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
2638 3239
2639use CFClient::OpenGL; 3240use DC::OpenGL;
2640 3241
2641sub new { 3242sub new {
2642 my $class = shift; 3243 my $class = shift;
2643 3244
2644 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
… …
2646 can_events => 1, 3247 can_events => 1,
2647 indent => 0, 3248 indent => 0,
2648 #font => default_font 3249 #font => default_font
2649 @_, 3250 @_,
2650 3251
2651 layout => (new CFClient::Layout), 3252 layout => (new DC::Layout),
2652 par => [], 3253 par => [],
3254 max_par => 0,
2653 height => 0, 3255 height => 0,
2654 children => [ 3256 children => [
2655 (new CFClient::UI::Empty expand => 1), 3257 (new DC::UI::Empty expand => 1),
2656 (new CFClient::UI::Slider vertical => 1), 3258 (new DC::UI::Slider vertical => 1),
2657 ], 3259 ],
2658 ); 3260 );
2659 3261
2660 $self->{children}[1]->connect (changed => sub { $self->update }); 3262 $self->{children}[1]->connect (changed => sub { $self->update });
2661 3263
… …
2670} 3272}
2671 3273
2672sub size_request { 3274sub size_request {
2673 my ($self) = @_; 3275 my ($self) = @_;
2674 3276
2675 my ($empty, $slider) = @{ $self->{children} }; 3277 my ($empty, $slider) = $self->visible_children;
2676 3278
2677 local $self->{children} = [$empty, $slider]; 3279 local $self->{children} = [$empty, $slider];
2678 $self->SUPER::size_request 3280 $self->SUPER::size_request
2679} 3281}
2680 3282
… …
2717 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3319 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2718 $layout->set_markup ($para->{markup}); 3320 $layout->set_markup ($para->{markup});
2719 3321
2720 $layout->set_shapes ( 3322 $layout->set_shapes (
2721 map 3323 map
2722 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3324 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2723 @{$para->{widget}} 3325 @{$para->{widget}}
2724 ); 3326 );
2725 3327
2726 $layout 3328 $layout
2727} 3329}
… …
2736sub set_offset { 3338sub set_offset {
2737 my ($self, $offset) = @_; 3339 my ($self, $offset) = @_;
2738 3340
2739 # todo: base offset on lines or so, not on pixels 3341 # todo: base offset on lines or so, not on pixels
2740 $self->{children}[1]->set_value ($offset); 3342 $self->{children}[1]->set_value ($offset);
3343}
3344
3345sub current_paragraph {
3346 my ($self) = @_;
3347
3348 $self->{top_paragraph} - 1
3349}
3350
3351sub scroll_to {
3352 my ($self, $para) = @_;
3353
3354 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3355
3356 $self->{scroll_to} = $para;
3357 $self->update;
2741} 3358}
2742 3359
2743sub clear { 3360sub clear {
2744 my ($self) = @_; 3361 my ($self) = @_;
2745 3362
… …
2750 $self->{height} = 0; 3367 $self->{height} = 0;
2751 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3368 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2752} 3369}
2753 3370
2754sub add_paragraph { 3371sub add_paragraph {
2755 my ($self, $color, $para, $indent) = @_; 3372 my $self = shift;
2756 3373
2757 my ($text, @w) = ref $para ? @$para : $para; 3374 for my $para (@_) {
2758
2759 $para = { 3375 $para = {
3376 fg => [1, 1, 1, 1],
3377 indent => 0,
3378 markup => "",
3379 widget => [],
3380 ref $para ? %$para : (markup => $para),
2760 w => 1e10, 3381 w => 1e10,
2761 wrapped => 1, 3382 wrapped => 1,
2762 fg => $color,
2763 indent => $indent,
2764 markup => $text,
2765 widget => \@w,
2766 }; 3383 };
2767 3384
2768 $self->add (@w) if @w; 3385 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2769 push @{$self->{par}}, $para; 3386 push @{$self->{par}}, $para;
3387 }
3388
3389 if (my $max = $self->{max_par}) {
3390 shift @{$self->{par}} while @{$self->{par}} > $max;
3391 }
2770 3392
2771 $self->{need_reflow}++; 3393 $self->{need_reflow}++;
2772 $self->update; 3394 $self->update;
2773} 3395}
2774 3396
2775sub scroll_to_bottom { 3397sub scroll_to_bottom {
2776 my ($self) = @_; 3398 my ($self) = @_;
2777 3399
2778 $self->{scroll_to_bottom} = 1; 3400 $self->{scroll_to} = $#{$self->{par}};
2779 $self->update; 3401 $self->update;
2780} 3402}
2781 3403
3404sub force_uptodate {
3405 my ($self) = @_;
3406
3407 if (delete $self->{need_reflow}) {
3408 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3409
3410 my $height = 0;
3411
3412 for my $para (@{$self->{par}}) {
3413 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3414 my $layout = $self->get_layout ($para);
3415 my ($w, $h) = $layout->size;
3416
3417 $para->{w} = $w + $para->{indent};
3418 $para->{h} = $h;
3419 $para->{wrapped} = $layout->has_wrapped;
3420 }
3421
3422 $para->{y} = $height;
3423 $height += $para->{h};
3424 }
3425
3426 $self->{height} = $height;
3427 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3428
3429 delete $self->{texture};
3430 }
3431
3432 if (my $paridx = delete $self->{scroll_to}) {
3433 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3434 }
3435}
3436
2782sub update { 3437sub update {
2783 my ($self) = @_; 3438 my ($self) = @_;
2784 3439
2785 $self->SUPER::update; 3440 $self->SUPER::update;
2786 3441
2787 return unless $self->{h} > 0; 3442 return unless $self->{h} > 0;
2788 3443
2789 delete $self->{texture}; 3444 delete $self->{texture};
2790 3445
2791 $ROOT->on_post_alloc ($self => sub { 3446 $ROOT->on_post_alloc ($self => sub {
3447 $self->force_uptodate;
3448
2792 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3449 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2793 3450
2794 if (delete $self->{need_reflow}) {
2795 my $height = 0;
2796
2797 for my $para (@{$self->{par}}) {
2798 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2799 my $layout = $self->get_layout ($para);
2800 my ($w, $h) = $layout->size;
2801
2802 $para->{w} = $w + $para->{indent};
2803 $para->{h} = $h;
2804 $para->{wrapped} = $layout->has_wrapped;
2805 }
2806
2807 $height += $para->{h};
2808 }
2809
2810 $self->{height} = $height;
2811
2812 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2813
2814 delete $self->{texture};
2815 }
2816
2817 if (delete $self->{scroll_to_bottom}) {
2818 $self->{children}[1]->set_value (1e10);
2819 }
2820
2821 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3451 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2822 glClearColor 0, 0, 0, 0; 3452 glClearColor 0, 0, 0, 0;
2823 glClear GL_COLOR_BUFFER_BIT; 3453 glClear GL_COLOR_BUFFER_BIT;
2824 3454
3455 package DC::UI::Base;
3456 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3457 (0, 0, $self->{w}, $self->{h});
3458
3459 my $top = int $self->{children}[1]{range}[0];
3460
3461 my $paridx = 0;
3462 my $top_paragraph;
2825 my $top = int $self->{children}[1]{range}[0]; 3463 my $top = int $self->{children}[1]{range}[0];
2826 3464
2827 my $y0 = $top; 3465 my $y0 = $top;
2828 my $y1 = $top + $H; 3466 my $y1 = $top + $H;
2829 3467
2830 my $y = 0;
2831
2832 for my $para (@{$self->{par}}) { 3468 for my $para (@{$self->{par}}) {
2833 my $h = $para->{h}; 3469 my $h = $para->{h};
3470 my $y = $para->{y};
2834 3471
2835 if ($y0 < $y + $h && $y < $y1) { 3472 if ($y0 < $y + $h && $y < $y1) {
2836
2837 my $layout = $self->get_layout ($para); 3473 my $layout = $self->get_layout ($para);
2838 3474
2839 $layout->render ($para->{indent}, $y - $y0); 3475 $layout->render ($para->{indent}, $y - $y0);
3476 $layout->draw;
2840 3477
2841 if (my @w = @{ $para->{widget} }) { 3478 if (my @w = @{ $para->{widget} }) {
2842 my @s = $layout->get_shapes; 3479 my @s = $layout->get_shapes;
2843 3480
2844 for (@w) { 3481 for (@w) {
… …
2850 $_->draw; 3487 $_->draw;
2851 } 3488 }
2852 } 3489 }
2853 } 3490 }
2854 3491
2855 $y += $h; 3492 $paridx++;
3493 $top_paragraph ||= $paridx if $y >= $top;
2856 } 3494 }
3495
3496 $self->{top_paragraph} = $top_paragraph;
2857 }; 3497 };
2858 }); 3498 });
2859} 3499}
2860 3500
2861sub reconfigure { 3501sub reconfigure {
… …
2879 $self->{children}[1]->draw; 3519 $self->{children}[1]->draw;
2880} 3520}
2881 3521
2882############################################################################# 3522#############################################################################
2883 3523
2884package CFClient::UI::Animator; 3524package DC::UI::Animator;
2885 3525
2886use CFClient::OpenGL; 3526use DC::OpenGL;
2887 3527
2888our @ISA = CFClient::UI::Bin::; 3528our @ISA = DC::UI::Bin::;
2889 3529
2890sub moveto { 3530sub moveto {
2891 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
2892 3532
2893 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3533 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2921 glPopMatrix; 3561 glPopMatrix;
2922} 3562}
2923 3563
2924############################################################################# 3564#############################################################################
2925 3565
2926package CFClient::UI::Flopper; 3566package DC::UI::Flopper;
2927 3567
2928our @ISA = CFClient::UI::Button::; 3568our @ISA = DC::UI::Button::;
2929 3569
2930sub new { 3570sub new {
2931 my $class = shift; 3571 my $class = shift;
2932 3572
2933 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
… …
2945 $self->{other}->toggle_visibility; 3585 $self->{other}->toggle_visibility;
2946} 3586}
2947 3587
2948############################################################################# 3588#############################################################################
2949 3589
2950package CFClient::UI::Tooltip; 3590package DC::UI::Tooltip;
2951 3591
2952our @ISA = CFClient::UI::Bin::; 3592our @ISA = DC::UI::Bin::;
2953 3593
2954use CFClient::OpenGL; 3594use DC::OpenGL;
2955 3595
2956sub new { 3596sub new {
2957 my $class = shift; 3597 my $class = shift;
2958 3598
2959 $class->SUPER::new ( 3599 $class->SUPER::new (
… …
2963} 3603}
2964 3604
2965sub set_tooltip_from { 3605sub set_tooltip_from {
2966 my ($self, $widget) = @_; 3606 my ($self, $widget) = @_;
2967 3607
2968 my $tooltip = $widget->{tooltip}; 3608 my $tip = $widget->{tooltip};
3609 $tip = $tip->($widget) if "CODE" eq ref $tip;
3610
3611 $tip = DC::Pod::section_label tooltip => $1
3612 if $tip =~ /^#(.*)$/;
2969 3613
2970 if ($ENV{CFPLUS_DEBUG} & 2) { 3614 if ($ENV{CFPLUS_DEBUG} & 2) {
2971 $tooltip .= "\n\n" . (ref $widget) . "\n" 3615 $tip .= "\n\n" . (ref $widget) . "\n"
2972 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3616 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2973 . "req $widget->{req_w} $widget->{req_h}\n" 3617 . "req $widget->{req_w} $widget->{req_h}\n"
2974 . "visible $widget->{visible}"; 3618 . "visible $widget->{visible}";
2975 } 3619 }
2976 3620
2977 $tooltip =~ s/^\n+//; 3621 $tip =~ s/^\n+//;
2978 $tooltip =~ s/\n+$//; 3622 $tip =~ s/\n+$//;
2979 3623
2980 $self->add (new CFClient::UI::Label 3624 $self->add (new DC::UI::Label
2981 markup => $tooltip, 3625 markup => $tip,
2982 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3627 align => 0,
2983 fontsize => 0.8, 3628 fontsize => 0.8,
2984 fg => [0, 0, 0, 1], 3629 style => 1, # FLAG_INVERSE
2985 ellipsise => 0, 3630 ellipsise => 0,
2986 font => ($widget->{tooltip_font} || $::FONT_PROP), 3631 font => ($widget->{tooltip_font} || $::FONT_PROP),
2987 ); 3632 );
2988} 3633}
2989 3634
… …
3024} 3669}
3025 3670
3026sub _draw { 3671sub _draw {
3027 my ($self) = @_; 3672 my ($self) = @_;
3028 3673
3029 glTranslate 0.375, 0.375;
3030
3031 my ($w, $h) = @$self{qw(w h)}; 3674 my ($w, $h) = @$self{qw(w h)};
3032 3675
3033 glColor 1, 0.8, 0.4; 3676 glColor 1, 0.8, 0.4;
3034 glBegin GL_QUADS; 3677 glRect 0, 0, $w, $h;
3035 glVertex 0 , 0;
3036 glVertex 0 , $h;
3037 glVertex $w, $h;
3038 glVertex $w, 0;
3039 glEnd;
3040 3678
3041 glColor 0, 0, 0; 3679 glColor 0, 0, 0;
3042 glBegin GL_LINE_LOOP; 3680 glRect_lineloop .5, .5, $w + .5, $h + .5;
3043 glVertex 0 , 0;
3044 glVertex 0 , $h;
3045 glVertex $w, $h;
3046 glVertex $w, 0;
3047 glEnd;
3048 3681
3049 glTranslate 2 - 0.375, 2 - 0.375; 3682 glTranslate 2, 2;
3050 3683
3051 $self->SUPER::_draw; 3684 $self->SUPER::_draw;
3052} 3685}
3053 3686
3054############################################################################# 3687#############################################################################
3055 3688
3056package CFClient::UI::Face; 3689package DC::UI::Face;
3057 3690
3058our @ISA = CFClient::UI::Base::; 3691our @ISA = DC::UI::DrawBG::;
3059 3692
3060use CFClient::OpenGL; 3693use DC::OpenGL;
3061 3694
3062sub new { 3695sub new {
3063 my $class = shift; 3696 my $class = shift;
3064 3697
3065 my $self = $class->SUPER::new ( 3698 my $self = $class->SUPER::new (
3699 size_w => 32,
3700 size_h => 8,
3066 aspect => 1, 3701 aspect => 1,
3067 can_events => 0, 3702 can_events => 0,
3068 @_, 3703 @_,
3069 ); 3704 );
3070 3705
3071 if ($self->{anim} && $self->{animspeed}) { 3706 if ($self->{anim} && $self->{animspeed}) {
3072 Scalar::Util::weaken (my $widget = $self); 3707 DC::weaken (my $widget = $self);
3073 3708
3074 $self->{timer} = Event->timer ( 3709 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3075 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3710 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3076 hard => 1, 3711 return unless $::CONN;
3077 interval => $self->{animspeed}, 3712
3078 cb => sub { 3713 my $w = $widget
3714 or return;
3715
3079 ++$widget->{frame}; 3716 ++$w->{frame};
3717 $w->update_face;
3718
3719 # somehow, $widget can go away
3080 $widget->update; 3720 $w->update;
3081 }, 3721 $w->update_timer;
3082 ); 3722 };
3723
3724 $self->update_face;
3725 $self->update_timer;
3083 } 3726 }
3084 3727
3085 $self 3728 $self
3086} 3729}
3087 3730
3731sub update_timer {
3732 my ($self) = @_;
3733
3734 return unless $self->{timer};
3735
3736 if ($self->{visible}) {
3737 $self->{timer}->start;
3738 } else {
3739 $self->{timer}->stop;
3740 }
3741}
3742
3743sub update_face {
3744 my ($self) = @_;
3745
3746 if ($::CONN) {
3747 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3748 if ($anim && @$anim) {
3749 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3750 delete $self->{face_change_cb};
3751
3752 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3753 unless ($tex->{name} || $tex->{loading}) {
3754 $tex->upload (sub { $self->reconfigure });
3755 }
3756 }
3757 }
3758 }
3759 }
3760}
3761
3088sub size_request { 3762sub size_request {
3089 (32, 8) 3763 my ($self) = @_;
3764
3765 if ($::CONN) {
3766 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3767 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3768 if ($tex->{name}) {
3769 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3770 } elsif (!$tex->{loading}) {
3771 $tex->upload (sub { $self->reconfigure });
3772 }
3773 }
3774
3775 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3776 }
3777 }
3778
3779 ($self->{size_w} || 8, $self->{size_h} || 8)
3090} 3780}
3091 3781
3092sub update { 3782sub update {
3093 my ($self) = @_; 3783 my ($self) = @_;
3094 3784
3095 return unless $self->{visible}; 3785 return unless $self->{visible};
3096 3786
3097 $self->SUPER::update; 3787 $self->SUPER::update;
3098} 3788}
3099 3789
3790sub invoke_visibility_change {
3791 my ($self) = @_;
3792
3793 $self->update_timer;
3794
3795 0
3796}
3797
3100sub _draw { 3798sub _draw {
3101 my ($self) = @_; 3799 my ($self) = @_;
3102 3800
3103 return unless $::CONN; 3801 $self->SUPER::_draw;
3104 3802
3105 my $face; 3803 if (my $tex = $self->{tex}) {
3106
3107 if ($self->{frame}) {
3108 my $anim = $::CONN->{anim}[$self->{anim}];
3109
3110 $face = $anim->[ $self->{frame} % @$anim ]
3111 if $anim && @$anim;
3112 }
3113
3114 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3115
3116 if ($tex) {
3117 glEnable GL_TEXTURE_2D; 3804 glEnable GL_TEXTURE_2D;
3118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3805 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3119 glColor 0, 0, 0, 1; 3806 glColor 0, 0, 0, 1;
3120 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3807 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3121 glDisable GL_TEXTURE_2D; 3808 glDisable GL_TEXTURE_2D;
… …
3123} 3810}
3124 3811
3125sub destroy { 3812sub destroy {
3126 my ($self) = @_; 3813 my ($self) = @_;
3127 3814
3128 $self->{timer}->cancel 3815 (delete $self->{timer})->cancel
3129 if $self->{timer}; 3816 if $self->{timer};
3130 3817
3131 $self->SUPER::destroy; 3818 $self->SUPER::destroy;
3132} 3819}
3133 3820
3134############################################################################# 3821#############################################################################
3135 3822
3136package CFClient::UI::Buttonbar; 3823package DC::UI::Buttonbar;
3137 3824
3138our @ISA = CFClient::UI::HBox::; 3825our @ISA = DC::UI::HBox::;
3139 3826
3140# TODO: should actualyl wrap buttons and other goodies. 3827# TODO: should actually wrap buttons and other goodies.
3141 3828
3142############################################################################# 3829#############################################################################
3143 3830
3144package CFClient::UI::Menu; 3831package DC::UI::Menu;
3145 3832
3146our @ISA = CFClient::UI::FancyFrame::; 3833our @ISA = DC::UI::Toplevel::;
3147 3834
3148use CFClient::OpenGL; 3835use DC::OpenGL;
3149 3836
3150sub new { 3837sub new {
3151 my $class = shift; 3838 my $class = shift;
3152 3839
3153 my $self = $class->SUPER::new ( 3840 my $self = $class->SUPER::new (
3154 items => [], 3841 items => [],
3155 z => 100, 3842 z => 100,
3156 @_, 3843 @_,
3157 ); 3844 );
3158 3845
3159 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3846 $self->add ($self->{vbox} = new DC::UI::VBox);
3160 3847
3161 for my $item (@{ $self->{items} }) { 3848 for my $item (@{ $self->{items} }) {
3162 my ($widget, $cb, $tooltip) = @$item; 3849 my ($widget, $cb, $tooltip) = @$item;
3163 3850
3164 # handle various types of items, only text for now 3851 # handle various types of items, only text for now
3165 if (!ref $widget) { 3852 if (!ref $widget) {
3166 if ($widget =~ /\t/) { 3853 if ($widget =~ /\t/) {
3167 my ($left, $right) = split /\t/, $widget, 2; 3854 my ($left, $right) = split /\t/, $widget, 2;
3168 3855
3169 $widget = new CFClient::UI::HBox 3856 $widget = new DC::UI::HBox
3170 can_hover => 1, 3857 can_hover => 1,
3171 can_events => 1, 3858 can_events => 1,
3172 tooltip => $tooltip, 3859 tooltip => $tooltip,
3173 children => [ 3860 children => [
3174 (new CFClient::UI::Label markup => $left, expand => 1), 3861 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3175 (new CFClient::UI::Label markup => $right, align => +1), 3862 (new DC::UI::Label markup => $right, align => 1),
3176 ], 3863 ],
3177 ; 3864 ;
3178 3865
3179 } else { 3866 } else {
3180 $widget = new CFClient::UI::Label 3867 $widget = new DC::UI::Label
3181 can_hover => 1, 3868 can_hover => 1,
3182 can_events => 1, 3869 can_events => 1,
3870 align => 0,
3183 markup => $widget, 3871 markup => $widget,
3184 tooltip => $tooltip; 3872 tooltip => $tooltip;
3185 } 3873 }
3186 } 3874 }
3187 3875
… …
3233 1 3921 1
3234} 3922}
3235 3923
3236############################################################################# 3924#############################################################################
3237 3925
3238package CFClient::UI::Multiplexer; 3926package DC::UI::Multiplexer;
3239 3927
3240our @ISA = CFClient::UI::Container::; 3928our @ISA = DC::UI::Container::;
3241 3929
3242sub new { 3930sub new {
3243 my $class = shift; 3931 my $class = shift;
3244 3932
3245 my $self = $class->SUPER::new ( 3933 my $self = $class->SUPER::new (
… …
3306 $self->{current}->draw; 3994 $self->{current}->draw;
3307} 3995}
3308 3996
3309############################################################################# 3997#############################################################################
3310 3998
3311package CFClient::UI::Notebook; 3999package DC::UI::Notebook;
3312 4000
4001use DC::OpenGL;
4002
3313our @ISA = CFClient::UI::VBox::; 4003our @ISA = DC::UI::VBox::;
3314 4004
3315sub new { 4005sub new {
3316 my $class = shift; 4006 my $class = shift;
3317 4007
3318 my $self = $class->SUPER::new ( 4008 my $self = $class->SUPER::new (
3319 buttonbar => (new CFClient::UI::Buttonbar), 4009 buttonbar => (new DC::UI::Buttonbar),
3320 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 4010 multiplexer => (new DC::UI::Multiplexer expand => 1),
4011 active_outline => [.7, .7, 0.2],
3321 # filter => # will be put between multiplexer and $self 4012 # filter => # will be put between multiplexer and $self
3322 @_, 4013 @_,
3323 ); 4014 );
3324 4015
3325 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4016 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3326 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4017 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3327 4018
4019 {
4020 Scalar::Util::weaken (my $wself = $self);
4021
4022 $self->{multiplexer}->connect (c_add => sub {
4023 my ($mplex, $widgets) = @_;
4024
4025 for my $child (@$widgets) {
4026 Scalar::Util::weaken $child;
4027 $child->{c_tab_} ||= do {
4028 my $tab =
4029 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4030 ? $child->{c_tab}
4031 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4032
4033 $tab->connect (activate => sub {
4034 $wself->set_current_page ($child);
4035 });
4036
4037 $tab
4038 };
4039
4040 $self->{buttonbar}->add ($child->{c_tab_});
4041 }
4042 });
4043
4044 $self->{multiplexer}->connect (c_remove => sub {
4045 my ($mplex, $widgets) = @_;
4046
4047 for my $child (@$widgets) {
4048 $wself->{buttonbar}->remove ($child->{c_tab_});
4049 }
4050 });
4051 }
4052
3328 $self 4053 $self
3329} 4054}
3330 4055
3331sub add { 4056sub add {
4057 my ($self, @widgets) = @_;
4058
4059 $self->{multiplexer}->add (@widgets)
4060}
4061
4062sub remove {
4063 my ($self, @widgets) = @_;
4064
4065 $self->{multiplexer}->remove (@widgets)
4066}
4067
4068sub pages {
4069 my ($self) = @_;
4070 $self->{multiplexer}->children
4071}
4072
4073sub page_index {
4074 my ($self, $widget) = @_;
4075
4076 my $i = 0;
4077 for ($self->pages) {
4078 if ($_ eq $widget) { return $i };
4079 $i++;
4080 }
4081
4082 undef
4083}
4084
4085sub add_tab {
3332 my ($self, $title, $widget, $tooltip) = @_; 4086 my ($self, $title, $widget, $tooltip) = @_;
3333 4087
3334 Scalar::Util::weaken $self; 4088 $title = [$title, $tooltip] unless ref $title;
4089 $widget->{c_tab} = $title;
3335 4090
3336 $self->{buttonbar}->add (new CFClient::UI::Button
3337 markup => $title,
3338 tooltip => $tooltip,
3339 on_activate => sub { $self->set_current_page ($widget) },
3340 );
3341
3342 $self->{multiplexer}->add ($widget); 4091 $self->add ($widget);
3343} 4092}
3344 4093
3345sub get_current_page { 4094sub get_current_page {
3346 my ($self) = @_; 4095 my ($self) = @_;
3347 4096
… …
3353 4102
3354 $self->{multiplexer}->set_current_page ($page); 4103 $self->{multiplexer}->set_current_page ($page);
3355 $self->emit (page_changed => $self->{multiplexer}{current}); 4104 $self->emit (page_changed => $self->{multiplexer}{current});
3356} 4105}
3357 4106
4107sub _draw {
4108 my ($self) = @_;
4109
4110 $self->SUPER::_draw ();
4111
4112 if (my $cur = $self->{multiplexer}{current}) {
4113 if ($cur = $cur->{c_tab_}) {
4114 glTranslate $self->{buttonbar}{x} + $cur->{x},
4115 $self->{buttonbar}{y} + $cur->{y};
4116 glLineWidth 3;
4117 #glEnable GL_BLEND;
4118 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4119 glColor @{$self->{active_outline}};
4120 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4121 glLineWidth 1;
4122 #glDisable GL_BLEND;
4123 }
4124 }
4125}
4126
3358############################################################################# 4127#############################################################################
3359 4128
3360package CFClient::UI::Combobox; 4129package DC::UI::Selector;
3361 4130
3362use utf8; 4131use utf8;
3363 4132
3364our @ISA = CFClient::UI::Button::; 4133our @ISA = DC::UI::Button::;
3365 4134
3366sub new { 4135sub new {
3367 my $class = shift; 4136 my $class = shift;
3368 4137
3369 my $self = $class->SUPER::new ( 4138 my $self = $class->SUPER::new (
… …
3386 my ($value, $title, $tooltip) = @$_; 4155 my ($value, $title, $tooltip) = @$_;
3387 4156
3388 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4157 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3389 } 4158 }
3390 4159
3391 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4160 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3392} 4161}
3393 4162
3394sub _set_value { 4163sub _set_value {
3395 my ($self, $value) = @_; 4164 my ($self, $value) = @_;
3396 4165
3397 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4166 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4167 $item ||= $self->{options}[0]
3398 or return; 4168 or return;
3399 4169
3400 $self->{value} = $item->[0]; 4170 $self->{value} = $item->[0];
3401 $self->set_markup ("$item->[1] ⇓"); 4171 $self->set_markup ("$item->[1] ⇓");
3402 $self->set_tooltip ($item->[2]); 4172# $self->set_tooltip ($item->[2]);
3403} 4173}
3404 4174
3405sub set_value { 4175sub set_value {
3406 my ($self, $value) = @_; 4176 my ($self, $value) = @_;
3407 4177
… …
3409 4179
3410 $self->_set_value ($value); 4180 $self->_set_value ($value);
3411 $self->emit (changed => $value); 4181 $self->emit (changed => $value);
3412} 4182}
3413 4183
4184sub set_options {
4185 my ($self, $options) = @_;
4186
4187 $self->{options} = $options;
4188 $self->_set_value ($self->{value});
4189}
4190
3414############################################################################# 4191#############################################################################
3415 4192
3416package CFClient::UI::Statusbox; 4193package DC::UI::Statusbox;
3417 4194
3418our @ISA = CFClient::UI::VBox::; 4195our @ISA = DC::UI::VBox::;
3419 4196
3420sub new { 4197sub new {
3421 my $class = shift; 4198 my $class = shift;
3422 4199
3423 my $self = $class->SUPER::new ( 4200 my $self = $class->SUPER::new (
3424 fontsize => 0.8, 4201 fontsize => 0.8,
3425 @_, 4202 @_,
3426 ); 4203 );
3427 4204
3428 Scalar::Util::weaken (my $this = $self); 4205 DC::weaken (my $this = $self);
3429 4206
3430 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4207 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3431 4208
3432 $self 4209 $self
3433} 4210}
3434 4211
3435sub reorder { 4212sub reorder {
3436 my ($self) = @_; 4213 my ($self) = @_;
3437 my $NOW = Time::HiRes::time; 4214 my $NOW = Time::HiRes::time;
3438 4215
3439 # freeze display when hovering over any label 4216 # freeze display when hovering over any label
3440 return if $CFClient::UI::TOOLTIP->{owner} 4217 return if $DC::UI::TOOLTIP->{owner}
3441 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4218 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3442 values %{ $self->{item} }; 4219 values %{ $self->{item} };
3443 4220
3444 while (my ($k, $v) = each %{ $self->{item} }) { 4221 while (my ($k, $v) = each %{ $self->{item} }) {
3445 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4222 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3446 } 4223 }
4224
4225 $self->{timer}->set (1, 1);
3447 4226
3448 my @widgets; 4227 my @widgets;
3449 4228
3450 my @items = sort { 4229 my @items = sort {
3451 $a->{pri} <=> $b->{pri} 4230 $a->{pri} <=> $b->{pri}
3452 or $b->{id} <=> $a->{id} 4231 or $b->{id} <=> $a->{id}
3453 } values %{ $self->{item} }; 4232 } values %{ $self->{item} };
3454
3455 $self->{timer}->interval (1);
3456 4233
3457 my $count = 10 + 1; 4234 my $count = 10 + 1;
3458 for my $item (@items) { 4235 for my $item (@items) {
3459 last unless --$count; 4236 last unless --$count;
3460 4237
… …
3467 for ($short) { 4244 for ($short) {
3468 s/^\s+//; 4245 s/^\s+//;
3469 s/\s+/ /g; 4246 s/\s+/ /g;
3470 } 4247 }
3471 4248
3472 new CFClient::UI::Label 4249 new DC::UI::Label
3473 markup => $short, 4250 markup => $short,
3474 tooltip => $item->{tooltip}, 4251 tooltip => $item->{tooltip},
3475 tooltip_font => $::FONT_PROP, 4252 tooltip_font => $::FONT_PROP,
3476 tooltip_width => 0.67, 4253 tooltip_width => 0.67,
3477 fontsize => $item->{fontsize} || $self->{fontsize}, 4254 fontsize => $item->{fontsize} || $self->{fontsize},
3478 max_w => $::WIDTH * 0.44, 4255 max_w => $::WIDTH * 0.44,
4256 align => 0,
3479 fg => [@{ $item->{fg} }], 4257 fg => [@{ $item->{fg} }],
3480 can_events => 1, 4258 can_events => 1,
3481 can_hover => 1 4259 can_hover => 1
3482 }; 4260 };
3483 4261
3484 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4262 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3485 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4263 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3486 $label->update; 4264 $label->update;
3487 $label->set_max_size (undef, $label->{req_h} * $diff) 4265 $label->set_max_size (undef, $label->{req_h} * $diff)
3488 if $diff < 1; 4266 if $diff < 1;
3489 $self->{timer}->interval (1/30); 4267 $self->{timer}->set (1/30, 1/30);
3490 } else { 4268 } else {
3491 $label->{fg}[3] = $item->{fg}[3] || 1; 4269 $label->{fg}[3] = $item->{fg}[3] || 1;
3492 } 4270 }
3493 4271
3494 push @widgets, $label; 4272 push @widgets, $label;
… …
3556 $self->SUPER::destroy; 4334 $self->SUPER::destroy;
3557} 4335}
3558 4336
3559############################################################################# 4337#############################################################################
3560 4338
3561package CFClient::UI::Inventory;
3562
3563our @ISA = CFClient::UI::Table::;
3564
3565sub new {
3566 my $class = shift;
3567
3568 my $self = $class->SUPER::new (
3569 col_expand => [0, 1, 0],
3570 items => [],
3571 @_,
3572 );
3573
3574 $self->set_sort_order (undef);
3575
3576 $self
3577}
3578
3579sub update_items {
3580 my ($self) = @_;
3581
3582 $self->clear;
3583
3584 my @item = $self->{sort}->(@{ $self->{items} });
3585
3586 my @adds;
3587 my $row = 0;
3588 for my $item ($self->{sort}->(@{ $self->{items} })) {
3589 CFClient::Item::update_widgets $item;
3590
3591 push @adds, 0, $row, $item->{face_widget};
3592 push @adds, 1, $row, $item->{desc_widget};
3593 push @adds, 2, $row, $item->{weight_widget};
3594
3595 $row++;
3596 }
3597
3598 $self->add (@adds);
3599}
3600
3601sub set_sort_order {
3602 my ($self, $order) = @_;
3603
3604 $self->{sort} = $order ||= sub {
3605 sort {
3606 $a->{type} <=> $b->{type}
3607 or $a->{name} cmp $b->{name}
3608 } @_
3609 };
3610
3611 $self->update_items;
3612}
3613
3614sub set_items {
3615 my ($self, $items) = @_;
3616
3617 $self->{items} = [$items ? values %$items : ()];
3618 $self->update_items;
3619}
3620
3621#############################################################################
3622
3623package CFClient::UI::SpellList;
3624
3625our @ISA = CFClient::UI::Table::;
3626
3627sub new {
3628 my $class = shift;
3629
3630 my $self = $class->SUPER::new (
3631 binding => [],
3632 commands => [],
3633 @_,
3634 )
3635}
3636
3637my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3638
3639my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3640 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3641my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3642 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3643my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3644 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3645my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3646 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3647my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3648 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3649
3650sub rebuild_spell_list {
3651 my ($self) = @_;
3652
3653 $CFClient::UI::ROOT->on_refresh ($self => sub {
3654 $self->clear;
3655
3656 return unless $::CONN;
3657
3658 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3659 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3660 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3661 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3662 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3663
3664 my $row = 0;
3665
3666 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3667 my $spell = $self->{spell}{$_};
3668
3669 $row++;
3670
3671 my $spell_cb = sub {
3672 my ($widget, $ev) = @_;
3673
3674 if ($ev->{button} == 1) {
3675 $::CONN->user_send ("cast $spell->{name}");
3676 } elsif ($ev->{button} == 2) {
3677 $::CONN->user_send ("invoke $spell->{name}");
3678 } elsif ($ev->{button} == 3) {
3679 (new CFClient::UI::Menu
3680 items => [
3681 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3682 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3683 ],
3684 )->popup ($ev);
3685 } else {
3686 return 0;
3687 }
3688
3689 1
3690 };
3691
3692 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3693
3694 #TODO: add path info to tooltip
3695 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3696
3697 $self->add (0, $row, new CFClient::UI::Face
3698 face => $spell->{face},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (1, $row, new CFClient::UI::Label
3706 expand => 1,
3707 text => $spell->{name},
3708 can_hover => 1,
3709 can_events => 1,
3710 tooltip => $tooltip,
3711 on_button_down => $spell_cb,
3712 );
3713
3714 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3715 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3716 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3717 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3718 }
3719 });
3720}
3721
3722sub add_spell {
3723 my ($self, $spell) = @_;
3724
3725 $self->{spell}->{$spell->{name}} = $spell;
3726 $self->rebuild_spell_list;
3727}
3728
3729sub remove_spell {
3730 my ($self, $spell) = @_;
3731
3732 delete $self->{spell}->{$spell->{name}};
3733 $self->rebuild_spell_list;
3734}
3735
3736sub clear_spells {
3737 my ($self) = @_;
3738
3739 $self->{spell} = {};
3740 $self->rebuild_spell_list;
3741}
3742
3743#############################################################################
3744
3745package CFClient::UI::Root; 4339package DC::UI::Root;
3746 4340
3747our @ISA = CFClient::UI::Container::; 4341our @ISA = DC::UI::Container::;
3748 4342
3749use List::Util qw(min max); 4343use List::Util qw(min max);
3750 4344
3751use CFClient::OpenGL; 4345use DC::OpenGL;
3752 4346
3753sub new { 4347sub new {
3754 my $class = shift; 4348 my $class = shift;
3755 4349
3756 my $self = $class->SUPER::new ( 4350 my $self = $class->SUPER::new (
3757 visible => 1, 4351 visible => 1,
3758 @_, 4352 @_,
3759 ); 4353 );
3760 4354
3761 Scalar::Util::weaken ($self->{root} = $self); 4355 DC::weaken ($self->{root} = $self);
3762 4356
3763 $self 4357 $self
3764} 4358}
3765 4359
3766sub size_request { 4360sub size_request {
… …
3814} 4408}
3815 4409
3816sub update { 4410sub update {
3817 my ($self) = @_; 4411 my ($self) = @_;
3818 4412
3819 $::WANT_REFRESH++; 4413 $::WANT_REFRESH = 1;
3820} 4414}
3821 4415
3822sub add { 4416sub add {
3823 my ($self, @children) = @_; 4417 my ($self, @children) = @_;
3824 4418
… …
3861 while ($self->{refresh_hook}) { 4455 while ($self->{refresh_hook}) {
3862 $_->() 4456 $_->()
3863 for values %{delete $self->{refresh_hook}}; 4457 for values %{delete $self->{refresh_hook}};
3864 } 4458 }
3865 4459
3866 if ($self->{realloc}) { 4460 while ($self->{realloc}) {
3867 my %queue; 4461 my %queue;
3868 my @queue; 4462 my @queue;
3869 my $widget; 4463 my $widget;
3870 4464
3871 outer: 4465 outer:
… …
3891 4485
3892 delete $queue{$widget+0}; 4486 delete $queue{$widget+0};
3893 4487
3894 my ($w, $h) = $widget->size_request; 4488 my ($w, $h) = $widget->size_request;
3895 4489
3896 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4490 $w += $widget->{padding_x} * 2;
3897 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4491 $h += $widget->{padding_y} * 2;
4492
4493 $w = max $widget->{min_w}, $w;
4494 $h = max $widget->{min_h}, $h;
3898 4495
3899 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3900 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3901 4498
3902 $w = $widget->{force_w} if exists $widget->{force_w}; 4499 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3918 } 4515 }
3919 } 4516 }
3920 4517
3921 delete $self->{realloc}{$widget+0}; 4518 delete $self->{realloc}{$widget+0};
3922 } 4519 }
3923 }
3924 4520
3925 while (my $size_alloc = delete $self->{size_alloc}) { 4521 while (my $size_alloc = delete $self->{size_alloc}) {
3926 my @queue = sort { $b->{visible} <=> $a->{visible} } 4522 my @queue = sort { $a->{visible} <=> $b->{visible} }
3927 values %$size_alloc; 4523 values %$size_alloc;
3928 4524
3929 while () { 4525 while () {
3930 my $widget = pop @queue || last; 4526 my $widget = pop @queue || last;
3931 4527
3932 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4528 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3933 4529
3934 $w = 0 if $w < 0;
3935 $h = 0 if $h < 0;
3936
3937 $w = max $widget->{min_w}, $w; 4530 $w = max $widget->{min_w}, $w;
3938 $h = max $widget->{min_h}, $h; 4531 $h = max $widget->{min_h}, $h;
3939 4532
4533# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4534# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4535
3940 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4536 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4537 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942 4538
3943 $w = int $w + 0.5; 4539 $w = int $w + 0.5;
3944 $h = int $h + 0.5; 4540 $h = int $h + 0.5;
3945 4541
3946 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4542 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3947 $widget->{old_w} = $widget->{w}; 4543 $widget->{old_w} = $widget->{w};
3948 $widget->{old_h} = $widget->{h}; 4544 $widget->{old_h} = $widget->{h};
3949 4545
3950 $widget->{w} = $w; 4546 $widget->{w} = $w;
3951 $widget->{h} = $h; 4547 $widget->{h} = $h;
3952 4548
3953 $widget->emit (size_allocate => $w, $h); 4549 $widget->emit (size_allocate => $w, $h);
4550 }
3954 } 4551 }
3955 } 4552 }
3956 } 4553 }
3957 4554
3958 while ($self->{post_alloc_hook}) { 4555 while ($self->{post_alloc_hook}) {
3959 $_->() 4556 $_->()
3960 for values %{delete $self->{post_alloc_hook}}; 4557 for values %{delete $self->{post_alloc_hook}};
3961 } 4558 }
3962
3963 4559
3964 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4560 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3965 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4561 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3966 glClear GL_COLOR_BUFFER_BIT; 4562 glClear GL_COLOR_BUFFER_BIT;
3967 4563
… …
3970 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4566 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3971 glMatrixMode GL_MODELVIEW; 4567 glMatrixMode GL_MODELVIEW;
3972 glLoadIdentity; 4568 glLoadIdentity;
3973 4569
3974 { 4570 {
3975 package CFClient::UI::Base; 4571 package DC::UI::Base;
3976 4572
3977 ($draw_x, $draw_y, $draw_w, $draw_h) = 4573 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3978 (0, 0, $self->{w}, $self->{h}); 4574 (0, 0, $self->{w}, $self->{h});
3979 }
3980 4575
3981 $self->_draw; 4576 $self->_draw;
4577 }
3982} 4578}
3983 4579
3984############################################################################# 4580#############################################################################
3985 4581
3986package CFClient::UI; 4582package DC::UI;
3987 4583
3988$ROOT = new CFClient::UI::Root; 4584$ROOT = new DC::UI::Root;
3989$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4585$TOOLTIP = new DC::UI::Tooltip z => 900;
3990 4586
39911 45871
3992 4588

Diff Legend

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