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.338 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.462 by root, Thu Mar 20 22:28:33 2008 UTC

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

Diff Legend

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