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.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.454 by root, Wed Dec 26 21:03:21 2007 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 return $self->{parent}->get_max_wh
374 if $self->{parent};
375
376 ($::WIDTH, $::HEIGHT)
377}
378
357sub size_request { 379sub size_request {
358 require Carp; 380 require Carp;
359 Carp::confess "size_request is abstract"; 381 Carp::confess "size_request is abstract";
360} 382}
361 383
… …
367 my ($self, $x, $y, $w, $h) = @_; 389 my ($self, $x, $y, $w, $h) = @_;
368 390
369 if ($self->{aspect}) { 391 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 392 my ($ow, $oh) = ($w, $h);
371 393
372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect}; 394 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect}; 395 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
374 396
375 # use alignment to adjust x, y 397 # use alignment to adjust x, y
376 398
377 $x += int 0.5 * ($ow - $w); 399 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 400 $y += int 0.5 * ($oh - $h);
… …
419 441
420 return if $self->{tooltip} eq $tooltip; 442 return if $self->{tooltip} eq $tooltip;
421 443
422 $self->{tooltip} = $tooltip; 444 $self->{tooltip} = $tooltip;
423 445
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 446 if ($DC::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner}; 447 delete $DC::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 448 $DC::UI::TOOLTIP_WATCHER->invoke;
427 } 449 }
428} 450}
429 451
430# translate global coordinates to local coordinate system 452# translate global coordinates to local coordinate system
431sub coord2local { 453sub coord2local {
432 my ($self, $x, $y) = @_; 454 my ($self, $x, $y) = @_;
433 455
434 Carp::confess unless $self->{parent};#d# 456 return (undef, undef) unless $self->{parent};
435 457
436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 458 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
437} 459}
438 460
439# translate local coordinates to global coordinate system 461# translate local coordinates to global coordinate system
440sub coord2global { 462sub coord2global {
441 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
442 464
443 Carp::confess unless $self->{parent};#d# 465 return (undef, undef) unless $self->{parent};
444 466
445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 467 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
446} 468}
447 469
448sub invoke_focus_in { 470sub invoke_focus_in {
… …
497sub connect { 519sub connect {
498 my ($self, $signal, $cb) = @_; 520 my ($self, $signal, $cb) = @_;
499 521
500 push @{ $self->{signal_cb}{$signal} }, $cb; 522 push @{ $self->{signal_cb}{$signal} }, $cb;
501 523
502 defined wantarray and CFClient::guard { 524 defined wantarray and DC::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 525 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 526 @{ $self->{signal_cb}{$signal} };
505 } 527 }
528}
529
530sub disconnect_all {
531 my ($self, $signal) = @_;
532
533 delete $self->{signal_cb}{$signal};
506} 534}
507 535
508my %has_coords = ( 536my %has_coords = (
509 button_down => 1, 537 button_down => 1,
510 button_up => 1, 538 button_up => 1,
… …
513); 541);
514 542
515sub emit { 543sub emit {
516 my ($self, $signal, @args) = @_; 544 my ($self, $signal, @args) = @_;
517 545
518 # I do not really like this solution, but I dislike duplication 546 # I do not really like this solution, but I do not like duplication
519 # and needlessly verbose code, too. 547 # and needlessly verbose code, either.
520 my @append 548 my @append
521 = $has_coords{$signal} 549 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 550 ? $args[0]->xy ($self)
523 : (); 551 : ();
524 552
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 553 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526 554
527 #d##TODO# stop propagating at first true, do not use sum 555 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 556 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 557 ($self->can ("invoke_$signal") || sub { 1 }), # closure
558 ) {
559 return $cb->($self, @args, @append) || next;
560 }
561
562 # parent
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 563 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 564}
532 565
533sub find_widget { 566#sub find_widget {
534 my ($self, $x, $y) = @_; 567# 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 568
545sub set_parent { 569sub set_parent {
546 my ($self, $parent) = @_; 570 my ($self, $parent) = @_;
547 571
548 Scalar::Util::weaken ($self->{parent} = $parent); 572 DC::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 573 $self->set_visible if $parent->{visible};
550} 574}
551 575
552sub realloc { 576sub realloc {
553 my ($self) = @_; 577 my ($self) = @_;
… …
579 603
580# using global variables seems a bit hacky, but passing through all drawing 604# using global variables seems a bit hacky, but passing through all drawing
581# functions seems pointless. 605# functions seems pointless.
582our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 606our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583 607
584sub draw { 608#sub draw {
585 my ($self) = @_; 609#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 610
631sub _draw { 611sub _draw {
632 my ($self) = @_; 612 my ($self) = @_;
633 613
634 warn "no draw defined for $self\n"; 614 warn "no draw defined for $self\n";
635} 615}
636 616
637sub DESTROY { 617sub DESTROY {
638 my ($self) = @_; 618 my ($self) = @_;
639 619
640 return if CFClient::in_destruct; 620 return if DC::in_destruct;
641 621
642 delete $WIDGET{$self+0}; 622 local $@;
643
644 eval { $self->destroy }; 623 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 624 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
625
626 delete $WIDGET{$self+0};
646} 627}
647 628
648############################################################################# 629#############################################################################
649 630
650package CFClient::UI::DrawBG; 631package DC::UI::DrawBG;
651 632
652our @ISA = CFClient::UI::Base::; 633our @ISA = DC::UI::Base::;
653 634
654use strict; 635use strict;
655use CFClient::OpenGL; 636use DC::OpenGL;
656 637
657sub new { 638sub new {
658 my $class = shift; 639 my $class = shift;
659
660 # range [value, low, high, page]
661 640
662 $class->SUPER::new ( 641 $class->SUPER::new (
663 #bg => [0, 0, 0, 0.2], 642 #bg => [0, 0, 0, 0.2],
664 #active_bg => [1, 1, 1, 0.5], 643 #active_bg => [1, 1, 1, 0.5],
665 @_ 644 @_
… …
677 my ($w, $h) = @$self{qw(w h)}; 656 my ($w, $h) = @$self{qw(w h)};
678 657
679 glEnable GL_BLEND; 658 glEnable GL_BLEND;
680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 659 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
681 glColor_premultiply @$color; 660 glColor_premultiply @$color;
682
683 glBegin GL_QUADS;
684 glVertex 0 , 0;
685 glVertex 0 , $h;
686 glVertex $w, $h; 661 glRect 0, 0, $w, $h;
687 glVertex $w, 0;
688 glEnd;
689
690 glDisable GL_BLEND; 662 glDisable GL_BLEND;
691 } 663 }
692} 664}
693 665
694############################################################################# 666#############################################################################
695 667
696package CFClient::UI::Empty; 668package DC::UI::Empty;
697 669
698our @ISA = CFClient::UI::Base::; 670our @ISA = DC::UI::Base::;
699 671
700sub new { 672sub new {
701 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 674 $class->SUPER::new (can_events => 0, %arg);
703} 675}
… …
710 682
711sub draw { } 683sub draw { }
712 684
713############################################################################# 685#############################################################################
714 686
715package CFClient::UI::Container; 687package DC::UI::Container;
716 688
717our @ISA = CFClient::UI::Base::; 689our @ISA = DC::UI::Base::;
718 690
719sub new { 691sub new {
720 my ($class, %arg) = @_; 692 my ($class, %arg) = @_;
721 693
722 my $children = delete $arg{children}; 694 my $children = delete $arg{children};
… …
726 can_events => 0, 698 can_events => 0,
727 %arg, 699 %arg,
728 ); 700 );
729 701
730 $self->add (@$children) 702 $self->add (@$children)
731 if $children; 703 if $children && @$children;
732 704
733 $self 705 $self
734} 706}
735 707
736sub realloc { 708sub realloc {
… …
745 my ($self, @widgets) = @_; 717 my ($self, @widgets) = @_;
746 718
747 $_->set_parent ($self) 719 $_->set_parent ($self)
748 for @widgets; 720 for @widgets;
749 721
722 # TODO: only do this in widgets that need it, e.g. root, fixed
750 use sort 'stable'; 723 use sort 'stable';
751 724
752 $self->{children} = [ 725 $self->{children} = [
753 sort { $a->{z} <=> $b->{z} } 726 sort { $a->{z} <=> $b->{z} }
754 @{$self->{children}}, @widgets 727 @{$self->{children}}, @widgets
755 ]; 728 ];
756 729
757 $self->realloc; 730 $self->realloc;
731
732 $self->emit (c_add => \@widgets);
733
734 map $_+0, @widgets
758} 735}
759 736
760sub children { 737sub children {
761 @{ $_[0]{children} } 738 @{ $_[0]{children} }
762} 739}
763 740
764sub remove { 741sub remove {
765 my ($self, $child) = @_; 742 my ($self, @widgets) = @_;
766 743
744 $self->emit (c_remove => \@widgets);
745
746 for my $child (@widgets) {
767 delete $child->{parent}; 747 delete $child->{parent};
768 $child->hide; 748 $child->hide;
769
770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 749 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
750 }
771 751
772 $self->realloc; 752 $self->realloc;
773} 753}
774 754
775sub clear { 755sub clear {
776 my ($self) = @_; 756 my ($self) = @_;
777 757
778 my $children = delete $self->{children}; 758 my $children = $self->{children};
779 $self->{children} = []; 759 $self->{children} = [];
780 760
781 for (@$children) { 761 for (@$children) {
782 delete $_->{parent}; 762 delete $_->{parent};
783 $_->hide; 763 $_->hide;
… …
803} 783}
804 784
805sub _draw { 785sub _draw {
806 my ($self) = @_; 786 my ($self) = @_;
807 787
808 $_->draw for @{$self->{children}}; 788 $_->draw for $self->visible_children;
809} 789}
810 790
811############################################################################# 791#############################################################################
812 792
813package CFClient::UI::Bin; 793package DC::UI::Bin;
814 794
815our @ISA = CFClient::UI::Container::; 795our @ISA = DC::UI::Container::;
816 796
817sub new { 797sub new {
818 my ($class, %arg) = @_; 798 my ($class, %arg) = @_;
819 799
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 800 my $child = (delete $arg{child}) || new DC::UI::Empty::;
821 801
822 $class->SUPER::new (children => [$child], %arg) 802 $class->SUPER::new (children => [$child], %arg)
823} 803}
824 804
825sub add { 805sub add {
826 my ($self, $child) = @_; 806 my ($self, $child) = @_;
827 807
828 $self->SUPER::remove ($_) for @{ $self->{children} }; 808 $self->clear;
829 $self->SUPER::add ($child); 809 $self->SUPER::add ($child);
830} 810}
831 811
832sub remove { 812sub remove {
833 my ($self, $widget) = @_; 813 my ($self, $widget) = @_;
834 814
835 $self->SUPER::remove ($widget); 815 $self->SUPER::remove ($widget);
836 816
837 $self->{children} = [new CFClient::UI::Empty] 817 $self->{children} = [new DC::UI::Empty]
838 unless @{$self->{children}}; 818 unless @{$self->{children}};
839} 819}
840 820
841sub child { $_[0]->{children}[0] } 821sub child { $_[0]->{children}[0] }
842 822
… …
851 831
852 1 832 1
853} 833}
854 834
855############################################################################# 835#############################################################################
856
857# back-buffered drawing area 836# back-buffered drawing area
858 837
859package CFClient::UI::Window; 838package DC::UI::Window;
860 839
861our @ISA = CFClient::UI::Bin::; 840our @ISA = DC::UI::Bin::;
862 841
863use CFClient::OpenGL; 842use DC::OpenGL;
864 843
865sub new { 844sub new {
866 my ($class, %arg) = @_; 845 my ($class, %arg) = @_;
867 846
868 my $self = $class->SUPER::new (%arg); 847 my $self = $class->SUPER::new (%arg);
… …
890} 869}
891 870
892sub render_child { 871sub render_child {
893 my ($self) = @_; 872 my ($self) = @_;
894 873
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 874 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 875 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 876 glClear GL_COLOR_BUFFER_BIT;
898 877
899 { 878 {
900 package CFClient::UI::Base; 879 package DC::UI::Base;
901 880
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 881 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 882 (0, 0, $self->{w}, $self->{h});
883
884 $self->_render;
904 } 885 }
905
906 $self->_render;
907 }; 886 };
908} 887}
909 888
910sub _draw { 889sub _draw {
911 my ($self) = @_; 890 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 891
915 my $tex = $self->{texture} 892 my $tex = $self->{texture}
916 or return; 893 or return;
917 894
918 glEnable GL_TEXTURE_2D; 895 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 896 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 897 glColor 0, 0, 0, 1;
921 898
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 899 $tex->draw_quad_alpha_premultiplied (0, 0);
923 900
924 glDisable GL_TEXTURE_2D; 901 glDisable GL_TEXTURE_2D;
925} 902}
926 903
927############################################################################# 904#############################################################################
928 905
929package CFClient::UI::ViewPort; 906package DC::UI::ViewPort;
930 907
908use List::Util qw(min max);
909
931our @ISA = CFClient::UI::Window::; 910our @ISA = DC::UI::Window::;
932 911
933sub new { 912sub new {
934 my $class = shift; 913 my $class = shift;
935 914
936 $class->SUPER::new ( 915 $class->SUPER::new (
… …
943sub size_request { 922sub size_request {
944 my ($self) = @_; 923 my ($self) = @_;
945 924
946 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 925 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947 926
948 $w = 10 if $self->{scroll_x}; 927 $w = 1 if $self->{scroll_x};
949 $h = 10 if $self->{scroll_y}; 928 $h = 1 if $self->{scroll_y};
950 929
951 ($w, $h) 930 ($w, $h)
952} 931}
953 932
954sub invoke_size_allocate { 933sub invoke_size_allocate {
… …
966} 945}
967 946
968sub set_offset { 947sub set_offset {
969 my ($self, $x, $y) = @_; 948 my ($self, $x, $y) = @_;
970 949
950 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
951 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
952
953 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 954 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 955 $self->{view_y} = $y;
973 956
957 $self->emit (changed => $x, $y);
974 $self->update; 958 $self->update;
959 }
960}
961
962sub set_center {
963 my ($self, $x, $y) = @_;
964
965 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
966}
967
968sub make_visible {
969 my ($self, $x, $y, $border) = @_;
970
971 if ( $x < $self->{view_x} + $self->{w} * $border
972 || $x > $self->{view_x} + $self->{w} * (1 - $border)
973 || $y < $self->{view_y} + $self->{h} * $border
974 || $y > $self->{view_y} + $self->{h} * (1 - $border)
975 ) {
976 $self->set_center ($x, $y);
977 }
975} 978}
976 979
977# hmm, this does not work for topleft of $self... but we should not ask for that 980# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 981sub coord2local {
979 my ($self, $x, $y) = @_; 982 my ($self, $x, $y) = @_;
… …
994 my ($self, $x, $y) = @_; 997 my ($self, $x, $y) = @_;
995 998
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 999 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1000 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1001 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1002 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1003 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1004 $self->DC::UI::Base::find_widget ($x, $y)
1002 } 1005 }
1003} 1006}
1004 1007
1005sub _render { 1008sub _render {
1006 my ($self) = @_; 1009 my ($self) = @_;
1007 1010
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1011 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}; 1012 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1010 1013
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1014 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1015
1013 $self->SUPER::_render; 1016 $self->SUPER::_render;
1014} 1017}
1015 1018
1016############################################################################# 1019#############################################################################
1017 1020
1018package CFClient::UI::ScrolledWindow; 1021package DC::UI::ScrolledWindow;
1019 1022
1020our @ISA = CFClient::UI::HBox::; 1023our @ISA = DC::UI::Table::;
1021 1024
1022sub new { 1025sub new {
1023 my ($class, %arg) = @_; 1026 my ($class, %arg) = @_;
1024 1027
1025 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
1026 1029
1027 my $self; 1030 my $self;
1028 1031
1029 my $slider = new CFClient::UI::Slider 1032 my $hslider = new DC::UI::Slider
1033 c_col => 0,
1034 c_row => 1,
1035 vertical => 0,
1036 range => [0, 0, 1, 0.01], # HACK fix
1037 on_changed => sub {
1038 $self->{hpos} = $_[1];
1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 },
1041 ;
1042
1043 my $vslider = new DC::UI::Slider
1044 c_col => 1,
1045 c_row => 0,
1030 vertical => 1, 1046 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1048 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1049 $self->{vpos} = $_[1];
1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1051 },
1035 ; 1052 ;
1036 1053
1037 $self = $class->SUPER::new ( 1054 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1055 scroll_x => 0,
1056 scroll_y => 1,
1039 can_events => 1, 1057 can_events => 1,
1040 slider => $slider, 1058 hslider => $hslider,
1059 vslider => $vslider,
1060 col_expand => [1, 0],
1061 row_expand => [1, 0],
1041 %arg, 1062 %arg,
1042 ); 1063 );
1043 1064
1065 $self->{vp} = new DC::UI::ViewPort
1066 c_col => 0,
1067 c_row => 0,
1068 expand => 1,
1069 scroll_x => $self->{scroll_x},
1070 scroll_y => $self->{scroll_y},
1071 on_changed => sub {
1072 my ($vp, $x, $y) = @_;
1073
1074 $vp->{parent}{hslider}->set_value ($x);
1075 $vp->{parent}{vslider}->set_value ($y);
1076
1077 0
1078 },
1079 on_size_allocate => sub {
1080 my ($vp, $w, $h) = @_;
1081 $vp->{parent}->update_slider;
1082 0
1083 },
1084 ;
1085
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1086 $self->SUPER::add ($self->{vp});
1087
1045 $self->add ($child) if $child; 1088 $self->add ($child) if $child;
1046 1089
1047 $self 1090 $self
1048} 1091}
1049
1050#TODO# update range on size_allocate depending on child
1051 1092
1052sub add { 1093sub add {
1053 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
1054 1095
1055 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
1056} 1097}
1057 1098
1099sub set_offset { shift->{vp}->set_offset (@_) }
1100sub set_center { shift->{vp}->set_center (@_) }
1101sub make_visible { shift->{vp}->make_visible (@_) }
1102
1103sub update_slider {
1104 my ($self) = @_;
1105
1106 my $child = ($self->{vp} or return)->child;
1107
1108 if ($self->{scroll_x}) {
1109 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider_visible}) {
1114 $self->{hslider_visible} = $visible;
1115 $visible ? $self->SUPER::add ($self->{hslider})
1116 : $self->SUPER::remove ($self->{hslider});
1117 }
1118 }
1119
1120 if ($self->{scroll_y}) {
1121 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider_visible}) {
1126 $self->{vslider_visible} = $visible;
1127 $visible ? $self->SUPER::add ($self->{vslider})
1128 : $self->SUPER::remove ($self->{vslider});
1129 }
1130 }
1131}
1132
1133sub start_dragging {
1134 my ($self, $ev) = @_;
1135
1136 $self->grab_focus;
1137
1138 my $ox = $self->{vp}{view_x};
1139 my $oy = $self->{vp}{view_y};
1140
1141 $self->{motion} = sub {
1142 my ($ev, $x, $y) = @_;
1143
1144 $ox -= $ev->{xrel};
1145 $oy -= $ev->{yrel};
1146
1147 $self->{vp}->set_offset ($ox, $oy);
1148 };
1149}
1150
1058sub invoke_mouse_wheel { 1151sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1152 my ($self, $ev) = @_;
1060 1153
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev); 1154 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1155 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064 1156
1065 1 1157 1
1066} 1158}
1067 1159
1068sub update_slider { 1160sub invoke_button_down {
1069 my ($self) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1070 1162
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1163 if ($ev->{button} == 2) {
1072} 1164 $self->start_dragging ($ev);
1165 return 1;
1166 }
1073 1167
1074sub update { 1168 0
1075 my ($self) = @_; 1169}
1076 1170
1077 $self->SUPER::update; 1171sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_;
1078 1173
1079 $self->update_slider; 1174 if (delete $self->{motion}) {
1175 return 1;
1176 }
1177
1178 0
1179}
1180
1181sub invoke_mouse_motion {
1182 my ($self, $ev, $x, $y) = @_;
1183
1184 if ($self->{motion}) {
1185 $self->{motion}->($ev, $x, $y);
1186 return 1;
1187 }
1188
1189 0
1080} 1190}
1081 1191
1082sub invoke_size_allocate { 1192sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1084 1194
1085 $self->update_slider; 1195 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1197}
1089 1198
1090############################################################################# 1199#############################################################################
1091 1200
1092package CFClient::UI::Frame; 1201package DC::UI::Frame;
1093 1202
1094our @ISA = CFClient::UI::Bin::; 1203our @ISA = DC::UI::Bin::;
1095 1204
1096use CFClient::OpenGL; 1205use DC::OpenGL;
1097 1206
1098sub new { 1207sub new {
1099 my $class = shift; 1208 my $class = shift;
1100 1209
1101 $class->SUPER::new ( 1210 $class->SUPER::new (
… …
1111 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1112 1221
1113 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1115 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1116
1117 glBegin GL_QUADS;
1118 glVertex 0 , 0;
1119 glVertex 0 , $h;
1120 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1121 glVertex $w, 0;
1122 glEnd;
1123
1124 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1125 } 1227 }
1126 1228
1127 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1128} 1230}
1129 1231
1130############################################################################# 1232#############################################################################
1131 1233
1132package CFClient::UI::FancyFrame; 1234package DC::UI::FancyFrame;
1133 1235
1134our @ISA = CFClient::UI::Bin::; 1236our @ISA = DC::UI::Bin::;
1135 1237
1136use CFClient::OpenGL; 1238use DC::OpenGL;
1239
1240sub new {
1241 my ($class, %arg) = @_;
1242
1243 if ((exists $arg{label}) && !ref $arg{label}) {
1244 $arg{label} = new DC::UI::Label
1245 align => 1,
1246 valign => 0,
1247 text => $arg{label},
1248 fontsize => ($arg{border} || 0.8) * 0.75;
1249 }
1250
1251 my $self = $class->SUPER::new (
1252 # label => "",
1253 fg => [0.6, 0.3, 0.1],
1254 border => 0.8,
1255 style => 'single',
1256 %arg,
1257 );
1258
1259 $self
1260}
1261
1262sub add {
1263 my ($self, @widgets) = @_;
1264
1265 $self->SUPER::add (@widgets);
1266 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1267}
1268
1269sub border {
1270 int $_[0]{border} * $::FONTSIZE
1271}
1272
1273sub size_request {
1274 my ($self) = @_;
1275
1276 ($self->{label_w}, undef) = $self->{label}->size_request
1277 if $self->{label};
1278
1279 my ($w, $h) = $self->SUPER::size_request;
1280
1281 (
1282 $w + $self->border * 2,
1283 $h + $self->border * 2,
1284 )
1285}
1286
1287sub invoke_size_allocate {
1288 my ($self, $w, $h) = @_;
1289
1290 my $border = $self->border;
1291
1292 $w -= List::Util::max 0, $border * 2;
1293 $h -= List::Util::max 0, $border * 2;
1294
1295 if (my $label = $self->{label}) {
1296 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1297 $label->{h} = List::Util::min $h, $border;
1298 $label->invoke_size_allocate ($label->{w}, $label->{h});
1299 }
1300
1301 $self->child->configure ($border, $border, $w, $h);
1302
1303 1
1304}
1305
1306sub _draw {
1307 my ($self) = @_;
1308
1309 my $child = $self->{children}[0];
1310
1311 my $border = $self->border;
1312 my ($w, $h) = ($self->{w}, $self->{h});
1313
1314 $child->draw;
1315
1316 glColor @{$self->{fg}};
1317 glBegin GL_LINE_STRIP;
1318 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1319 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1320 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1321 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1322 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1324 glEnd;
1325
1326 if ($self->{label}) {
1327 glTranslate $border * 2, 0;
1328 $self->{label}->_draw;
1329 }
1330}
1331
1332#############################################################################
1333
1334package DC::UI::Toplevel;
1335
1336our @ISA = DC::UI::Bin::;
1337
1338use DC::OpenGL;
1137 1339
1138my $bg = 1340my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1341 new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1342 mipmap => 1, wrap => 1;
1141 1343
1142my @border = 1344my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1345 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1346 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1347
1348my @icon =
1349 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1350 qw(x1_move.png x1_resize.png);
1145 1351
1146sub new { 1352sub new {
1147 my ($class, %arg) = @_; 1353 my ($class, %arg) = @_;
1148 1354
1149 my $self = $class->SUPER::new ( 1355 my $self = $class->SUPER::new (
… …
1154 min_w => 64, 1360 min_w => 64,
1155 min_h => 32, 1361 min_h => 32,
1156 %arg, 1362 %arg,
1157 ); 1363 );
1158 1364
1159 $self->{title_widget} = new CFClient::UI::Label 1365 $self->{title_widget} = new DC::UI::Label
1160 align => 0, 1366 align => 0,
1161 valign => 1, 1367 valign => 1,
1162 text => $self->{title}, 1368 text => $self->{title},
1163 fontsize => $self->{border}, 1369 fontsize => $self->{border},
1164 if exists $self->{title}; 1370 if exists $self->{title};
1165 1371
1166 if ($self->{has_close_button}) { 1372 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1373 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1374 new DC::UI::ImageButton
1169 path => 'x1_close.png', 1375 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1376 on_activate => sub { $self->emit ("delete") };
1171 1377
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1378 $self->DC::UI::Container::add ($self->{close_button});
1173 } 1379 }
1174 1380
1175 $self 1381 $self
1176} 1382}
1177 1383
1178sub add { 1384sub add {
1179 my ($self, @widgets) = @_; 1385 my ($self, @widgets) = @_;
1180 1386
1181 $self->SUPER::add (@widgets); 1387 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1388 $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}; 1389 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1390}
1185 1391
1186sub border { 1392sub border {
1187 int $_[0]{border} * $::FONTSIZE 1393 int $_[0]{border} * $::FONTSIZE
1394}
1395
1396sub get_max_wh {
1397 my ($self) = @_;
1398
1399 return ($self->{w}, $self->{h})
1400 if $self->{visible} && $self->{w};
1401
1402 $self->SUPER::get_max_wh
1188} 1403}
1189 1404
1190sub size_request { 1405sub size_request {
1191 my ($self) = @_; 1406 my ($self) = @_;
1192 1407
… …
1296 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1511 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297 1512
1298 ! ! $self->{motion} 1513 ! ! $self->{motion}
1299} 1514}
1300 1515
1516sub invoke_visibility_change {
1517 my ($self, $visible) = @_;
1518
1519 delete $self->{motion} unless $visible;
1520
1521 0
1522}
1523
1301sub _draw { 1524sub _draw {
1302 my ($self) = @_; 1525 my ($self) = @_;
1303 1526
1304 my $child = $self->{children}[0]; 1527 my $child = $self->{children}[0];
1305 1528
… …
1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311 1534
1312 my $border = $self->border; 1535 my $border = $self->border;
1313 1536
1314 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1315 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1319 1556
1320 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1322 1559
1323 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1342 if $self->{close_button}; 1579 if $self->{close_button};
1343} 1580}
1344 1581
1345############################################################################# 1582#############################################################################
1346 1583
1347package CFClient::UI::Table; 1584package DC::UI::Table;
1348 1585
1349our @ISA = CFClient::UI::Base::; 1586our @ISA = DC::UI::Container::;
1350 1587
1351use List::Util qw(max sum); 1588use List::Util qw(max sum);
1352 1589
1353use CFClient::OpenGL; 1590use DC::OpenGL;
1354 1591
1355sub new { 1592sub new {
1356 my $class = shift; 1593 my $class = shift;
1357 1594
1358 $class->SUPER::new ( 1595 $class->SUPER::new (
1359 col_expand => [], 1596 col_expand => [],
1597 row_expand => [],
1360 @_, 1598 @_,
1361 ) 1599 )
1362} 1600}
1363 1601
1364sub children {
1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366}
1367
1368sub add { 1602sub add {
1603 my ($self, @widgets) = @_;
1604
1605 for my $child (@widgets) {
1606 $child->{c_rowspan} ||= 1;
1607 $child->{c_colspan} ||= 1;
1608 }
1609
1610 $self->SUPER::add (@widgets);
1611}
1612
1613sub add_at {
1369 my ($self) = shift; 1614 my $self = shift;
1615
1616 my @widgets;
1370 1617
1371 while (@_) { 1618 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1373 $child->set_parent ($self);
1374 $self->{children}[$y][$x] = $child;
1375 }
1376 1620
1377 $self->{force_realloc} = 1; 1621 $child->{c_row} = $row;
1378 $self->{force_size_alloc} = 1; 1622 $child->{c_col} = $col;
1379 $self->realloc;
1380}
1381 1623
1382sub remove { 1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1383 my ($self, $child) = @_; 1631 my ($self) = @_;
1384 1632
1385 # TODO: not yet implemented 1633 my (@w, @h);
1386}
1387
1388# TODO: move to container class maybe? send children a signal on removal?
1389sub clear {
1390 my ($self) = @_;
1391 1634
1392 my @children = $self->children; 1635 my @children = $self->children;
1393 delete $self->{children}; 1636
1637 # first pass, columns
1638 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1640
1641 my $sw = sum @w[$c .. $c + $cs - 1];
1642
1643 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645 }
1394 1646 }
1395 for (@children) {
1396 delete $_->{parent};
1397 $_->hide;
1398 }
1399 1647
1400 $self->realloc; 1648 # second pass, rows
1401} 1649 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)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1416 1651
1417 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1418 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1419 } 1656 }
1420 } 1657 }
1421 1658
1422 (\@w, \@h) 1659 (\@w, \@h)
1423} 1660}
… …
1439 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1440 1677
1441 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1442 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1443 1680
1444 # TODO: nicer code && do row_expand 1681 # now linearly scale the rows/columns to the allocated size
1445 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1446 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1447 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1448 1685
1449 # linearly scale sizes
1450 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452 1687
1453 CFClient::UI::harmonize $ws; 1688 DC::UI::harmonize $ws;
1689
1690 my @row_expand = @{$self->{row_expand}};
1691 @row_expand = (1) x @$ws unless @row_expand;
1692 my $row_expand = (sum @row_expand) || 1;
1693
1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1695
1454 CFClient::UI::harmonize $hs; 1696 DC::UI::harmonize $hs;
1455 1697
1456 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1457 1700
1458 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1459 my $row = $self->{children}[$r] 1702 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 1703
1462 my $x = 0; 1704 $widget->configure (
1463 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1464 1707 );
1465 for my $c (0 .. $#$row) { 1708 }
1466 my $col_w = $ws->[$c];
1467 1709
1468 if (my $widget = $row->[$c]) { 1710 1
1469 $widget->configure ($x, $y, $col_w, $row_h); 1711}
1470 }
1471 1712
1472 $x += $col_w; 1713#############################################################################
1714
1715package DC::UI::Fixed;
1716
1717use List::Util qw(min max);
1718
1719our @ISA = DC::UI::Container::;
1720
1721sub _scale($$$) {
1722 my ($rel, $val, $max) = @_;
1723
1724 $rel ? $val * $max : $val
1725}
1726
1727sub size_request {
1728 my ($self) = @_;
1729
1730 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1731
1732 # determine overall size by querying abs widgets
1733 for my $child ($self->visible_children) {
1734 unless ($child->{c_rel}) {
1735 my $x = $child->{c_x};
1736 my $y = $child->{c_y};
1737
1738 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1739 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1473 } 1740 }
1741 }
1474 1742
1475 $y += $row_h; 1743 my $W = $x2 - $x1;
1744 my $H = $y2 - $y1;
1745
1746 # now layout remaining widgets
1747 for my $child ($self->visible_children) {
1748 if ($child->{c_rel}) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1751
1752 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1753 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1754 }
1755 }
1756
1757 my $W = $x2 - $x1;
1758 my $H = $y2 - $y1;
1759
1760 ($W, $H)
1761}
1762
1763sub invoke_size_allocate {
1764 my ($self, $W, $H) = @_;
1765
1766 for my $child ($self->visible_children) {
1767 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1768 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1769
1770 $x += $child->{c_halign} * $child->{req_w};
1771 $y += $child->{c_valign} * $child->{req_h};
1772
1773 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1476 } 1774 }
1477 1775
1478 1 1776 1
1479} 1777}
1480 1778
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############################################################################# 1779#############################################################################
1506 1780
1507package CFClient::UI::Box; 1781package DC::UI::Box;
1508 1782
1509our @ISA = CFClient::UI::Container::; 1783our @ISA = DC::UI::Container::;
1510 1784
1511sub size_request { 1785sub size_request {
1512 my ($self) = @_; 1786 my ($self) = @_;
1787
1788 my @children = $self->visible_children;
1513 1789
1514 $self->{vertical} 1790 $self->{vertical}
1515 ? ( 1791 ? (
1516 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::max map $_->{req_w}, @children),
1517 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_h}, @children),
1518 ) 1794 )
1519 : ( 1795 : (
1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1796 (List::Util::sum map $_->{req_w}, @children),
1521 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1797 (List::Util::max map $_->{req_h}, @children),
1522 ) 1798 )
1523} 1799}
1524 1800
1525sub invoke_size_allocate { 1801sub invoke_size_allocate {
1526 my ($self, $w, $h) = @_; 1802 my ($self, $w, $h) = @_;
… …
1547 $req[$_] += $space * $children[$_]{expand} 1823 $req[$_] += $space * $children[$_]{expand}
1548 for 0 .. $#children; 1824 for 0 .. $#children;
1549 } 1825 }
1550 } 1826 }
1551 1827
1552 CFClient::UI::harmonize \@req; 1828 DC::UI::harmonize \@req;
1553 1829
1554 my $pos = 0; 1830 my $pos = 0;
1555 for (0 .. $#children) { 1831 for (0 .. $#children) {
1556 my $alloc = $req[$_]; 1832 my $alloc = $req[$_];
1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1833 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1562 1 1838 1
1563} 1839}
1564 1840
1565############################################################################# 1841#############################################################################
1566 1842
1567package CFClient::UI::HBox; 1843package DC::UI::HBox;
1568 1844
1569our @ISA = CFClient::UI::Box::; 1845our @ISA = DC::UI::Box::;
1570 1846
1571sub new { 1847sub new {
1572 my $class = shift; 1848 my $class = shift;
1573 1849
1574 $class->SUPER::new ( 1850 $class->SUPER::new (
… …
1577 ) 1853 )
1578} 1854}
1579 1855
1580############################################################################# 1856#############################################################################
1581 1857
1582package CFClient::UI::VBox; 1858package DC::UI::VBox;
1583 1859
1584our @ISA = CFClient::UI::Box::; 1860our @ISA = DC::UI::Box::;
1585 1861
1586sub new { 1862sub new {
1587 my $class = shift; 1863 my $class = shift;
1588 1864
1589 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1592 ) 1868 )
1593} 1869}
1594 1870
1595############################################################################# 1871#############################################################################
1596 1872
1597package CFClient::UI::Label; 1873package DC::UI::Label;
1598 1874
1599our @ISA = CFClient::UI::DrawBG::; 1875our @ISA = DC::UI::DrawBG::;
1600 1876
1601use CFClient::OpenGL; 1877use DC::OpenGL;
1602 1878
1603sub new { 1879sub new {
1604 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1605 1881
1606 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
… …
1609 #active_bg => none 1885 #active_bg => none
1610 #font => default_font 1886 #font => default_font
1611 #text => initial text 1887 #text => initial text
1612 #markup => initial narkup 1888 #markup => initial narkup
1613 #max_w => maximum pixel width 1889 #max_w => maximum pixel width
1890 #style => 0, # render flags
1614 ellipsise => 3, # end 1891 ellipsise => 3, # end
1615 layout => (new CFClient::Layout), 1892 layout => (new DC::Layout),
1616 fontsize => 1, 1893 fontsize => 1,
1617 align => -1, 1894 align => -1,
1618 valign => -1, 1895 valign => -1,
1619 padding_x => 2, 1896 padding_x => 2,
1620 padding_y => 2, 1897 padding_y => 2,
1621 can_events => 0, 1898 can_events => 0,
1622 %arg 1899 %arg
1623 ); 1900 );
1624 1901
1625 if (exists $self->{template}) { 1902 if (exists $self->{template}) {
1626 my $layout = new CFClient::Layout; 1903 my $layout = new DC::Layout;
1627 $layout->set_text (delete $self->{template}); 1904 $layout->set_text (delete $self->{template});
1628 $self->{template} = $layout; 1905 $self->{template} = $layout;
1629 } 1906 }
1630 1907
1631 if (exists $self->{markup}) { 1908 if (exists $self->{markup}) {
… …
1649 1926
1650 delete $self->{ox}; 1927 delete $self->{ox};
1651 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1652} 1929}
1653 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1654sub set_text { 1937sub set_text {
1655 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1656 1939
1657 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1658 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
… …
1681 1964
1682sub size_request { 1965sub size_request {
1683 my ($self) = @_; 1966 my ($self) = @_;
1684 1967
1685 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1686 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1687 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1688 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1691 1976
1692 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
… …
1764 : ($self->{w} - $size->[0]) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
1765 2050
1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1768 : ($self->{h} - $size->[1]) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1769 }; 2056 };
1770 2057
1771 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2058# unless ($self->{list}) {
1772 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2059# $self->{list} = DC::OpenGL::glGenList;
1773 2060# DC::OpenGL::glNewList $self->{list};
1774 $self->{layout}->render ($self->{ox}, $self->{oy}); 2061# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2062# DC::OpenGL::glEndList;
2063# }
2064#
2065# DC::OpenGL::glCallList $self->{list};
2066
2067 $self->{layout}->draw;
1775} 2068}
2069
2070#sub destroy {
2071# my ($self) = @_;
2072#
2073# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2074#
2075# $self->SUPER::destroy;
2076#}
1776 2077
1777############################################################################# 2078#############################################################################
1778 2079
1779package CFClient::UI::EntryBase; 2080package DC::UI::EntryBase;
1780 2081
1781our @ISA = CFClient::UI::Label::; 2082our @ISA = DC::UI::Label::;
1782 2083
1783use CFClient::OpenGL; 2084use DC::OpenGL;
1784 2085
1785sub new { 2086sub new {
1786 my $class = shift; 2087 my $class = shift;
1787 2088
1788 $class->SUPER::new ( 2089 $class->SUPER::new (
1789 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
1790 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
1791 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
1792 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
1793 can_hover => 1, 2096 can_hover => 1,
1794 can_focus => 1, 2097 can_focus => 1,
1795 valign => 0, 2098 valign => 0,
1796 can_events => 1, 2099 can_events => 1,
2100 ellipsise => 0,
1797 #text => ... 2101 #text => ...
1798 #hidden => "*", 2102 #hidden => "*",
1799 @_ 2103 @_
1800 ) 2104 )
1801} 2105}
… …
1846 my $sym = $ev->{sym}; 2150 my $sym = $ev->{sym};
1847 my $uni = $ev->{unicode}; 2151 my $uni = $ev->{unicode};
1848 2152
1849 my $text = $self->get_text; 2153 my $text = $self->get_text;
1850 2154
2155 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2156
1851 if ($uni == 8) { 2157 if ($uni == 8) {
1852 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2158 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853 } elsif ($uni == 127) { 2159 } elsif ($uni == 127) {
1854 substr $text, $self->{cursor}, 1, ""; 2160 substr $text, $self->{cursor}, 1, "";
1855 } elsif ($sym == CFClient::SDLK_LEFT) { 2161 } elsif ($sym == DC::SDLK_LEFT) {
1856 --$self->{cursor} if $self->{cursor}; 2162 --$self->{cursor} if $self->{cursor};
1857 } elsif ($sym == CFClient::SDLK_RIGHT) { 2163 } elsif ($sym == DC::SDLK_RIGHT) {
1858 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2164 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1859 } elsif ($sym == CFClient::SDLK_HOME) { 2165 } elsif ($sym == DC::SDLK_HOME) {
2166 # what a hack
2167 $self->{cursor} =
2168 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2169 ? length $1
2170 : 0;
2171 } elsif ($sym == DC::SDLK_END) {
2172 # uh, again
2173 $self->{cursor} =
2174 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2175 ? $self->{cursor} + length $1
2176 : length $self->{text};
2177 } elsif ($uni == 21) { # ctrl-u
2178 $text = "";
1860 $self->{cursor} = 0; 2179 $self->{cursor} = 0;
1861 } elsif ($sym == CFClient::SDLK_END) {
1862 $self->{cursor} = length $text;
1863 } elsif ($uni == 27) { 2180 } elsif ($uni == 27) {
1864 $self->emit ('escape'); 2181 $self->emit ('escape');
1865 } elsif ($uni) { 2182 } elsif ($uni == 0x0d) {
2183 substr $text, $self->{cursor}++, 0, "\012";
2184 } elsif ($uni >= 0x20) {
1866 substr $text, $self->{cursor}++, 0, chr $uni; 2185 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else { 2186 } else {
1868 return 0; 2187 return 0;
1869 } 2188 }
1870 2189
1871 $self->_set_text ($text); 2190 $self->_set_text ($text);
1872 2191
1873 $self->realloc; 2192 $self->realloc;
2193 $self->update;
1874 2194
1875 1 2195 1
1876} 2196}
1877 2197
1878sub invoke_focus_in { 2198sub invoke_focus_in {
… …
1920 glColor_premultiply @{$self->{bg}}; 2240 glColor_premultiply @{$self->{bg}};
1921 } 2241 }
1922 2242
1923 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
1924 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1925 glBegin GL_QUADS;
1926 glVertex 0 , 0;
1927 glVertex 0 , $self->{h};
1928 glVertex $self->{w}, $self->{h}; 2245 glRect 0, 0, $self->{w}, $self->{h};
1929 glVertex $self->{w}, 0;
1930 glEnd;
1931 glDisable GL_BLEND; 2246 glDisable GL_BLEND;
1932 2247
1933 $self->SUPER::_draw; 2248 $self->SUPER::_draw;
1934 2249
1935 #TODO: force update every cursor change :( 2250 #TODO: force update every cursor change :(
… …
1937 2252
1938 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
1939 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
1940 utf8::encode $text; 2255 utf8::encode $text;
1941 2256
1942 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1943 } 2258 }
1944 2259
1945 glColor @{$self->{fg}}; 2260 glColor_premultiply @{$self->{active_fg}};
1946 glBegin GL_LINES; 2261 glBegin GL_LINES;
1947 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1948 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949 glEnd; 2264 glEnd;
1950 }
1951}
1952 2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2269 glLineWidth 1;
2270
2271 } else {
2272 glColor @{$self->{outline}};
2273 glBegin GL_LINE_STRIP;
2274 glVertex .5, $self->{h} * .5;
2275 glVertex .5, $self->{h} - 2.5;
2276 glVertex $self->{w} - .5, $self->{h} - 2.5;
2277 glVertex $self->{w} - .5, $self->{h} * .5;
2278 glEnd;
2279 }
2280}
2281
2282#############################################################################
2283
1953package CFClient::UI::Entry; 2284package DC::UI::Entry;
1954 2285
1955our @ISA = CFClient::UI::EntryBase::; 2286our @ISA = DC::UI::EntryBase::;
1956 2287
1957use CFClient::OpenGL; 2288use DC::OpenGL;
1958 2289
1959sub invoke_key_down { 2290sub invoke_key_down {
1960 my ($self, $ev) = @_; 2291 my ($self, $ev) = @_;
1961 2292
1962 my $sym = $ev->{sym}; 2293 my $sym = $ev->{sym};
1963 2294
1964 if ($sym == 13) { 2295 if ($ev->{uni} == 0x0d || $sym == 13) {
1965 unshift @{$self->{history}}, 2296 unshift @{$self->{history}},
1966 my $txt = $self->get_text; 2297 my $txt = $self->get_text;
1967 2298
1968 $self->{history_pointer} = -1; 2299 $self->{history_pointer} = -1;
1969 $self->{history_saveback} = ''; 2300 $self->{history_saveback} = '';
1970 $self->emit (activate => $txt); 2301 $self->emit (activate => $txt);
1971 $self->update; 2302 $self->update;
1972 2303
1973 } elsif ($sym == CFClient::SDLK_UP) { 2304 } elsif ($sym == DC::SDLK_UP) {
1974 if ($self->{history_pointer} < 0) { 2305 if ($self->{history_pointer} < 0) {
1975 $self->{history_saveback} = $self->get_text; 2306 $self->{history_saveback} = $self->get_text;
1976 } 2307 }
1977 if (@{$self->{history} || []} > 0) { 2308 if (@{$self->{history} || []} > 0) {
1978 $self->{history_pointer}++; 2309 $self->{history_pointer}++;
… …
1980 $self->{history_pointer} = @{$self->{history} || []} - 1; 2311 $self->{history_pointer} = @{$self->{history} || []} - 1;
1981 } 2312 }
1982 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1983 } 2314 }
1984 2315
1985 } elsif ($sym == CFClient::SDLK_DOWN) { 2316 } elsif ($sym == DC::SDLK_DOWN) {
1986 $self->{history_pointer}--; 2317 $self->{history_pointer}--;
1987 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2318 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988 2319
1989 if ($self->{history_pointer} >= 0) { 2320 if ($self->{history_pointer} >= 0) {
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2321 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1999 1 2330 1
2000} 2331}
2001 2332
2002############################################################################# 2333#############################################################################
2003 2334
2335package DC::UI::TextEdit;
2336
2337our @ISA = DC::UI::EntryBase::;
2338
2339use DC::OpenGL;
2340
2341sub move_cursor_ver {
2342 my ($self, $dy) = @_;
2343
2344 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2345
2346 $y += $dy;
2347
2348 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2349 $self->{cursor} = $index;
2350 delete $self->{cur_h};
2351 $self->update;
2352 return;
2353 }
2354}
2355
2356sub invoke_key_down {
2357 my ($self, $ev) = @_;
2358
2359 my $sym = $ev->{sym};
2360
2361 if ($sym == DC::SDLK_UP) {
2362 $self->move_cursor_ver (-1);
2363 } elsif ($sym == DC::SDLK_DOWN) {
2364 $self->move_cursor_ver (+1);
2365 } else {
2366 return $self->SUPER::invoke_key_down ($ev)
2367 }
2368
2369 1
2370}
2371
2372#############################################################################
2373
2004package CFClient::UI::Button; 2374package DC::UI::ButtonBin;
2005 2375
2006our @ISA = CFClient::UI::Label::; 2376our @ISA = DC::UI::Bin::;
2007 2377
2008use CFClient::OpenGL; 2378use DC::OpenGL;
2009 2379
2010my @tex = 2380my @tex =
2011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2381 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2012 qw(b1_button_active.png); 2382 qw(b1_button_inactive.png b1_button_active.png);
2013 2383
2014sub new { 2384sub new {
2015 my $class = shift; 2385 my $class = shift;
2016 2386
2017 $class->SUPER::new ( 2387 $class->SUPER::new (
2018 padding_x => 4,
2019 padding_y => 4,
2020 fg => [1, 1, 1],
2021 active_fg => [0, 0, 1],
2022 can_hover => 1, 2388 can_hover => 1,
2023 align => 0, 2389 align => 0,
2024 valign => 0, 2390 valign => 0,
2025 can_events => 1, 2391 can_events => 1,
2026 @_ 2392 @_
… …
2038} 2404}
2039 2405
2040sub _draw { 2406sub _draw {
2041 my ($self) = @_; 2407 my ($self) = @_;
2042 2408
2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2044
2045 glEnable GL_TEXTURE_2D; 2409 glEnable GL_TEXTURE_2D;
2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2047 glColor 0, 0, 0, 1; 2411 glColor 0, 0, 0, 1;
2048 2412
2413 my $tex = $tex[$GRAB == $self];
2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2414 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2050 2415
2051 glDisable GL_TEXTURE_2D; 2416 glDisable GL_TEXTURE_2D;
2052 2417
2053 $self->SUPER::_draw; 2418 $self->SUPER::_draw;
2054} 2419}
2055 2420
2056############################################################################# 2421#############################################################################
2057 2422
2058package CFClient::UI::CheckBox; 2423package DC::UI::Button;
2059 2424
2060our @ISA = CFClient::UI::DrawBG::; 2425our @ISA = DC::UI::Label::;
2426
2427use DC::OpenGL;
2061 2428
2062my @tex = 2429my @tex =
2063 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2430 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2431 qw(b1_button_inactive.png b1_button_active.png);
2432
2433sub new {
2434 my $class = shift;
2435
2436 $class->SUPER::new (
2437 padding_x => 4,
2438 padding_y => 4,
2439 fg => [1.0, 1.0, 1.0],
2440 active_fg => [0.8, 0.8, 0.8],
2441 can_hover => 1,
2442 align => 0,
2443 valign => 0,
2444 can_events => 1,
2445 @_
2446 )
2447}
2448
2449sub invoke_button_up {
2450 my ($self, $ev, $x, $y) = @_;
2451
2452 $self->emit ("activate")
2453 if $x >= 0 && $x < $self->{w}
2454 && $y >= 0 && $y < $self->{h};
2455
2456 1
2457}
2458
2459sub _draw {
2460 my ($self) = @_;
2461
2462 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2463
2464 glEnable GL_TEXTURE_2D;
2465 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2466 glColor 0, 0, 0, 1;
2467
2468 my $tex = $tex[$GRAB == $self];
2469 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470
2471 glDisable GL_TEXTURE_2D;
2472
2473 $self->SUPER::_draw;
2474}
2475
2476#############################################################################
2477
2478package DC::UI::CheckBox;
2479
2480our @ISA = DC::UI::DrawBG::;
2481
2482my @tex =
2483 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2064 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2484 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065 2485
2066use CFClient::OpenGL; 2486use DC::OpenGL;
2067 2487
2068sub new { 2488sub new {
2069 my $class = shift; 2489 my $class = shift;
2070 2490
2071 $class->SUPER::new ( 2491 $class->SUPER::new (
… …
2111sub _draw { 2531sub _draw {
2112 my ($self) = @_; 2532 my ($self) = @_;
2113 2533
2114 $self->SUPER::_draw; 2534 $self->SUPER::_draw;
2115 2535
2116 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2536 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2117 2537
2118 my ($w, $h) = @$self{qw(w h)}; 2538 my ($w, $h) = @$self{qw(w h)};
2119 2539
2120 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2540 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2121 2541
… …
2128 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
2129} 2549}
2130 2550
2131############################################################################# 2551#############################################################################
2132 2552
2133package CFClient::UI::Image; 2553package DC::UI::Image;
2134 2554
2135our @ISA = CFClient::UI::Base::; 2555our @ISA = DC::UI::Base::;
2136 2556
2137use CFClient::OpenGL; 2557use DC::OpenGL;
2138 2558
2139our %texture_cache; 2559our %texture_cache;
2140 2560
2141sub new { 2561sub new {
2142 my $class = shift; 2562 my $class = shift;
2143 2563
2144 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2145 can_events => 0, 2565 can_events => 0,
2566 scale => 1,
2146 @_, 2567 @_,
2147 ); 2568 );
2148 2569
2149 $self->{path} || $self->{tex} 2570 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required"; 2571 or Carp::croak "'path' or 'tex' attributes required";
2151 2572
2152 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2573 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2574 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2154 2575
2155 Scalar::Util::weaken $texture_cache{$self->{path}}; 2576 DC::weaken $texture_cache{$self->{path}};
2156 2577
2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2578 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158 2579
2159 $self 2580 $self
2160} 2581}
2161 2582
2162sub STORABLE_freeze { 2583sub STORABLE_freeze {
2163 my ($self, $cloning) = @_; 2584 my ($self, $cloning) = @_;
2164 2585
2165 $self->{path} 2586 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2587 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2167 2588
2168 $self->{path} 2589 $self->{path}
2169} 2590}
2170 2591
2171sub STORABLE_attach { 2592sub STORABLE_attach {
… …
2175} 2596}
2176 2597
2177sub size_request { 2598sub size_request {
2178 my ($self) = @_; 2599 my ($self) = @_;
2179 2600
2180 ($self->{tex}{w}, $self->{tex}{h}) 2601 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2181} 2602}
2182 2603
2183sub _draw { 2604sub _draw {
2184 my ($self) = @_; 2605 my ($self) = @_;
2185 2606
… …
2195 } 2616 }
2196 2617
2197 glEnable GL_TEXTURE_2D; 2618 glEnable GL_TEXTURE_2D;
2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199 2620
2200 $tex->draw_quad (0, 0, $w, $h); 2621 $tex->draw_quad_alpha (0, 0, $w, $h);
2201 2622
2202 glDisable GL_TEXTURE_2D; 2623 glDisable GL_TEXTURE_2D;
2203} 2624}
2204 2625
2205############################################################################# 2626#############################################################################
2206 2627
2207package CFClient::UI::ImageButton; 2628package DC::UI::ImageButton;
2208 2629
2209our @ISA = CFClient::UI::Image::; 2630our @ISA = DC::UI::Image::;
2210 2631
2211use CFClient::OpenGL; 2632use DC::OpenGL;
2212 2633
2213my %textures; 2634my %textures;
2214 2635
2215sub new { 2636sub new {
2216 my $class = shift; 2637 my $class = shift;
… …
2226 can_events => 1, 2647 can_events => 1,
2227 @_ 2648 @_
2228 ); 2649 );
2229} 2650}
2230 2651
2652sub invoke_button_down {
2653 my ($self, $ev, $x, $y) = @_;
2654
2655 1
2656}
2657
2231sub invoke_button_up { 2658sub invoke_button_up {
2232 my ($self, $ev, $x, $y) = @_; 2659 my ($self, $ev, $x, $y) = @_;
2233 2660
2234 $self->emit ("activate") 2661 $self->emit ("activate")
2235 if $x >= 0 && $x < $self->{w} 2662 if $x >= 0 && $x < $self->{w}
… …
2238 1 2665 1
2239} 2666}
2240 2667
2241############################################################################# 2668#############################################################################
2242 2669
2243package CFClient::UI::VGauge; 2670package DC::UI::VGauge;
2244 2671
2245our @ISA = CFClient::UI::Base::; 2672our @ISA = DC::UI::Base::;
2246 2673
2247use List::Util qw(min max); 2674use List::Util qw(min max);
2248 2675
2249use CFClient::OpenGL; 2676use DC::OpenGL;
2250 2677
2251my %tex = ( 2678my %tex = (
2252 food => [ 2679 food => [
2253 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2254 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2681 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255 ], 2682 ],
2256 grace => [ 2683 grace => [
2257 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2258 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2685 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259 ], 2686 ],
2260 hp => [ 2687 hp => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2688 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2262 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2689 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263 ], 2690 ],
2264 mana => [ 2691 mana => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2692 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2266 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2693 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267 ], 2694 ],
2268); 2695);
2269 2696
2270# eg. VGauge->new (gauge => 'food'), default gauge: food 2697# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2373 glDisable GL_TEXTURE_2D; 2800 glDisable GL_TEXTURE_2D;
2374} 2801}
2375 2802
2376############################################################################# 2803#############################################################################
2377 2804
2805package DC::UI::Progress;
2806
2807our @ISA = DC::UI::Label::;
2808
2809use DC::OpenGL;
2810
2811sub new {
2812 my ($class, %arg) = @_;
2813
2814 my $self = $class->SUPER::new (
2815 fg => [1, 1, 1],
2816 bg => [0, 0, 1, 0.2],
2817 bar => [0.7, 0.5, 0.1, 0.8],
2818 outline => [0.4, 0.3, 0],
2819 fontsize => 0.9,
2820 valign => 0,
2821 align => 0,
2822 can_events => 1,
2823 ellipsise => 1,
2824 label => "%d%%",
2825 %arg,
2826 );
2827
2828 $self->set_value ($arg{value} || -1);
2829
2830 $self
2831}
2832
2833sub set_label {
2834 my ($self, $label) = @_;
2835
2836 return if $self->{label} eq $label;
2837 $self->{label} = $label;
2838
2839 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2840}
2841
2842sub set_value {
2843 my ($self, $value) = @_;
2844
2845 if ($self->{value} ne $value) {
2846 $self->{value} = $value;
2847
2848 if ($value < 0) {
2849 $self->set_text ("-");
2850 } else {
2851 $self->set_text (sprintf $self->{label}, $value * 100);
2852 }
2853
2854 $self->update;
2855 }
2856}
2857
2858sub _draw {
2859 my ($self) = @_;
2860
2861 glEnable GL_BLEND;
2862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2863
2864 if ($self->{value} >= 0) {
2865 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2866
2867 glColor_premultiply @{$self->{bar}};
2868 glRect 2, 2, $s, $self->{h} - 2;
2869 glColor_premultiply @{$self->{bg}};
2870 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2871 }
2872
2873 glColor_premultiply @{$self->{outline}};
2874 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2875
2876 glDisable GL_BLEND;
2877
2878 {
2879 local $self->{bg}; # do not draw background
2880 $self->SUPER::_draw;
2881 }
2882}
2883
2884#############################################################################
2885
2886package DC::UI::ExperienceProgress;
2887
2888our @ISA = DC::UI::Progress::;
2889
2890sub new {
2891 my ($class, %arg) = @_;
2892
2893 my $self = $class->SUPER::new (
2894 tooltip => sub {
2895 my ($self) = @_;
2896
2897 sprintf "level %d\n%s points\n%s next level\n%s to go",
2898 $self->{lvl},
2899 ::formsep ($self->{exp}),
2900 ::formsep ($self->{nxt}),
2901 ::formsep ($self->{nxt} - $self->{exp}),
2902 },
2903 %arg
2904 );
2905
2906 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2907 if $::CONN;
2908
2909 $self
2910}
2911
2912sub DESTROY {
2913 my ($self) = @_;
2914
2915 delete $::CONN->{on_exp_update}{$self+0}
2916 if $::CONN;
2917
2918 $self->SUPER::DESTROY;
2919}
2920
2921sub set_value {
2922 my ($self, $lvl, $exp) = @_;
2923
2924 $self->{lvl} = $lvl;
2925 $self->{exp} = $exp;
2926
2927 my $v = -1;
2928
2929 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2930 my $l0 = $table->[$lvl - 1];
2931 my $l1 = $table->[$lvl];
2932
2933 $self->{nxt} = $l1;
2934
2935 $v = ($exp - $l0) / ($l1 - $l0);
2936 }
2937
2938 $self->SUPER::set_value ($v);
2939}
2940
2941#############################################################################
2942
2378package CFClient::UI::Gauge; 2943package DC::UI::Gauge;
2379 2944
2380our @ISA = CFClient::UI::VBox::; 2945our @ISA = DC::UI::VBox::;
2381 2946
2382sub new { 2947sub new {
2383 my ($class, %arg) = @_; 2948 my ($class, %arg) = @_;
2384 2949
2385 my $self = $class->SUPER::new ( 2950 my $self = $class->SUPER::new (
… …
2387 can_hover => 1, 2952 can_hover => 1,
2388 can_events => 1, 2953 can_events => 1,
2389 %arg, 2954 %arg,
2390 ); 2955 );
2391 2956
2392 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2957 $self->add ($self->{value} = new DC::UI::Label valign => +1, align => 0, template => "999");
2393 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2958 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2394 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2959 $self->add ($self->{max} = new DC::UI::Label valign => -1, align => 0, template => "999");
2395 2960
2396 $self 2961 $self
2397} 2962}
2398 2963
2399sub set_fontsize { 2964sub set_fontsize {
… …
2420 $self->{value}->set_text ($val); 2985 $self->{value}->set_text ($val);
2421} 2986}
2422 2987
2423############################################################################# 2988#############################################################################
2424 2989
2425package CFClient::UI::Slider; 2990package DC::UI::Slider;
2426 2991
2427use strict; 2992use strict;
2428 2993
2429use CFClient::OpenGL; 2994use DC::OpenGL;
2430 2995
2431our @ISA = CFClient::UI::DrawBG::; 2996our @ISA = DC::UI::DrawBG::;
2432 2997
2433my @tex = 2998my @tex =
2434 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2999 map { new_from_file DC::Texture DC::find_rcfile $_ }
2435 qw(s1_slider.png s1_slider_bg.png); 3000 qw(s1_slider.png s1_slider_bg.png);
2436 3001
2437sub new { 3002sub new {
2438 my $class = shift; 3003 my $class = shift;
2439 3004
… …
2507 3072
2508 $self->SUPER::invoke_button_down ($ev, $x, $y); 3073 $self->SUPER::invoke_button_down ($ev, $x, $y);
2509 3074
2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3075 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2511 3076
2512 $self->invoke_mouse_motion ($ev, $x, $y) 3077 $self->invoke_mouse_motion ($ev, $x, $y);
3078
3079 1
2513} 3080}
2514 3081
2515sub invoke_mouse_motion { 3082sub invoke_mouse_motion {
2516 my ($self, $ev, $x, $y) = @_; 3083 my ($self, $ev, $x, $y) = @_;
2517 3084
… …
2533sub invoke_mouse_wheel { 3100sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
2535 3102
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3103 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537 3104
3105 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3106
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3107 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539 3108
2540 ! ! $delta 3109 1
2541} 3110}
2542 3111
2543sub update { 3112sub update {
2544 my ($self) = @_; 3113 my ($self) = @_;
2545 3114
… …
2594 glDisable GL_TEXTURE_2D; 3163 glDisable GL_TEXTURE_2D;
2595} 3164}
2596 3165
2597############################################################################# 3166#############################################################################
2598 3167
2599package CFClient::UI::ValSlider; 3168package DC::UI::ValSlider;
2600 3169
2601our @ISA = CFClient::UI::HBox::; 3170our @ISA = DC::UI::HBox::;
2602 3171
2603sub new { 3172sub new {
2604 my ($class, %arg) = @_; 3173 my ($class, %arg) = @_;
2605 3174
2606 my $range = delete $arg{range}; 3175 my $range = delete $arg{range};
2607 3176
2608 my $self = $class->SUPER::new ( 3177 my $self = $class->SUPER::new (
2609 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3178 slider => (new DC::UI::Slider expand => 1, range => $range),
2610 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3179 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2611 to_value => sub { shift }, 3180 to_value => sub { shift },
2612 from_value => sub { shift }, 3181 from_value => sub { shift },
2613 %arg, 3182 %arg,
2614 ); 3183 );
2615 3184
… …
2635sub set_range { shift->{slider}->set_range (@_) } 3204sub set_range { shift->{slider}->set_range (@_) }
2636sub set_value { shift->{slider}->set_value (@_) } 3205sub set_value { shift->{slider}->set_value (@_) }
2637 3206
2638############################################################################# 3207#############################################################################
2639 3208
2640package CFClient::UI::TextScroller; 3209package DC::UI::TextScroller;
2641 3210
2642our @ISA = CFClient::UI::HBox::; 3211our @ISA = DC::UI::HBox::;
2643 3212
2644use CFClient::OpenGL; 3213use DC::OpenGL;
2645 3214
2646sub new { 3215sub new {
2647 my $class = shift; 3216 my $class = shift;
2648 3217
2649 my $self = $class->SUPER::new ( 3218 my $self = $class->SUPER::new (
… …
2651 can_events => 1, 3220 can_events => 1,
2652 indent => 0, 3221 indent => 0,
2653 #font => default_font 3222 #font => default_font
2654 @_, 3223 @_,
2655 3224
2656 layout => (new CFClient::Layout), 3225 layout => (new DC::Layout),
2657 par => [], 3226 par => [],
3227 max_par => 0,
2658 height => 0, 3228 height => 0,
2659 children => [ 3229 children => [
2660 (new CFClient::UI::Empty expand => 1), 3230 (new DC::UI::Empty expand => 1),
2661 (new CFClient::UI::Slider vertical => 1), 3231 (new DC::UI::Slider vertical => 1),
2662 ], 3232 ],
2663 ); 3233 );
2664 3234
2665 $self->{children}[1]->connect (changed => sub { $self->update }); 3235 $self->{children}[1]->connect (changed => sub { $self->update });
2666 3236
… …
2675} 3245}
2676 3246
2677sub size_request { 3247sub size_request {
2678 my ($self) = @_; 3248 my ($self) = @_;
2679 3249
2680 my ($empty, $slider) = @{ $self->{children} }; 3250 my ($empty, $slider) = $self->visible_children;
2681 3251
2682 local $self->{children} = [$empty, $slider]; 3252 local $self->{children} = [$empty, $slider];
2683 $self->SUPER::size_request 3253 $self->SUPER::size_request
2684} 3254}
2685 3255
… …
2743 3313
2744 # todo: base offset on lines or so, not on pixels 3314 # todo: base offset on lines or so, not on pixels
2745 $self->{children}[1]->set_value ($offset); 3315 $self->{children}[1]->set_value ($offset);
2746} 3316}
2747 3317
3318sub current_paragraph {
3319 my ($self) = @_;
3320
3321 $self->{top_paragraph} - 1
3322}
3323
3324sub scroll_to {
3325 my ($self, $para) = @_;
3326
3327 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3328
3329 $self->{scroll_to} = $para;
3330 $self->update;
3331}
3332
2748sub clear { 3333sub clear {
2749 my ($self) = @_; 3334 my ($self) = @_;
2750 3335
2751 my (undef, undef, @other) = @{ $self->{children} }; 3336 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other; 3337 $self->remove ($_) for @other;
… …
2755 $self->{height} = 0; 3340 $self->{height} = 0;
2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3341 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757} 3342}
2758 3343
2759sub add_paragraph { 3344sub add_paragraph {
2760 my ($self, $color, $para, $indent) = @_; 3345 my $self = shift;
2761 3346
2762 my ($text, @w) = ref $para ? @$para : $para; 3347 for my $para (@_) {
2763
2764 $para = { 3348 $para = {
3349 fg => [1, 1, 1, 1],
3350 indent => 0,
3351 markup => "",
3352 widget => [],
3353 ref $para ? %$para : (markup => $para),
2765 w => 1e10, 3354 w => 1e10,
2766 wrapped => 1, 3355 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2771 }; 3356 };
2772 3357
2773 $self->add (@w) if @w; 3358 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para; 3359 push @{$self->{par}}, $para;
3360 }
3361
3362 if (my $max = $self->{max_par}) {
3363 shift @{$self->{par}} while @{$self->{par}} > $max;
3364 }
2775 3365
2776 $self->{need_reflow}++; 3366 $self->{need_reflow}++;
2777 $self->update; 3367 $self->update;
2778} 3368}
2779 3369
2780sub scroll_to_bottom { 3370sub scroll_to_bottom {
2781 my ($self) = @_; 3371 my ($self) = @_;
2782 3372
2783 $self->{scroll_to_bottom} = 1; 3373 $self->{scroll_to} = $#{$self->{par}};
2784 $self->update; 3374 $self->update;
2785} 3375}
2786 3376
3377sub force_uptodate {
3378 my ($self) = @_;
3379
3380 if (delete $self->{need_reflow}) {
3381 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3382
3383 my $height = 0;
3384
3385 for my $para (@{$self->{par}}) {
3386 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3387 my $layout = $self->get_layout ($para);
3388 my ($w, $h) = $layout->size;
3389
3390 $para->{w} = $w + $para->{indent};
3391 $para->{h} = $h;
3392 $para->{wrapped} = $layout->has_wrapped;
3393 }
3394
3395 $para->{y} = $height;
3396 $height += $para->{h};
3397 }
3398
3399 $self->{height} = $height;
3400 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3401
3402 delete $self->{texture};
3403 }
3404
3405 if (my $paridx = delete $self->{scroll_to}) {
3406 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3407 }
3408}
3409
2787sub update { 3410sub update {
2788 my ($self) = @_; 3411 my ($self) = @_;
2789 3412
2790 $self->SUPER::update; 3413 $self->SUPER::update;
2791 3414
2792 return unless $self->{h} > 0; 3415 return unless $self->{h} > 0;
2793 3416
2794 delete $self->{texture}; 3417 delete $self->{texture};
2795 3418
2796 $ROOT->on_post_alloc ($self => sub { 3419 $ROOT->on_post_alloc ($self => sub {
3420 $self->force_uptodate;
3421
2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3422 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798 3423
2799 if (delete $self->{need_reflow}) {
2800 my $height = 0;
2801
2802 for my $para (@{$self->{par}}) {
2803 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2804 my $layout = $self->get_layout ($para);
2805 my ($w, $h) = $layout->size;
2806
2807 $para->{w} = $w + $para->{indent};
2808 $para->{h} = $h;
2809 $para->{wrapped} = $layout->has_wrapped;
2810 }
2811
2812 $height += $para->{h};
2813 }
2814
2815 $self->{height} = $height;
2816
2817 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2818
2819 delete $self->{texture};
2820 }
2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2824 }
2825
2826 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3424 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2827 glClearColor 0, 0, 0, 0; 3425 glClearColor 0, 0, 0, 0;
2828 glClear GL_COLOR_BUFFER_BIT; 3426 glClear GL_COLOR_BUFFER_BIT;
2829 3427
3428 package DC::UI::Base;
3429 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3430 (0, 0, $self->{w}, $self->{h});
3431
3432 my $top = int $self->{children}[1]{range}[0];
3433
3434 my $paridx = 0;
3435 my $top_paragraph;
2830 my $top = int $self->{children}[1]{range}[0]; 3436 my $top = int $self->{children}[1]{range}[0];
2831 3437
2832 my $y0 = $top; 3438 my $y0 = $top;
2833 my $y1 = $top + $H; 3439 my $y1 = $top + $H;
2834 3440
2835 my $y = 0;
2836
2837 for my $para (@{$self->{par}}) { 3441 for my $para (@{$self->{par}}) {
2838 my $h = $para->{h}; 3442 my $h = $para->{h};
3443 my $y = $para->{y};
2839 3444
2840 if ($y0 < $y + $h && $y < $y1) { 3445 if ($y0 < $y + $h && $y < $y1) {
2841
2842 my $layout = $self->get_layout ($para); 3446 my $layout = $self->get_layout ($para);
2843 3447
2844 $layout->render ($para->{indent}, $y - $y0); 3448 $layout->render ($para->{indent}, $y - $y0);
3449 $layout->draw;
2845 3450
2846 if (my @w = @{ $para->{widget} }) { 3451 if (my @w = @{ $para->{widget} }) {
2847 my @s = $layout->get_shapes; 3452 my @s = $layout->get_shapes;
2848 3453
2849 for (@w) { 3454 for (@w) {
… …
2855 $_->draw; 3460 $_->draw;
2856 } 3461 }
2857 } 3462 }
2858 } 3463 }
2859 3464
2860 $y += $h; 3465 $paridx++;
3466 $top_paragraph ||= $paridx if $y >= $top;
2861 } 3467 }
3468
3469 $self->{top_paragraph} = $top_paragraph;
2862 }; 3470 };
2863 }); 3471 });
2864} 3472}
2865 3473
2866sub reconfigure { 3474sub reconfigure {
… …
2884 $self->{children}[1]->draw; 3492 $self->{children}[1]->draw;
2885} 3493}
2886 3494
2887############################################################################# 3495#############################################################################
2888 3496
2889package CFClient::UI::Animator; 3497package DC::UI::Animator;
2890 3498
2891use CFClient::OpenGL; 3499use DC::OpenGL;
2892 3500
2893our @ISA = CFClient::UI::Bin::; 3501our @ISA = DC::UI::Bin::;
2894 3502
2895sub moveto { 3503sub moveto {
2896 my ($self, $x, $y) = @_; 3504 my ($self, $x, $y) = @_;
2897 3505
2898 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3506 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2926 glPopMatrix; 3534 glPopMatrix;
2927} 3535}
2928 3536
2929############################################################################# 3537#############################################################################
2930 3538
2931package CFClient::UI::Flopper; 3539package DC::UI::Flopper;
2932 3540
2933our @ISA = CFClient::UI::Button::; 3541our @ISA = DC::UI::Button::;
2934 3542
2935sub new { 3543sub new {
2936 my $class = shift; 3544 my $class = shift;
2937 3545
2938 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
… …
2950 $self->{other}->toggle_visibility; 3558 $self->{other}->toggle_visibility;
2951} 3559}
2952 3560
2953############################################################################# 3561#############################################################################
2954 3562
2955package CFClient::UI::Tooltip; 3563package DC::UI::Tooltip;
2956 3564
2957our @ISA = CFClient::UI::Bin::; 3565our @ISA = DC::UI::Bin::;
2958 3566
2959use CFClient::OpenGL; 3567use DC::OpenGL;
2960 3568
2961sub new { 3569sub new {
2962 my $class = shift; 3570 my $class = shift;
2963 3571
2964 $class->SUPER::new ( 3572 $class->SUPER::new (
… …
2968} 3576}
2969 3577
2970sub set_tooltip_from { 3578sub set_tooltip_from {
2971 my ($self, $widget) = @_; 3579 my ($self, $widget) = @_;
2972 3580
2973 my $tooltip = $widget->{tooltip}; 3581 my $tip = $widget->{tooltip};
3582 $tip = $tip->($widget) if "CODE" eq ref $tip;
3583
3584 $tip = DC::Pod::section_label tooltip => $1
3585 if $tip =~ /^#(.*)$/;
2974 3586
2975 if ($ENV{CFPLUS_DEBUG} & 2) { 3587 if ($ENV{CFPLUS_DEBUG} & 2) {
2976 $tooltip .= "\n\n" . (ref $widget) . "\n" 3588 $tip .= "\n\n" . (ref $widget) . "\n"
2977 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3589 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2978 . "req $widget->{req_w} $widget->{req_h}\n" 3590 . "req $widget->{req_w} $widget->{req_h}\n"
2979 . "visible $widget->{visible}"; 3591 . "visible $widget->{visible}";
2980 } 3592 }
2981 3593
2982 $tooltip =~ s/^\n+//; 3594 $tip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//; 3595 $tip =~ s/\n+$//;
2984 3596
2985 $self->add (new CFClient::UI::Label 3597 $self->add (new DC::UI::Label
2986 markup => $tooltip, 3598 markup => $tip,
2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2988 fontsize => 0.8, 3600 fontsize => 0.8,
2989 fg => [0, 0, 0, 1], 3601 style => 1, # FLAG_INVERSE
2990 ellipsise => 0, 3602 ellipsise => 0,
2991 font => ($widget->{tooltip_font} || $::FONT_PROP), 3603 font => ($widget->{tooltip_font} || $::FONT_PROP),
2992 ); 3604 );
2993} 3605}
2994 3606
… …
3029} 3641}
3030 3642
3031sub _draw { 3643sub _draw {
3032 my ($self) = @_; 3644 my ($self) = @_;
3033 3645
3034 glTranslate 0.375, 0.375;
3035
3036 my ($w, $h) = @$self{qw(w h)}; 3646 my ($w, $h) = @$self{qw(w h)};
3037 3647
3038 glColor 1, 0.8, 0.4; 3648 glColor 1, 0.8, 0.4;
3039 glBegin GL_QUADS; 3649 glRect 0, 0, $w, $h;
3040 glVertex 0 , 0;
3041 glVertex 0 , $h;
3042 glVertex $w, $h;
3043 glVertex $w, 0;
3044 glEnd;
3045 3650
3046 glColor 0, 0, 0; 3651 glColor 0, 0, 0;
3047 glBegin GL_LINE_LOOP; 3652 glRect_lineloop .5, .5, $w + .5, $h + .5;
3048 glVertex 0 , 0;
3049 glVertex 0 , $h;
3050 glVertex $w, $h;
3051 glVertex $w, 0;
3052 glEnd;
3053 3653
3054 glTranslate 2 - 0.375, 2 - 0.375; 3654 glTranslate 2, 2;
3055 3655
3056 $self->SUPER::_draw; 3656 $self->SUPER::_draw;
3057} 3657}
3058 3658
3059############################################################################# 3659#############################################################################
3060 3660
3061package CFClient::UI::Face; 3661package DC::UI::Face;
3062 3662
3063our @ISA = CFClient::UI::DrawBG::; 3663our @ISA = DC::UI::DrawBG::;
3064 3664
3065use CFClient::OpenGL; 3665use DC::OpenGL;
3066 3666
3067sub new { 3667sub new {
3068 my $class = shift; 3668 my $class = shift;
3069 3669
3070 my $self = $class->SUPER::new ( 3670 my $self = $class->SUPER::new (
3671 size_w => 32,
3672 size_h => 8,
3071 aspect => 1, 3673 aspect => 1,
3072 can_events => 0, 3674 can_events => 0,
3073 @_, 3675 @_,
3074 ); 3676 );
3075 3677
3076 if ($self->{anim} && $self->{animspeed}) { 3678 if ($self->{anim} && $self->{animspeed}) {
3077 Scalar::Util::weaken (my $widget = $self); 3679 DC::weaken (my $widget = $self);
3078 3680
3079 $self->{timer} = Event->timer ( 3681 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3080 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3682 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3081 hard => 1, 3683 return unless $::CONN;
3082 interval => $self->{animspeed}, 3684
3083 cb => sub { 3685 my $w = $widget
3686 or return;
3687
3084 ++$widget->{frame}; 3688 ++$w->{frame};
3689 $w->update_face;
3690
3691 # somehow, $widget can go away
3085 $widget->update; 3692 $w->update;
3086 }, 3693 $w->update_timer;
3087 ); 3694 };
3695
3696 $self->update_face;
3697 $self->update_timer;
3088 } 3698 }
3089 3699
3090 $self 3700 $self
3091} 3701}
3092 3702
3703sub update_timer {
3704 my ($self) = @_;
3705
3706 return unless $self->{timer};
3707
3708 if ($self->{visible}) {
3709 $self->{timer}->start;
3710 } else {
3711 $self->{timer}->stop;
3712 }
3713}
3714
3715sub update_face {
3716 my ($self) = @_;
3717
3718 if ($::CONN) {
3719 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3720 if ($anim && @$anim) {
3721 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3722 delete $self->{face_change_cb};
3723
3724 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3725 unless ($tex->{name} || $tex->{loading}) {
3726 $tex->upload (sub { $self->reconfigure });
3727 }
3728 }
3729 }
3730 }
3731 }
3732}
3733
3093sub size_request { 3734sub size_request {
3094 (32, 8) 3735 my ($self) = @_;
3736
3737 if ($::CONN) {
3738 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3739 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3740 if ($tex->{name}) {
3741 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3742 } elsif (!$tex->{loading}) {
3743 $tex->upload (sub { $self->reconfigure });
3744 }
3745 }
3746
3747 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3748 }
3749 }
3750
3751 ($self->{size_w} || 8, $self->{size_h} || 8)
3095} 3752}
3096 3753
3097sub update { 3754sub update {
3098 my ($self) = @_; 3755 my ($self) = @_;
3099 3756
3100 return unless $self->{visible}; 3757 return unless $self->{visible};
3101 3758
3102 $self->SUPER::update; 3759 $self->SUPER::update;
3103} 3760}
3104 3761
3762sub invoke_visibility_change {
3763 my ($self) = @_;
3764
3765 $self->update_timer;
3766
3767 0
3768}
3769
3105sub _draw { 3770sub _draw {
3106 my ($self) = @_; 3771 my ($self) = @_;
3107 3772
3108 return unless $::CONN;
3109
3110 $self->SUPER::_draw; 3773 $self->SUPER::_draw;
3111 3774
3112 my $face; 3775 if (my $tex = $self->{tex}) {
3113
3114 if ($self->{frame}) {
3115 my $anim = $::CONN->{anim}[$self->{anim}];
3116
3117 $face = $anim->[ $self->{frame} % @$anim ]
3118 if $anim && @$anim;
3119 }
3120
3121 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3122
3123 if ($tex) {
3124 glEnable GL_TEXTURE_2D; 3776 glEnable GL_TEXTURE_2D;
3125 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3126 glColor 0, 0, 0, 1; 3778 glColor 0, 0, 0, 1;
3127 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3779 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3128 glDisable GL_TEXTURE_2D; 3780 glDisable GL_TEXTURE_2D;
… …
3130} 3782}
3131 3783
3132sub destroy { 3784sub destroy {
3133 my ($self) = @_; 3785 my ($self) = @_;
3134 3786
3135 $self->{timer}->cancel 3787 (delete $self->{timer})->cancel
3136 if $self->{timer}; 3788 if $self->{timer};
3137 3789
3138 $self->SUPER::destroy; 3790 $self->SUPER::destroy;
3139} 3791}
3140 3792
3141############################################################################# 3793#############################################################################
3142 3794
3143package CFClient::UI::Buttonbar; 3795package DC::UI::Buttonbar;
3144 3796
3145our @ISA = CFClient::UI::HBox::; 3797our @ISA = DC::UI::HBox::;
3146 3798
3147# TODO: should actualyl wrap buttons and other goodies. 3799# TODO: should actually wrap buttons and other goodies.
3148 3800
3149############################################################################# 3801#############################################################################
3150 3802
3151package CFClient::UI::Menu; 3803package DC::UI::Menu;
3152 3804
3153our @ISA = CFClient::UI::FancyFrame::; 3805our @ISA = DC::UI::Toplevel::;
3154 3806
3155use CFClient::OpenGL; 3807use DC::OpenGL;
3156 3808
3157sub new { 3809sub new {
3158 my $class = shift; 3810 my $class = shift;
3159 3811
3160 my $self = $class->SUPER::new ( 3812 my $self = $class->SUPER::new (
3161 items => [], 3813 items => [],
3162 z => 100, 3814 z => 100,
3163 @_, 3815 @_,
3164 ); 3816 );
3165 3817
3166 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3818 $self->add ($self->{vbox} = new DC::UI::VBox);
3167 3819
3168 for my $item (@{ $self->{items} }) { 3820 for my $item (@{ $self->{items} }) {
3169 my ($widget, $cb, $tooltip) = @$item; 3821 my ($widget, $cb, $tooltip) = @$item;
3170 3822
3171 # handle various types of items, only text for now 3823 # handle various types of items, only text for now
3172 if (!ref $widget) { 3824 if (!ref $widget) {
3173 if ($widget =~ /\t/) { 3825 if ($widget =~ /\t/) {
3174 my ($left, $right) = split /\t/, $widget, 2; 3826 my ($left, $right) = split /\t/, $widget, 2;
3175 3827
3176 $widget = new CFClient::UI::HBox 3828 $widget = new DC::UI::HBox
3177 can_hover => 1, 3829 can_hover => 1,
3178 can_events => 1, 3830 can_events => 1,
3179 tooltip => $tooltip, 3831 tooltip => $tooltip,
3180 children => [ 3832 children => [
3181 (new CFClient::UI::Label markup => $left, expand => 1), 3833 (new DC::UI::Label markup => $left, expand => 1),
3182 (new CFClient::UI::Label markup => $right, align => +1), 3834 (new DC::UI::Label markup => $right, align => +1),
3183 ], 3835 ],
3184 ; 3836 ;
3185 3837
3186 } else { 3838 } else {
3187 $widget = new CFClient::UI::Label 3839 $widget = new DC::UI::Label
3188 can_hover => 1, 3840 can_hover => 1,
3189 can_events => 1, 3841 can_events => 1,
3190 markup => $widget, 3842 markup => $widget,
3191 tooltip => $tooltip; 3843 tooltip => $tooltip;
3192 } 3844 }
… …
3240 1 3892 1
3241} 3893}
3242 3894
3243############################################################################# 3895#############################################################################
3244 3896
3245package CFClient::UI::Multiplexer; 3897package DC::UI::Multiplexer;
3246 3898
3247our @ISA = CFClient::UI::Container::; 3899our @ISA = DC::UI::Container::;
3248 3900
3249sub new { 3901sub new {
3250 my $class = shift; 3902 my $class = shift;
3251 3903
3252 my $self = $class->SUPER::new ( 3904 my $self = $class->SUPER::new (
… …
3313 $self->{current}->draw; 3965 $self->{current}->draw;
3314} 3966}
3315 3967
3316############################################################################# 3968#############################################################################
3317 3969
3318package CFClient::UI::Notebook; 3970package DC::UI::Notebook;
3319 3971
3972use DC::OpenGL;
3973
3320our @ISA = CFClient::UI::VBox::; 3974our @ISA = DC::UI::VBox::;
3321 3975
3322sub new { 3976sub new {
3323 my $class = shift; 3977 my $class = shift;
3324 3978
3325 my $self = $class->SUPER::new ( 3979 my $self = $class->SUPER::new (
3326 buttonbar => (new CFClient::UI::Buttonbar), 3980 buttonbar => (new DC::UI::Buttonbar),
3327 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3981 multiplexer => (new DC::UI::Multiplexer expand => 1),
3982 active_outline => [.7, .7, 0.2],
3328 # filter => # will be put between multiplexer and $self 3983 # filter => # will be put between multiplexer and $self
3329 @_, 3984 @_,
3330 ); 3985 );
3331 3986
3332 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3987 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3333 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3988 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3334 3989
3990 {
3991 Scalar::Util::weaken (my $wself = $self);
3992
3993 $self->{multiplexer}->connect (c_add => sub {
3994 my ($mplex, $widgets) = @_;
3995
3996 for my $child (@$widgets) {
3997 Scalar::Util::weaken $child;
3998 $child->{c_tab_} ||= do {
3999 my $tab =
4000 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4001 ? $child->{c_tab}
4002 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4003
4004 $tab->connect (activate => sub {
4005 $wself->set_current_page ($child);
4006 });
4007
4008 $tab
4009 };
4010
4011 $self->{buttonbar}->add ($child->{c_tab_});
4012 }
4013 });
4014
4015 $self->{multiplexer}->connect (c_remove => sub {
4016 my ($mplex, $widgets) = @_;
4017
4018 for my $child (@$widgets) {
4019 $wself->{buttonbar}->remove ($child->{c_tab_});
4020 }
4021 });
4022 }
4023
3335 $self 4024 $self
3336} 4025}
3337 4026
3338sub add { 4027sub add {
4028 my ($self, @widgets) = @_;
4029
4030 $self->{multiplexer}->add (@widgets)
4031}
4032
4033sub remove {
4034 my ($self, @widgets) = @_;
4035
4036 $self->{multiplexer}->remove (@widgets)
4037}
4038
4039sub pages {
4040 my ($self) = @_;
4041 $self->{multiplexer}->children
4042}
4043
4044sub add_tab {
3339 my ($self, $title, $widget, $tooltip) = @_; 4045 my ($self, $title, $widget, $tooltip) = @_;
3340 4046
3341 Scalar::Util::weaken $self; 4047 $title = [$title, $tooltip] unless ref $title;
4048 $widget->{c_tab} = $title;
3342 4049
3343 $self->{buttonbar}->add (new CFClient::UI::Button
3344 markup => $title,
3345 tooltip => $tooltip,
3346 on_activate => sub { $self->set_current_page ($widget) },
3347 );
3348
3349 $self->{multiplexer}->add ($widget); 4050 $self->add ($widget);
3350} 4051}
3351 4052
3352sub get_current_page { 4053sub get_current_page {
3353 my ($self) = @_; 4054 my ($self) = @_;
3354 4055
… …
3360 4061
3361 $self->{multiplexer}->set_current_page ($page); 4062 $self->{multiplexer}->set_current_page ($page);
3362 $self->emit (page_changed => $self->{multiplexer}{current}); 4063 $self->emit (page_changed => $self->{multiplexer}{current});
3363} 4064}
3364 4065
4066sub _draw {
4067 my ($self) = @_;
4068
4069 $self->SUPER::_draw ();
4070
4071 if (my $cur = $self->{multiplexer}{current}) {
4072 if ($cur = $cur->{c_tab_}) {
4073 glTranslate $self->{buttonbar}{x} + $cur->{x},
4074 $self->{buttonbar}{y} + $cur->{y};
4075 glLineWidth 3;
4076 #glEnable GL_BLEND;
4077 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4078 glColor @{$self->{active_outline}};
4079 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4080 glLineWidth 1;
4081 #glDisable GL_BLEND;
4082 }
4083 }
4084}
4085
3365############################################################################# 4086#############################################################################
3366 4087
3367package CFClient::UI::Selector; 4088package DC::UI::Selector;
3368 4089
3369use utf8; 4090use utf8;
3370 4091
3371our @ISA = CFClient::UI::Button::; 4092our @ISA = DC::UI::Button::;
3372 4093
3373sub new { 4094sub new {
3374 my $class = shift; 4095 my $class = shift;
3375 4096
3376 my $self = $class->SUPER::new ( 4097 my $self = $class->SUPER::new (
… …
3393 my ($value, $title, $tooltip) = @$_; 4114 my ($value, $title, $tooltip) = @$_;
3394 4115
3395 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4116 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396 } 4117 }
3397 4118
3398 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4119 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399} 4120}
3400 4121
3401sub _set_value { 4122sub _set_value {
3402 my ($self, $value) = @_; 4123 my ($self, $value) = @_;
3403 4124
3404 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4125 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4126 $item ||= $self->{options}[0]
3405 or return; 4127 or return;
3406 4128
3407 $self->{value} = $item->[0]; 4129 $self->{value} = $item->[0];
3408 $self->set_markup ("$item->[1] ⇓"); 4130 $self->set_markup ("$item->[1] ⇓");
3409 $self->set_tooltip ($item->[2]); 4131# $self->set_tooltip ($item->[2]);
3410} 4132}
3411 4133
3412sub set_value { 4134sub set_value {
3413 my ($self, $value) = @_; 4135 my ($self, $value) = @_;
3414 4136
… …
3416 4138
3417 $self->_set_value ($value); 4139 $self->_set_value ($value);
3418 $self->emit (changed => $value); 4140 $self->emit (changed => $value);
3419} 4141}
3420 4142
4143sub set_options {
4144 my ($self, $options) = @_;
4145
4146 $self->{options} = $options;
4147 $self->_set_value ($self->{value});
4148}
4149
3421############################################################################# 4150#############################################################################
3422 4151
3423package CFClient::UI::Statusbox; 4152package DC::UI::Statusbox;
3424 4153
3425our @ISA = CFClient::UI::VBox::; 4154our @ISA = DC::UI::VBox::;
3426 4155
3427sub new { 4156sub new {
3428 my $class = shift; 4157 my $class = shift;
3429 4158
3430 my $self = $class->SUPER::new ( 4159 my $self = $class->SUPER::new (
3431 fontsize => 0.8, 4160 fontsize => 0.8,
3432 @_, 4161 @_,
3433 ); 4162 );
3434 4163
3435 Scalar::Util::weaken (my $this = $self); 4164 DC::weaken (my $this = $self);
3436 4165
3437 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4166 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3438 4167
3439 $self 4168 $self
3440} 4169}
3441 4170
3442sub reorder { 4171sub reorder {
3443 my ($self) = @_; 4172 my ($self) = @_;
3444 my $NOW = Time::HiRes::time; 4173 my $NOW = Time::HiRes::time;
3445 4174
3446 # freeze display when hovering over any label 4175 # freeze display when hovering over any label
3447 return if $CFClient::UI::TOOLTIP->{owner} 4176 return if $DC::UI::TOOLTIP->{owner}
3448 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4177 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3449 values %{ $self->{item} }; 4178 values %{ $self->{item} };
3450 4179
3451 while (my ($k, $v) = each %{ $self->{item} }) { 4180 while (my ($k, $v) = each %{ $self->{item} }) {
3452 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4181 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3453 } 4182 }
4183
4184 $self->{timer}->set (1, 1);
3454 4185
3455 my @widgets; 4186 my @widgets;
3456 4187
3457 my @items = sort { 4188 my @items = sort {
3458 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
3459 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
3460 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
3461
3462 $self->{timer}->interval (1);
3463 4192
3464 my $count = 10 + 1; 4193 my $count = 10 + 1;
3465 for my $item (@items) { 4194 for my $item (@items) {
3466 last unless --$count; 4195 last unless --$count;
3467 4196
… …
3474 for ($short) { 4203 for ($short) {
3475 s/^\s+//; 4204 s/^\s+//;
3476 s/\s+/ /g; 4205 s/\s+/ /g;
3477 } 4206 }
3478 4207
3479 new CFClient::UI::Label 4208 new DC::UI::Label
3480 markup => $short, 4209 markup => $short,
3481 tooltip => $item->{tooltip}, 4210 tooltip => $item->{tooltip},
3482 tooltip_font => $::FONT_PROP, 4211 tooltip_font => $::FONT_PROP,
3483 tooltip_width => 0.67, 4212 tooltip_width => 0.67,
3484 fontsize => $item->{fontsize} || $self->{fontsize}, 4213 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3491 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3492 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3493 $label->update; 4222 $label->update;
3494 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
3495 if $diff < 1; 4224 if $diff < 1;
3496 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
3497 } else { 4226 } else {
3498 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
3499 } 4228 }
3500 4229
3501 push @widgets, $label; 4230 push @widgets, $label;
… …
3563 $self->SUPER::destroy; 4292 $self->SUPER::destroy;
3564} 4293}
3565 4294
3566############################################################################# 4295#############################################################################
3567 4296
3568package CFClient::UI::Inventory;
3569
3570our @ISA = CFClient::UI::Table::;
3571
3572sub new {
3573 my $class = shift;
3574
3575 my $self = $class->SUPER::new (
3576 col_expand => [0, 1, 0],
3577 items => [],
3578 @_,
3579 );
3580
3581 $self->set_sort_order (undef);
3582
3583 $self
3584}
3585
3586sub update_items {
3587 my ($self) = @_;
3588
3589 $self->clear;
3590
3591 my @item = $self->{sort}->(@{ $self->{items} });
3592
3593 my @adds;
3594 my $row = 0;
3595 for my $item ($self->{sort}->(@{ $self->{items} })) {
3596 CFClient::Item::update_widgets $item;
3597
3598 push @adds, 0, $row, $item->{face_widget};
3599 push @adds, 1, $row, $item->{desc_widget};
3600 push @adds, 2, $row, $item->{weight_widget};
3601
3602 $row++;
3603 }
3604
3605 $self->add (@adds);
3606}
3607
3608sub set_sort_order {
3609 my ($self, $order) = @_;
3610
3611 $self->{sort} = $order ||= sub {
3612 sort {
3613 $a->{type} <=> $b->{type}
3614 or $a->{name} cmp $b->{name}
3615 } @_
3616 };
3617
3618 $self->update_items;
3619}
3620
3621sub set_items {
3622 my ($self, $items) = @_;
3623
3624 $self->{items} = [$items ? values %$items : ()];
3625 $self->update_items;
3626}
3627
3628#############################################################################
3629
3630package CFClient::UI::SpellList;
3631
3632our @ISA = CFClient::UI::Table::;
3633
3634sub new {
3635 my $class = shift;
3636
3637 my $self = $class->SUPER::new (
3638 binding => [],
3639 commands => [],
3640 @_,
3641 )
3642}
3643
3644my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3645
3646my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3648my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3649 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3650my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3652my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3654my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3655 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3656
3657sub rebuild_spell_list {
3658 my ($self) = @_;
3659
3660 $CFClient::UI::ROOT->on_refresh ($self => sub {
3661 $self->clear;
3662
3663 return unless $::CONN;
3664
3665 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3666 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3667 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3668 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3669 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3670
3671 my $row = 0;
3672
3673 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3674 my $spell = $self->{spell}{$_};
3675
3676 $row++;
3677
3678 my $spell_cb = sub {
3679 my ($widget, $ev) = @_;
3680
3681 if ($ev->{button} == 1) {
3682 $::CONN->user_send ("cast $spell->{name}");
3683 } elsif ($ev->{button} == 2) {
3684 $::CONN->user_send ("invoke $spell->{name}");
3685 } elsif ($ev->{button} == 3) {
3686 (new CFClient::UI::Menu
3687 items => [
3688 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3689 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3690 ],
3691 )->popup ($ev);
3692 } else {
3693 return 0;
3694 }
3695
3696 1
3697 };
3698
3699 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3700
3701 #TODO: add path info to tooltip
3702 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3703
3704 $self->add (0, $row, new CFClient::UI::Face
3705 face => $spell->{face},
3706 can_hover => 1,
3707 can_events => 1,
3708 tooltip => $tooltip,
3709 on_button_down => $spell_cb,
3710 );
3711
3712 $self->add (1, $row, new CFClient::UI::Label
3713 expand => 1,
3714 text => $spell->{name},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3722 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3723 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3724 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3725 }
3726 });
3727}
3728
3729sub add_spell {
3730 my ($self, $spell) = @_;
3731
3732 $self->{spell}->{$spell->{name}} = $spell;
3733 $self->rebuild_spell_list;
3734}
3735
3736sub remove_spell {
3737 my ($self, $spell) = @_;
3738
3739 delete $self->{spell}->{$spell->{name}};
3740 $self->rebuild_spell_list;
3741}
3742
3743sub clear_spells {
3744 my ($self) = @_;
3745
3746 $self->{spell} = {};
3747 $self->rebuild_spell_list;
3748}
3749
3750#############################################################################
3751
3752package CFClient::UI::Root; 4297package DC::UI::Root;
3753 4298
3754our @ISA = CFClient::UI::Container::; 4299our @ISA = DC::UI::Container::;
3755 4300
3756use List::Util qw(min max); 4301use List::Util qw(min max);
3757 4302
3758use CFClient::OpenGL; 4303use DC::OpenGL;
3759 4304
3760sub new { 4305sub new {
3761 my $class = shift; 4306 my $class = shift;
3762 4307
3763 my $self = $class->SUPER::new ( 4308 my $self = $class->SUPER::new (
3764 visible => 1, 4309 visible => 1,
3765 @_, 4310 @_,
3766 ); 4311 );
3767 4312
3768 Scalar::Util::weaken ($self->{root} = $self); 4313 DC::weaken ($self->{root} = $self);
3769 4314
3770 $self 4315 $self
3771} 4316}
3772 4317
3773sub size_request { 4318sub size_request {
… …
3821} 4366}
3822 4367
3823sub update { 4368sub update {
3824 my ($self) = @_; 4369 my ($self) = @_;
3825 4370
3826 $::WANT_REFRESH++; 4371 $::WANT_REFRESH = 1;
3827} 4372}
3828 4373
3829sub add { 4374sub add {
3830 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
3831 4376
… …
3868 while ($self->{refresh_hook}) { 4413 while ($self->{refresh_hook}) {
3869 $_->() 4414 $_->()
3870 for values %{delete $self->{refresh_hook}}; 4415 for values %{delete $self->{refresh_hook}};
3871 } 4416 }
3872 4417
3873 if ($self->{realloc}) { 4418 while ($self->{realloc}) {
3874 my %queue; 4419 my %queue;
3875 my @queue; 4420 my @queue;
3876 my $widget; 4421 my $widget;
3877 4422
3878 outer: 4423 outer:
… …
3925 } 4470 }
3926 } 4471 }
3927 4472
3928 delete $self->{realloc}{$widget+0}; 4473 delete $self->{realloc}{$widget+0};
3929 } 4474 }
3930 }
3931 4475
3932 while (my $size_alloc = delete $self->{size_alloc}) { 4476 while (my $size_alloc = delete $self->{size_alloc}) {
3933 my @queue = sort { $b->{visible} <=> $a->{visible} } 4477 my @queue = sort { $a->{visible} <=> $b->{visible} }
3934 values %$size_alloc; 4478 values %$size_alloc;
3935 4479
3936 while () { 4480 while () {
3937 my $widget = pop @queue || last; 4481 my $widget = pop @queue || last;
3938 4482
3939 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4483 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3940 4484
3941 $w = 0 if $w < 0;
3942 $h = 0 if $h < 0;
3943
3944 $w = max $widget->{min_w}, $w; 4485 $w = max $widget->{min_w}, $w;
3945 $h = max $widget->{min_h}, $h; 4486 $h = max $widget->{min_h}, $h;
3946 4487
3947# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4488# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3948# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4489# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3949 4490
3950 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4491 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3951 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4492 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3952 4493
3953 $w = int $w + 0.5; 4494 $w = int $w + 0.5;
3954 $h = int $h + 0.5; 4495 $h = int $h + 0.5;
3955 4496
3956 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4497 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3957 $widget->{old_w} = $widget->{w}; 4498 $widget->{old_w} = $widget->{w};
3958 $widget->{old_h} = $widget->{h}; 4499 $widget->{old_h} = $widget->{h};
3959 4500
3960 $widget->{w} = $w; 4501 $widget->{w} = $w;
3961 $widget->{h} = $h; 4502 $widget->{h} = $h;
3962 4503
3963 $widget->emit (size_allocate => $w, $h); 4504 $widget->emit (size_allocate => $w, $h);
4505 }
3964 } 4506 }
3965 } 4507 }
3966 } 4508 }
3967 4509
3968 while ($self->{post_alloc_hook}) { 4510 while ($self->{post_alloc_hook}) {
3969 $_->() 4511 $_->()
3970 for values %{delete $self->{post_alloc_hook}}; 4512 for values %{delete $self->{post_alloc_hook}};
3971 } 4513 }
3972
3973 4514
3974 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4515 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3975 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4516 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3976 glClear GL_COLOR_BUFFER_BIT; 4517 glClear GL_COLOR_BUFFER_BIT;
3977 4518
… …
3980 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4521 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3981 glMatrixMode GL_MODELVIEW; 4522 glMatrixMode GL_MODELVIEW;
3982 glLoadIdentity; 4523 glLoadIdentity;
3983 4524
3984 { 4525 {
3985 package CFClient::UI::Base; 4526 package DC::UI::Base;
3986 4527
3987 ($draw_x, $draw_y, $draw_w, $draw_h) = 4528 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3988 (0, 0, $self->{w}, $self->{h}); 4529 (0, 0, $self->{w}, $self->{h});
3989 }
3990 4530
3991 $self->_draw; 4531 $self->_draw;
4532 }
3992} 4533}
3993 4534
3994############################################################################# 4535#############################################################################
3995 4536
3996package CFClient::UI; 4537package DC::UI;
3997 4538
3998$ROOT = new CFClient::UI::Root; 4539$ROOT = new DC::UI::Root;
3999$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4540$TOOLTIP = new DC::UI::Tooltip z => 900;
4000 4541
40011 45421
4002 4543

Diff Legend

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