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.348 by root, Thu Aug 17 01:27:28 2006 UTC vs.
Revision 1.472 by root, Wed Dec 24 04:09:27 2008 UTC

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

Diff Legend

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