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.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.476 by root, Sun Jan 11 23:45:52 2009 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use Guard ();
9
10use DC;
10use CFPlus::Pod; 11use DC::Pod;
11use CFPlus::Texture; 12use DC::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
17our $TOOLTIP; 18our $TOOLTIP;
18our $BUTTON_STATE; 19our $BUTTON_STATE;
19 20
20our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
21 22
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
24 $_[0]->stop;
25
23 if (!$GRAB) { 26 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 27 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 28 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 29 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 30 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 33 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 34 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 35
33 return if $ENV{CFPLUS_DEBUG} & 8; 36 return if $ENV{CFPLUS_DEBUG} & 8;
34 37
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 38 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 39 $TOOLTIP->show;
41 } 40 }
42 41
43 return; 42 return;
… …
46 } 45 }
47 46
48 $TOOLTIP->hide; 47 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 48 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
51}); 50};
52 51
53sub get_layout { 52sub get_layout {
54 my $layout; 53 my $layout;
55 54
56 for (grep { $_->{name} } values %WIDGET) { 55 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
92 91
93 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 94
96 $TOOLTIP_WATCHER->start; 95 $TOOLTIP_WATCHER->again;
97 } 96 }
98} 97}
99 98
100sub feed_sdl_button_down_event { 99sub feed_sdl_button_down_event {
101 my ($ev) = @_; 100 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 106 my $widget = $ROOT->find_widget ($x, $y);
108 107
109 $GRAB = $widget; 108 $GRAB = $widget;
110 $GRAB->update if $GRAB; 109 $GRAB->update if $GRAB;
111 110
112 $TOOLTIP_WATCHER->cb->(); 111 $TOOLTIP_WATCHER->invoke;
113 } 112 }
114 113
115 if ($GRAB) { 114 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 116 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
119
120 $ev->{dx} = $shift ? $delta : 0;
121 $ev->{dy} = $shift ? 0 : $delta;
122
120 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
121 } else { 124 } else {
122 $GRAB->emit (button_down => $ev) 125 $GRAB->emit (button_down => $ev)
123 } 126 }
124 } 127 }
… …
138 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 142 $grab->update if $grab;
140 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
141 144
142 check_hover $widget; 145 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
144 } 147 }
145} 148}
146 149
147sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
148 my ($ev) = @_; 151 my ($ev) = @_;
… …
188# call when resolution changes etc. 191# call when resolution changes etc.
189sub rescale_widgets { 192sub rescale_widgets {
190 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
191 194
192 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
193 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
194 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
195 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
196 199
197 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
198 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
210 reconfigure_widgets; 213 reconfigure_widgets;
211} 214}
212 215
213############################################################################# 216#############################################################################
214 217
215package CFPlus::UI::Event; 218package DC::UI::Event;
216 219
217sub xy { 220sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219} 222}
220 223
221############################################################################# 224#############################################################################
222 225
223package CFPlus::UI::Base; 226package DC::UI::Base;
224 227
225use strict; 228use strict;
226 229
227use CFPlus::OpenGL; 230use DC::OpenGL;
228 231
229sub new { 232sub new {
230 my $class = shift; 233 my $class = shift;
231 234
232 my $self = bless { 235 my $self = bless {
… …
237 h => undef, 240 h => undef,
238 can_events => 1, 241 can_events => 1,
239 @_ 242 @_
240 }, $class; 243 }, $class;
241 244
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
243 246
244 for (keys %$self) { 247 for (keys %$self) {
245 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
246 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
247 } 250 }
248 } 251 }
249 252
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 254 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 255 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 256 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 257 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
255 258
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258 261
259 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
… …
268 $self->hide; 271 $self->hide;
269 $self->emit ("destroy"); 272 $self->emit ("destroy");
270 %$self = (); 273 %$self = ();
271} 274}
272 275
276sub TO_JSON {
277 { "\fw" => $_[0]{s_id} }
278}
279
273sub show { 280sub show {
274 my ($self) = @_; 281 my ($self) = @_;
275 282
276 return if $self->{parent}; 283 return if $self->{parent};
277 284
278 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
279} 286}
280 287
281sub set_visible { 288sub set_visible {
282 my ($self) = @_; 289 my ($self) = @_;
283 290
284 return if $self->{visible}; 291 return if $self->{visible};
292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
285 295
286 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
287 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
288 298
289 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
290 300
291 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
292 302
293 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
294} 304}
295 305
296sub set_invisible { 306sub set_invisible {
297 my ($self) = @_; 307 my ($self) = @_;
298 308
… …
304 delete $self->{root}; 314 delete $self->{root};
305 315
306 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
307 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
308 318
309 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
310 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
311 321
312 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
313 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
314} 324}
… …
316sub set_visibility { 326sub set_visibility {
317 my ($self, $visible) = @_; 327 my ($self, $visible) = @_;
318 328
319 return if $self->{visible} == $visible; 329 return if $self->{visible} == $visible;
320 330
321 $visible ? $self->hide 331 $visible ? $self->show
322 : $self->show; 332 : $self->hide;
323} 333}
324 334
325sub toggle_visibility { 335sub toggle_visibility {
326 my ($self) = @_; 336 my ($self) = @_;
327 337
… …
333sub hide { 343sub hide {
334 my ($self) = @_; 344 my ($self) = @_;
335 345
336 $self->set_invisible; 346 $self->set_invisible;
337 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
338 $self->{parent}->remove ($self) 351 $parent->remove ($self);
339 if $self->{parent}; 352 }
340} 353}
341 354
342sub move_abs { 355sub move_abs {
343 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
344 357
… …
356 $self->{force_h} = $h; 369 $self->{force_h} = $h;
357 370
358 $self->realloc; 371 $self->realloc;
359} 372}
360 373
374# traverse the widget chain up to find the maximum "physical" size constraints
375sub get_max_wh {
376 my ($self) = @_;
377
378 my ($w, $h) = @$self{qw(max_w max_h)};
379
380 if ($w <= 0 || $h <= 0) {
381 my ($mw, $mh) = $self->{parent}
382 ? $self->{parent}->get_max_wh
383 : ($::WIDTH, $::HEIGHT);
384
385 $w = $mw if $w <= 0;
386 $h = $mh if $h <= 0;
387 }
388
389 ($w, $h)
390}
391
361sub size_request { 392sub size_request {
362 require Carp; 393 require Carp;
363 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
364} 395}
365 396
… …
371 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
372 403
373 if ($self->{aspect}) { 404 if ($self->{aspect}) {
374 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
375 406
376 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
377 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
378 409
379 # use alignment to adjust x, y 410 # use alignment to adjust x, y
380 411
381 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
382 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
… …
423 454
424 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
425 456
426 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
427 458
428 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
429 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
430 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
431 } 462 }
432} 463}
433 464
434# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
435sub coord2local { 466sub coord2local {
436 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
437 468
438 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
439 470
440 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
441} 472}
442 473
443# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
444sub coord2global { 475sub coord2global {
445 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
446 477
447 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
448 479
449 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
450} 481}
451 482
452sub invoke_focus_in { 483sub invoke_focus_in {
… …
501sub connect { 532sub connect {
502 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
503 534
504 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
505 536
506 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
507 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
508 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
509 } 540 }
510} 541}
511 542
… …
543 574
544 # parent 575 # parent
545 $self->{parent} && $self->{parent}->emit ($signal, @args) 576 $self->{parent} && $self->{parent}->emit ($signal, @args)
546} 577}
547 578
548sub find_widget { 579#sub find_widget {
549 my ($self, $x, $y) = @_; 580# in .xs
550
551 return () unless $self->{can_events};
552
553 return $self
554 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
555 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
556
557 ()
558}
559 581
560sub set_parent { 582sub set_parent {
561 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
562 584
563 CFPlus::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
564 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
565} 587}
566 588
567sub realloc { 589sub realloc {
568 my ($self) = @_; 590 my ($self) = @_;
… …
594 616
595# using global variables seems a bit hacky, but passing through all drawing 617# using global variables seems a bit hacky, but passing through all drawing
596# functions seems pointless. 618# functions seems pointless.
597our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 619our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
598 620
599sub draw { 621#sub draw {
600 my ($self) = @_; 622#CFPlus.xs
601
602 return unless $self->{h} && $self->{w};
603
604 # update screen rectangle
605 local $draw_x = $draw_x + $self->{x};
606 local $draw_y = $draw_y + $self->{y};
607
608 # skip widgets that are entirely outside the drawing area
609 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
610 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
611
612 glPushMatrix;
613 glTranslate $self->{x}, $self->{y}, 0;
614
615 if ($self == $HOVER && $self->{can_hover}) {
616 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
617 glEnable GL_BLEND;
618 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
619 glBegin GL_QUADS;
620 glVertex 0 , 0;
621 glVertex $self->{w}, 0;
622 glVertex $self->{w}, $self->{h};
623 glVertex 0 , $self->{h};
624 glEnd;
625 glDisable GL_BLEND;
626 }
627
628 if ($ENV{CFPLUS_DEBUG} & 1) {
629 glPushMatrix;
630 glColor 1, 1, 0, 1;
631 glTranslate 0.375, 0.375;
632 glBegin GL_LINE_LOOP;
633 glVertex 0 , 0;
634 glVertex $self->{w} - 1, 0;
635 glVertex $self->{w} - 1, $self->{h} - 1;
636 glVertex 0 , $self->{h} - 1;
637 glEnd;
638 glPopMatrix;
639 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
640 }
641
642 $self->_draw;
643 glPopMatrix;
644}
645 623
646sub _draw { 624sub _draw {
647 my ($self) = @_; 625 my ($self) = @_;
648 626
649 warn "no draw defined for $self\n"; 627 warn "no draw defined for $self\n";
650} 628}
651 629
652my $cntx;#d#
653sub DESTROY { 630sub DESTROY {
654 my ($self) = @_; 631 my ($self) = @_;
655 632
656 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
657 634
635 local $@;
658 eval { $self->destroy }; 636 eval { $self->destroy };
659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
660 638
661 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
662} 640}
663 641
664############################################################################# 642#############################################################################
665 643
666package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
667 645
668our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
669 647
670use strict; 648use strict;
671use CFPlus::OpenGL; 649use DC::OpenGL;
672 650
673sub new { 651sub new {
674 my $class = shift; 652 my $class = shift;
675
676 # range [value, low, high, page]
677 653
678 $class->SUPER::new ( 654 $class->SUPER::new (
679 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
680 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
681 @_ 657 @_
… …
693 my ($w, $h) = @$self{qw(w h)}; 669 my ($w, $h) = @$self{qw(w h)};
694 670
695 glEnable GL_BLEND; 671 glEnable GL_BLEND;
696 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
697 glColor_premultiply @$color; 673 glColor_premultiply @$color;
698
699 glBegin GL_QUADS;
700 glVertex 0 , 0;
701 glVertex 0 , $h;
702 glVertex $w, $h; 674 glRect 0, 0, $w, $h;
703 glVertex $w, 0;
704 glEnd;
705
706 glDisable GL_BLEND; 675 glDisable GL_BLEND;
707 } 676 }
708} 677}
709 678
710############################################################################# 679#############################################################################
711 680
712package CFPlus::UI::Empty; 681package DC::UI::Empty;
713 682
714our @ISA = CFPlus::UI::Base::; 683our @ISA = DC::UI::Base::;
715 684
716sub new { 685sub new {
717 my ($class, %arg) = @_; 686 my ($class, %arg) = @_;
718 $class->SUPER::new (can_events => 0, %arg); 687 $class->SUPER::new (can_events => 0, %arg);
719} 688}
… …
726 695
727sub draw { } 696sub draw { }
728 697
729############################################################################# 698#############################################################################
730 699
731package CFPlus::UI::Container; 700package DC::UI::Container;
732 701
733our @ISA = CFPlus::UI::Base::; 702our @ISA = DC::UI::Base::;
734 703
735sub new { 704sub new {
736 my ($class, %arg) = @_; 705 my ($class, %arg) = @_;
737 706
738 my $children = delete $arg{children}; 707 my $children = delete $arg{children};
… …
742 can_events => 0, 711 can_events => 0,
743 %arg, 712 %arg,
744 ); 713 );
745 714
746 $self->add (@$children) 715 $self->add (@$children)
747 if $children; 716 if $children && @$children;
748 717
749 $self 718 $self
750} 719}
751 720
752sub realloc { 721sub realloc {
… …
761 my ($self, @widgets) = @_; 730 my ($self, @widgets) = @_;
762 731
763 $_->set_parent ($self) 732 $_->set_parent ($self)
764 for @widgets; 733 for @widgets;
765 734
735 # TODO: only do this in widgets that need it, e.g. root, fixed
766 use sort 'stable'; 736 use sort 'stable';
767 737
768 $self->{children} = [ 738 $self->{children} = [
769 sort { $a->{z} <=> $b->{z} } 739 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 740 @{$self->{children}}, @widgets
771 ]; 741 ];
772 742
773 $self->realloc; 743 $self->realloc;
744
745 $self->emit (c_add => \@widgets);
746
747 map $_+0, @widgets
774} 748}
775 749
776sub children { 750sub children {
777 @{ $_[0]{children} } 751 @{ $_[0]{children} }
778} 752}
779 753
780sub remove { 754sub remove {
781 my ($self, $child) = @_; 755 my ($self, @widgets) = @_;
782 756
757 $self->emit (c_remove => \@widgets);
758
759 for my $child (@widgets) {
783 delete $child->{parent}; 760 delete $child->{parent};
784 $child->hide; 761 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 762 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
763 }
787 764
788 $self->realloc; 765 $self->realloc;
789} 766}
790 767
791sub clear { 768sub clear {
792 my ($self) = @_; 769 my ($self) = @_;
793 770
794 my $children = delete $self->{children}; 771 my $children = $self->{children};
795 $self->{children} = []; 772 $self->{children} = [];
796 773
797 for (@$children) { 774 for (@$children) {
798 delete $_->{parent}; 775 delete $_->{parent};
799 $_->hide; 776 $_->hide;
… …
819} 796}
820 797
821sub _draw { 798sub _draw {
822 my ($self) = @_; 799 my ($self) = @_;
823 800
824 $_->draw for @{$self->{children}}; 801 $_->draw for $self->visible_children;
825} 802}
826 803
827############################################################################# 804#############################################################################
828 805
829package CFPlus::UI::Bin; 806package DC::UI::Bin;
830 807
831our @ISA = CFPlus::UI::Container::; 808our @ISA = DC::UI::Container::;
832 809
833sub new { 810sub new {
834 my ($class, %arg) = @_; 811 my ($class, %arg) = @_;
835 812
836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 813 my $child = (delete $arg{child}) || new DC::UI::Empty::;
837 814
838 $class->SUPER::new (children => [$child], %arg) 815 $class->SUPER::new (children => [$child], %arg)
839} 816}
840 817
841sub add { 818sub add {
842 my ($self, $child) = @_; 819 my ($self, $child) = @_;
843 820
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 821 $self->clear;
845 $self->SUPER::add ($child); 822 $self->SUPER::add ($child);
846} 823}
847 824
848sub remove { 825sub remove {
849 my ($self, $widget) = @_; 826 my ($self, $widget) = @_;
850 827
851 $self->SUPER::remove ($widget); 828 $self->SUPER::remove ($widget);
852 829
853 $self->{children} = [new CFPlus::UI::Empty] 830 $self->{children} = [new DC::UI::Empty]
854 unless @{$self->{children}}; 831 unless @{$self->{children}};
855} 832}
856 833
857sub child { $_[0]->{children}[0] } 834sub child { $_[0]->{children}[0] }
858 835
… …
867 844
868 1 845 1
869} 846}
870 847
871############################################################################# 848#############################################################################
872
873# back-buffered drawing area 849# back-buffered drawing area
874 850
875package CFPlus::UI::Window; 851package DC::UI::Window;
876 852
877our @ISA = CFPlus::UI::Bin::; 853our @ISA = DC::UI::Bin::;
878 854
879use CFPlus::OpenGL; 855use DC::OpenGL;
880 856
881sub new { 857sub new {
882 my ($class, %arg) = @_; 858 my ($class, %arg) = @_;
883 859
884 my $self = $class->SUPER::new (%arg); 860 my $self = $class->SUPER::new (%arg);
… …
906} 882}
907 883
908sub render_child { 884sub render_child {
909 my ($self) = @_; 885 my ($self) = @_;
910 886
911 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 887 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
912 glClearColor 0, 0, 0, 0; 888 glClearColor 0, 0, 0, 0;
913 glClear GL_COLOR_BUFFER_BIT; 889 glClear GL_COLOR_BUFFER_BIT;
914 890
915 { 891 {
916 package CFPlus::UI::Base; 892 package DC::UI::Base;
917 893
918 local ($draw_x, $draw_y, $draw_w, $draw_h) = 894 local ($draw_x, $draw_y, $draw_w, $draw_h) =
919 (0, 0, $self->{w}, $self->{h}); 895 (0, 0, $self->{w}, $self->{h});
920 896
921 $self->_render; 897 $self->_render;
… …
938 glDisable GL_TEXTURE_2D; 914 glDisable GL_TEXTURE_2D;
939} 915}
940 916
941############################################################################# 917#############################################################################
942 918
943package CFPlus::UI::ViewPort; 919package DC::UI::ViewPort;
944 920
921use List::Util qw(min max);
922
945our @ISA = CFPlus::UI::Window::; 923our @ISA = DC::UI::Window::;
946 924
947sub new { 925sub new {
948 my $class = shift; 926 my $class = shift;
949 927
950 $class->SUPER::new ( 928 $class->SUPER::new (
… …
957sub size_request { 935sub size_request {
958 my ($self) = @_; 936 my ($self) = @_;
959 937
960 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 938 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
961 939
962 $w = 10 if $self->{scroll_x}; 940 $w = 1 if $self->{scroll_x};
963 $h = 10 if $self->{scroll_y}; 941 $h = 1 if $self->{scroll_y};
964 942
965 ($w, $h) 943 ($w, $h)
966} 944}
967 945
968sub invoke_size_allocate { 946sub invoke_size_allocate {
… …
980} 958}
981 959
982sub set_offset { 960sub set_offset {
983 my ($self, $x, $y) = @_; 961 my ($self, $x, $y) = @_;
984 962
963 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
964 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
965
966 if ($x != $self->{view_x} or $y != $self->{view_y}) {
985 $self->{view_x} = int $x; 967 $self->{view_x} = $x;
986 $self->{view_y} = int $y; 968 $self->{view_y} = $y;
987 969
970 $self->emit (changed => $x, $y);
988 $self->update; 971 $self->update;
972 }
973}
974
975sub set_center {
976 my ($self, $x, $y) = @_;
977
978 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
979}
980
981sub make_visible {
982 my ($self, $x, $y, $border) = @_;
983
984 if ( $x < $self->{view_x} + $self->{w} * $border
985 || $x > $self->{view_x} + $self->{w} * (1 - $border)
986 || $y < $self->{view_y} + $self->{h} * $border
987 || $y > $self->{view_y} + $self->{h} * (1 - $border)
988 ) {
989 $self->set_center ($x, $y);
990 }
989} 991}
990 992
991# hmm, this does not work for topleft of $self... but we should not ask for that 993# hmm, this does not work for topleft of $self... but we should not ask for that
992sub coord2local { 994sub coord2local {
993 my ($self, $x, $y) = @_; 995 my ($self, $x, $y) = @_;
… …
1008 my ($self, $x, $y) = @_; 1010 my ($self, $x, $y) = @_;
1009 1011
1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1012 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1013 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1012 ) { 1014 ) {
1013 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1015 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1014 } else { 1016 } else {
1015 $self->CFPlus::UI::Base::find_widget ($x, $y) 1017 $self->DC::UI::Base::find_widget ($x, $y)
1016 } 1018 }
1017} 1019}
1018 1020
1019sub _render { 1021sub _render {
1020 my ($self) = @_; 1022 my ($self) = @_;
1021 1023
1022 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1024 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1023 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1025 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1024 1026
1025 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1027 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1026 1028
1027 $self->SUPER::_render; 1029 $self->SUPER::_render;
1028} 1030}
1029 1031
1030############################################################################# 1032#############################################################################
1031 1033
1032package CFPlus::UI::ScrolledWindow; 1034package DC::UI::ScrolledWindow;
1033 1035
1034our @ISA = CFPlus::UI::HBox::; 1036our @ISA = DC::UI::Table::;
1035 1037
1036sub new { 1038sub new {
1037 my ($class, %arg) = @_; 1039 my ($class, %arg) = @_;
1038 1040
1039 my $child = delete $arg{child}; 1041 my $child = delete $arg{child};
1040 1042
1041 my $self; 1043 my $self;
1042 1044
1043 my $slider = new CFPlus::UI::Slider 1045 my $hslider = new DC::UI::Slider
1046 c_col => 0,
1047 c_row => 1,
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new DC::UI::Slider
1057 c_col => 1,
1058 c_row => 0,
1044 vertical => 1, 1059 vertical => 1,
1045 range => [0, 0, 1, 0.01], # HACK fix 1060 range => [0, 0, 1, 0.01], # HACK fix
1046 on_changed => sub { 1061 on_changed => sub {
1047 $self->{vp}->set_offset (0, $_[1]); 1062 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 }, 1064 },
1049 ; 1065 ;
1050 1066
1051 $self = $class->SUPER::new ( 1067 $self = $class->SUPER::new (
1052 vp => (new CFPlus::UI::ViewPort expand => 1), 1068 scroll_x => 0,
1069 scroll_y => 1,
1053 can_events => 1, 1070 can_events => 1,
1054 slider => $slider, 1071 hslider => $hslider,
1072 vslider => $vslider,
1073 col_expand => [1, 0],
1074 row_expand => [1, 0],
1055 %arg, 1075 %arg,
1056 ); 1076 );
1057 1077
1078 $self->{vp} = new DC::UI::ViewPort
1079 c_col => 0,
1080 c_row => 0,
1081 expand => 1,
1082 scroll_x => $self->{scroll_x},
1083 scroll_y => $self->{scroll_y},
1084 on_changed => sub {
1085 my ($vp, $x, $y) = @_;
1086
1087 $vp->{parent}{hslider}->set_value ($x);
1088 $vp->{parent}{vslider}->set_value ($y);
1089
1090 0
1091 },
1092 on_size_allocate => sub {
1093 my ($vp, $w, $h) = @_;
1094 $vp->{parent}->update_slider;
1095 0
1096 },
1097 ;
1098
1058 $self->SUPER::add ($self->{vp}, $self->{slider}); 1099 $self->SUPER::add ($self->{vp});
1100
1059 $self->add ($child) if $child; 1101 $self->add ($child) if $child;
1060 1102
1061 $self 1103 $self
1062} 1104}
1063
1064#TODO# update range on size_allocate depending on child
1065 1105
1066sub add { 1106sub add {
1067 my ($self, $widget) = @_; 1107 my ($self, $widget) = @_;
1068 1108
1069 $self->{vp}->add ($self->{child} = $widget); 1109 $self->{vp}->add ($self->{child} = $widget);
1070} 1110}
1071 1111
1112sub set_offset { shift->{vp}->set_offset (@_) }
1113sub set_center { shift->{vp}->set_center (@_) }
1114sub make_visible { shift->{vp}->make_visible (@_) }
1115
1116sub update_slider {
1117 my ($self) = @_;
1118
1119 my $child = ($self->{vp} or return)->child;
1120
1121 if ($self->{scroll_x}) {
1122 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1123 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1124
1125 my $visible = $w1 > $w2;
1126 if ($visible != $self->{hslider_visible}) {
1127 $self->{hslider_visible} = $visible;
1128 $visible ? $self->SUPER::add ($self->{hslider})
1129 : $self->SUPER::remove ($self->{hslider});
1130 }
1131 }
1132
1133 if ($self->{scroll_y}) {
1134 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1135 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1136
1137 my $visible = $h1 > $h2;
1138 if ($visible != $self->{vslider_visible}) {
1139 $self->{vslider_visible} = $visible;
1140 $visible ? $self->SUPER::add ($self->{vslider})
1141 : $self->SUPER::remove ($self->{vslider});
1142 }
1143 }
1144}
1145
1146sub start_dragging {
1147 my ($self, $ev) = @_;
1148
1149 $self->grab_focus;
1150
1151 my $ox = $self->{vp}{view_x};
1152 my $oy = $self->{vp}{view_y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1156
1157 $ox -= $ev->{xrel};
1158 $oy -= $ev->{yrel};
1159
1160 $self->{vp}->set_offset ($ox, $oy);
1161 };
1162}
1163
1072sub invoke_mouse_wheel { 1164sub invoke_mouse_wheel {
1073 my ($self, $ev) = @_; 1165 my ($self, $ev) = @_;
1074 1166
1075 return 0 unless $ev->{dy}; # only vertical movements
1076
1077 $self->{slider}->emit (mouse_wheel => $ev); 1167 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1168 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1078 1169
1079 1 1170 1
1080} 1171}
1081 1172
1082sub update_slider { 1173sub invoke_button_down {
1083 my ($self) = @_; 1174 my ($self, $ev, $x, $y) = @_;
1084 1175
1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1176 if ($ev->{button} == 2) {
1086} 1177 $self->start_dragging ($ev);
1178 return 1;
1179 }
1087 1180
1088sub update { 1181 0
1089 my ($self) = @_; 1182}
1090 1183
1091 $self->SUPER::update; 1184sub invoke_button_up {
1185 my ($self, $ev, $x, $y) = @_;
1092 1186
1093 $self->update_slider; 1187 if (delete $self->{motion}) {
1188 return 1;
1189 }
1190
1191 0
1192}
1193
1194sub invoke_mouse_motion {
1195 my ($self, $ev, $x, $y) = @_;
1196
1197 if ($self->{motion}) {
1198 $self->{motion}->($ev, $x, $y);
1199 return 1;
1200 }
1201
1202 0
1094} 1203}
1095 1204
1096sub invoke_size_allocate { 1205sub invoke_size_allocate {
1097 my ($self, $w, $h) = @_; 1206 my ($self, $w, $h) = @_;
1098 1207
1099 $self->update_slider; 1208 $self->update_slider;
1100
1101 $self->SUPER::invoke_size_allocate ($w, $h) 1209 $self->SUPER::invoke_size_allocate ($w, $h)
1102} 1210}
1103 1211
1104############################################################################# 1212#############################################################################
1105 1213
1106package CFPlus::UI::Frame; 1214package DC::UI::Frame;
1107 1215
1108our @ISA = CFPlus::UI::Bin::; 1216our @ISA = DC::UI::Bin::;
1109 1217
1110use CFPlus::OpenGL; 1218use DC::OpenGL;
1111 1219
1112sub new { 1220sub new {
1113 my $class = shift; 1221 my $class = shift;
1114 1222
1115 $class->SUPER::new ( 1223 $class->SUPER::new (
… …
1125 my ($w, $h) = @$self{qw(w h)}; 1233 my ($w, $h) = @$self{qw(w h)};
1126 1234
1127 glEnable GL_BLEND; 1235 glEnable GL_BLEND;
1128 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1236 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1129 glColor_premultiply @{ $self->{bg} }; 1237 glColor_premultiply @{ $self->{bg} };
1130
1131 glBegin GL_QUADS;
1132 glVertex 0 , 0;
1133 glVertex 0 , $h;
1134 glVertex $w, $h; 1238 glRect 0, 0, $w, $h;
1135 glVertex $w, 0;
1136 glEnd;
1137
1138 glDisable GL_BLEND; 1239 glDisable GL_BLEND;
1139 } 1240 }
1140 1241
1141 $self->SUPER::_draw; 1242 $self->SUPER::_draw;
1142} 1243}
1143 1244
1144############################################################################# 1245#############################################################################
1145 1246
1146package CFPlus::UI::FancyFrame; 1247package DC::UI::FancyFrame;
1147 1248
1148our @ISA = CFPlus::UI::Bin::; 1249our @ISA = DC::UI::Bin::;
1149 1250
1150use CFPlus::OpenGL; 1251use DC::OpenGL;
1151 1252
1152sub new { 1253sub new {
1153 my ($class, %arg) = @_; 1254 my ($class, %arg) = @_;
1154 1255
1155 if ((exists $arg{label}) && !ref $arg{label}) { 1256 if ((exists $arg{label}) && !ref $arg{label}) {
1156 $arg{label} = new CFPlus::UI::Label 1257 $arg{label} = new DC::UI::Label
1157 align => 1, 1258 align => 1,
1158 valign => 0, 1259 valign => 0.5,
1159 text => $arg{label}, 1260 text => $arg{label},
1160 fontsize => ($arg{border} || 0.8) * 0.75; 1261 fontsize => ($arg{border} || 0.8) * 0.75;
1161 } 1262 }
1162 1263
1163 my $self = $class->SUPER::new ( 1264 my $self = $class->SUPER::new (
1164 # label => "", 1265 # label => "",
1165 fg => [0.6, 0.3, 0.1], 1266 fg => undef,
1166 border => 0.8, 1267 border => 0.8,
1167 style => 'single', 1268 style => 'single',
1168 %arg, 1269 %arg,
1169 ); 1270 );
1170 1271
… …
1173 1274
1174sub add { 1275sub add {
1175 my ($self, @widgets) = @_; 1276 my ($self, @widgets) = @_;
1176 1277
1177 $self->SUPER::add (@widgets); 1278 $self->SUPER::add (@widgets);
1178 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1279 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1179} 1280}
1180 1281
1181sub border { 1282sub border {
1182 int $_[0]{border} * $::FONTSIZE 1283 int $_[0]{border} * $::FONTSIZE
1183} 1284}
… …
1223 my $border = $self->border; 1324 my $border = $self->border;
1224 my ($w, $h) = ($self->{w}, $self->{h}); 1325 my ($w, $h) = ($self->{w}, $self->{h});
1225 1326
1226 $child->draw; 1327 $child->draw;
1227 1328
1228 glColor @{$self->{fg}}; 1329 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1229 glBegin GL_LINE_STRIP; 1330 glBegin GL_LINE_STRIP;
1230 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1331 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1231 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1332 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1232 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1333 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1233 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1334 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1241 } 1342 }
1242} 1343}
1243 1344
1244############################################################################# 1345#############################################################################
1245 1346
1246package CFPlus::UI::Toplevel; 1347package DC::UI::Toplevel;
1247 1348
1248our @ISA = CFPlus::UI::Bin::; 1349our @ISA = DC::UI::Bin::;
1249 1350
1250use CFPlus::OpenGL; 1351use DC::OpenGL;
1251 1352
1252my $bg = 1353my $bg =
1253 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1354 new_from_resource DC::Texture "d1_bg.png",
1254 mipmap => 1, wrap => 1; 1355 mipmap => 1, wrap => 1;
1255 1356
1256my @border = 1357my @border =
1257 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1358 map { new_from_resource DC::Texture $_, mipmap => 1 }
1258 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1359 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1360
1361my @icon =
1362 map { new_from_resource DC::Texture $_, mipmap => 1 }
1363 qw(x1_move.png x1_resize.png);
1259 1364
1260sub new { 1365sub new {
1261 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1262 1367
1263 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1264 bg => [1, 1, 1, 1], 1369 bg => [1, 1, 1, 1],
1265 border_bg => [1, 1, 1, 1], 1370 border_bg => [1, 1, 1, 1],
1266 border => 0.6, 1371 border => 0.8,
1267 can_events => 1, 1372 can_events => 1,
1268 min_w => 64, 1373 min_w => 64,
1269 min_h => 32, 1374 min_h => 32,
1270 %arg, 1375 %arg,
1271 ); 1376 );
1272 1377
1273 $self->{title_widget} = new CFPlus::UI::Label 1378 $self->{title_widget} = new DC::UI::Label
1274 align => 0, 1379 align => 0.5,
1275 valign => 1, 1380 valign => 1,
1276 text => $self->{title}, 1381 text => $self->{title},
1277 fontsize => $self->{border}, 1382 fontsize => $self->{border},
1278 if exists $self->{title}; 1383 if exists $self->{title};
1279 1384
1280 if ($self->{has_close_button}) { 1385 if ($self->{has_close_button}) {
1281 $self->{close_button} = 1386 $self->{close_button} =
1282 new CFPlus::UI::ImageButton 1387 new DC::UI::ImageButton
1283 path => 'x1_close.png', 1388 path => 'x1_close.png',
1284 on_activate => sub { $self->emit ("delete") }; 1389 on_activate => sub { $self->emit ("delete") };
1285 1390
1286 $self->CFPlus::UI::Container::add ($self->{close_button}); 1391 $self->DC::UI::Container::add ($self->{close_button});
1287 } 1392 }
1288 1393
1289 $self 1394 $self
1290} 1395}
1291 1396
1292sub add { 1397sub add {
1293 my ($self, @widgets) = @_; 1398 my ($self, @widgets) = @_;
1294 1399
1295 $self->SUPER::add (@widgets); 1400 $self->SUPER::add (@widgets);
1296 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1401 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1297 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1402 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1298} 1403}
1299 1404
1300sub border { 1405sub border {
1301 int $_[0]{border} * $::FONTSIZE 1406 int $_[0]{border} * $::FONTSIZE
1407}
1408
1409sub get_max_wh {
1410 my ($self) = @_;
1411
1412 return ($self->{w}, $self->{h})
1413 if $self->{visible} && $self->{w};
1414
1415 $self->SUPER::get_max_wh
1302} 1416}
1303 1417
1304sub size_request { 1418sub size_request {
1305 my ($self) = @_; 1419 my ($self) = @_;
1306 1420
… …
1431 glEnable GL_TEXTURE_2D; 1545 glEnable GL_TEXTURE_2D;
1432 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1546 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1433 1547
1434 my $border = $self->border; 1548 my $border = $self->border;
1435 1549
1550 if ($border) {
1436 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1437 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1438 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1439 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1440 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1556
1557 # move
1558 my $w2 = ($w - $border) * .5;
1559 my $h2 = ($h - $border) * .5;
1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1563
1564 # resize
1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1567 unless $self->{has_close_button};
1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1570 }
1441 1571
1442 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1572 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1443 glColor @{ $self->{bg} }; 1573 glColor @{ $self->{bg} };
1444 1574
1445 # TODO: repeat texture not scale 1575 # TODO: repeat texture not scale
… …
1464 if $self->{close_button}; 1594 if $self->{close_button};
1465} 1595}
1466 1596
1467############################################################################# 1597#############################################################################
1468 1598
1469package CFPlus::UI::Table; 1599package DC::UI::Table;
1470 1600
1471our @ISA = CFPlus::UI::Base::; 1601our @ISA = DC::UI::Container::;
1472 1602
1473use List::Util qw(max sum); 1603use List::Util qw(max sum);
1474 1604
1475use CFPlus::OpenGL; 1605use DC::OpenGL;
1476 1606
1477sub new { 1607sub new {
1478 my $class = shift; 1608 my $class = shift;
1479 1609
1480 $class->SUPER::new ( 1610 $class->SUPER::new (
1481 col_expand => [], 1611 col_expand => [],
1612 row_expand => [],
1482 @_, 1613 @_,
1483 ) 1614 )
1484} 1615}
1485 1616
1486sub children {
1487 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1488}
1489
1490sub add { 1617sub add {
1618 my ($self, @widgets) = @_;
1619
1620 for my $child (@widgets) {
1621 $child->{c_rowspan} ||= 1;
1622 $child->{c_colspan} ||= 1;
1623 }
1624
1625 $self->SUPER::add (@widgets);
1626}
1627
1628sub add_at {
1491 my ($self) = shift; 1629 my $self = shift;
1630
1631 my @widgets;
1492 1632
1493 while (@_) { 1633 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, (); 1634 my ($col, $row, $child) = splice @_, 0, 3, ();
1495 $child->set_parent ($self);
1496 $self->{children}[$y][$x] = $child;
1497 }
1498 1635
1499 $self->{force_realloc} = 1; 1636 $child->{c_row} = $row;
1500 $self->{force_size_alloc} = 1; 1637 $child->{c_col} = $col;
1501 $self->realloc;
1502}
1503 1638
1504sub remove { 1639 push @widgets, $child;
1640 }
1641
1642 $self->add (@widgets);
1643}
1644
1645sub get_wh {
1505 my ($self, $child) = @_; 1646 my ($self) = @_;
1506 1647
1507 # TODO: not yet implemented 1648 my (@w, @h);
1508}
1509
1510# TODO: move to container class maybe? send children a signal on removal?
1511sub clear {
1512 my ($self) = @_;
1513 1649
1514 my @children = $self->children; 1650 my @children = $self->children;
1515 delete $self->{children}; 1651
1652 # first pass, columns
1653 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1654 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1655
1656 my $sw = sum @w[$c .. $c + $cs - 1];
1657
1658 if ($w > $sw) {
1659 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1660 }
1516 1661 }
1517 for (@children) {
1518 delete $_->{parent};
1519 $_->hide;
1520 }
1521 1662
1522 $self->realloc; 1663 # second pass, rows
1523} 1664 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1524
1525sub get_wh {
1526 my ($self) = @_;
1527
1528 my (@w, @h);
1529
1530 for my $y (0 .. $#{$self->{children}}) {
1531 my $row = $self->{children}[$y]
1532 or next;
1533
1534 for my $x (0 .. $#$row) {
1535 my $widget = $row->[$x]
1536 or next;
1537 my ($w, $h) = @$widget{qw(req_w req_h)}; 1665 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1538 1666
1539 $w[$x] = max $w[$x], $w; 1667 my $sh = sum @h[$r .. $r + $rs - 1];
1540 $h[$y] = max $h[$y], $h; 1668
1669 if ($h > $sh) {
1670 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1541 } 1671 }
1542 } 1672 }
1543 1673
1544 (\@w, \@h) 1674 (\@w, \@h)
1545} 1675}
… …
1561 my ($ws, $hs) = $self->get_wh; 1691 my ($ws, $hs) = $self->get_wh;
1562 1692
1563 my $req_w = (sum @$ws) || 1; 1693 my $req_w = (sum @$ws) || 1;
1564 my $req_h = (sum @$hs) || 1; 1694 my $req_h = (sum @$hs) || 1;
1565 1695
1566 # TODO: nicer code && do row_expand 1696 # now linearly scale the rows/columns to the allocated size
1567 my @col_expand = @{$self->{col_expand}}; 1697 my @col_expand = @{$self->{col_expand}};
1568 @col_expand = (1) x @$ws unless @col_expand; 1698 @col_expand = (1) x @$ws unless @col_expand;
1569 my $col_expand = (sum @col_expand) || 1; 1699 my $col_expand = (sum @col_expand) || 1;
1570 1700
1571 # linearly scale sizes
1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1574 1702
1575 CFPlus::UI::harmonize $ws; 1703 DC::UI::harmonize $ws;
1704
1705 my @row_expand = @{$self->{row_expand}};
1706 @row_expand = (1) x @$ws unless @row_expand;
1707 my $row_expand = (sum @row_expand) || 1;
1708
1709 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1710
1576 CFPlus::UI::harmonize $hs; 1711 DC::UI::harmonize $hs;
1577 1712
1578 my $y; 1713 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1714 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1579 1715
1580 for my $r (0 .. $#{$self->{children}}) { 1716 for my $widget ($self->children) {
1581 my $row = $self->{children}[$r] 1717 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1582 or next;
1583 1718
1584 my $x = 0; 1719 $widget->configure (
1585 my $row_h = $hs->[$r]; 1720 $x[$c], $y[$r],
1721 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1586 1722 );
1587 for my $c (0 .. $#$row) { 1723 }
1588 my $col_w = $ws->[$c];
1589 1724
1590 if (my $widget = $row->[$c]) { 1725 1
1591 $widget->configure ($x, $y, $col_w, $row_h); 1726}
1592 }
1593 1727
1594 $x += $col_w; 1728#############################################################################
1729
1730package DC::UI::Fixed;
1731
1732use List::Util qw(min max);
1733
1734our @ISA = DC::UI::Container::;
1735
1736sub _scale($$$) {
1737 my ($rel, $val, $max) = @_;
1738
1739 $rel ? $val * $max : $val
1740}
1741
1742sub size_request {
1743 my ($self) = @_;
1744
1745 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1746
1747 # determine overall size by querying abs widgets
1748 for my $child ($self->visible_children) {
1749 unless ($child->{c_rel}) {
1750 my $x = $child->{c_x};
1751 my $y = $child->{c_y};
1752
1753 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1754 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1595 } 1755 }
1756 }
1596 1757
1597 $y += $row_h; 1758 my $W = $x2 - $x1;
1759 my $H = $y2 - $y1;
1760
1761 # now layout remaining widgets
1762 for my $child ($self->visible_children) {
1763 if ($child->{c_rel}) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1768 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1769 }
1770 }
1771
1772 my $W = $x2 - $x1;
1773 my $H = $y2 - $y1;
1774
1775 ($W, $H)
1776}
1777
1778sub invoke_size_allocate {
1779 my ($self, $W, $H) = @_;
1780
1781 for my $child ($self->visible_children) {
1782 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1783 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1784
1785 $x += $child->{c_halign} * $child->{req_w};
1786 $y += $child->{c_valign} * $child->{req_h};
1787
1788 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1598 } 1789 }
1599 1790
1600 1 1791 1
1601} 1792}
1602 1793
1603sub find_widget {
1604 my ($self, $x, $y) = @_;
1605
1606 $x -= $self->{x};
1607 $y -= $self->{y};
1608
1609 my $res;
1610
1611 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1612 $res = $_->find_widget ($x, $y)
1613 and return $res;
1614 }
1615
1616 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1617}
1618
1619sub _draw {
1620 my ($self) = @_;
1621
1622 for (grep $_, @{$self->{children}}) {
1623 $_->draw for grep $_, @$_;
1624 }
1625}
1626
1627############################################################################# 1794#############################################################################
1628 1795
1629package CFPlus::UI::Box; 1796package DC::UI::Box;
1630 1797
1631our @ISA = CFPlus::UI::Container::; 1798our @ISA = DC::UI::Container::;
1632 1799
1633sub size_request { 1800sub size_request {
1634 my ($self) = @_; 1801 my ($self) = @_;
1802
1803 my @children = $self->visible_children;
1635 1804
1636 $self->{vertical} 1805 $self->{vertical}
1637 ? ( 1806 ? (
1638 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1807 (List::Util::max map $_->{req_w}, @children),
1639 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1808 (List::Util::sum map $_->{req_h}, @children),
1640 ) 1809 )
1641 : ( 1810 : (
1642 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1811 (List::Util::sum map $_->{req_w}, @children),
1643 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1812 (List::Util::max map $_->{req_h}, @children),
1644 ) 1813 )
1645} 1814}
1646 1815
1647sub invoke_size_allocate { 1816sub invoke_size_allocate {
1648 my ($self, $w, $h) = @_; 1817 my ($self, $w, $h) = @_;
… …
1669 $req[$_] += $space * $children[$_]{expand} 1838 $req[$_] += $space * $children[$_]{expand}
1670 for 0 .. $#children; 1839 for 0 .. $#children;
1671 } 1840 }
1672 } 1841 }
1673 1842
1674 CFPlus::UI::harmonize \@req; 1843 DC::UI::harmonize \@req;
1675 1844
1676 my $pos = 0; 1845 my $pos = 0;
1677 for (0 .. $#children) { 1846 for (0 .. $#children) {
1678 my $alloc = $req[$_]; 1847 my $alloc = $req[$_];
1679 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1848 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1684 1 1853 1
1685} 1854}
1686 1855
1687############################################################################# 1856#############################################################################
1688 1857
1689package CFPlus::UI::HBox; 1858package DC::UI::HBox;
1690 1859
1691our @ISA = CFPlus::UI::Box::; 1860our @ISA = DC::UI::Box::;
1692 1861
1693sub new { 1862sub new {
1694 my $class = shift; 1863 my $class = shift;
1695 1864
1696 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1699 ) 1868 )
1700} 1869}
1701 1870
1702############################################################################# 1871#############################################################################
1703 1872
1704package CFPlus::UI::VBox; 1873package DC::UI::VBox;
1705 1874
1706our @ISA = CFPlus::UI::Box::; 1875our @ISA = DC::UI::Box::;
1707 1876
1708sub new { 1877sub new {
1709 my $class = shift; 1878 my $class = shift;
1710 1879
1711 $class->SUPER::new ( 1880 $class->SUPER::new (
… …
1714 ) 1883 )
1715} 1884}
1716 1885
1717############################################################################# 1886#############################################################################
1718 1887
1719package CFPlus::UI::Label; 1888package DC::UI::Label;
1720 1889
1721our @ISA = CFPlus::UI::DrawBG::; 1890our @ISA = DC::UI::DrawBG::;
1722 1891
1723use CFPlus::OpenGL; 1892use DC::OpenGL;
1724 1893
1725sub new { 1894sub new {
1726 my ($class, %arg) = @_; 1895 my ($class, %arg) = @_;
1727 1896
1728 my $self = $class->SUPER::new ( 1897 my $self = $class->SUPER::new (
… …
1733 #text => initial text 1902 #text => initial text
1734 #markup => initial narkup 1903 #markup => initial narkup
1735 #max_w => maximum pixel width 1904 #max_w => maximum pixel width
1736 #style => 0, # render flags 1905 #style => 0, # render flags
1737 ellipsise => 3, # end 1906 ellipsise => 3, # end
1738 layout => (new CFPlus::Layout), 1907 layout => (new DC::Layout),
1739 fontsize => 1, 1908 fontsize => 1,
1740 align => -1, 1909 align => 0.5,
1741 valign => -1, 1910 valign => 0.5,
1742 padding_x => 2, 1911 padding_x => 4,
1743 padding_y => 2, 1912 padding_y => 2,
1744 can_events => 0, 1913 can_events => 0,
1745 %arg 1914 %arg
1746 ); 1915 );
1747 1916
1748 if (exists $self->{template}) { 1917 if (exists $self->{template}) {
1749 my $layout = new CFPlus::Layout; 1918 my $layout = new DC::Layout;
1750 $layout->set_text (delete $self->{template}); 1919 $layout->set_text (delete $self->{template});
1751 $self->{template} = $layout; 1920 $self->{template} = $layout;
1752 } 1921 }
1753 1922
1754 if (exists $self->{markup}) { 1923 if (exists $self->{markup}) {
… …
1772 1941
1773 delete $self->{ox}; 1942 delete $self->{ox};
1774 $self->SUPER::realloc; 1943 $self->SUPER::realloc;
1775} 1944}
1776 1945
1946sub clear {
1947 my ($self) = @_;
1948
1949 $self->set_text ("");
1950}
1951
1777sub set_text { 1952sub set_text {
1778 my ($self, $text) = @_; 1953 my ($self, $text) = @_;
1779 1954
1780 return if $self->{text} eq "T$text"; 1955 return if $self->{text} eq "T$text";
1781 $self->{text} = "T$text"; 1956 $self->{text} = "T$text";
… …
1804 1979
1805sub size_request { 1980sub size_request {
1806 my ($self) = @_; 1981 my ($self) = @_;
1807 1982
1808 $self->{size_req} ||= do { 1983 $self->{size_req} ||= do {
1984 my ($max_w, $max_h) = $self->get_max_wh;
1985
1809 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1986 $self->{layout}->set_font ($self->{font}) if $self->{font};
1810 $self->{layout}->set_width ($self->{max_w} || -1); 1987 $self->{layout}->set_width ($max_w);
1811 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1988 $self->{layout}->set_ellipsise ($self->{ellipsise});
1812 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1989 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1813 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1814 1991
1815 my ($w, $h) = $self->{layout}->size; 1992 my ($w, $h) = $self->{layout}->size;
1816 1993
1817 if (exists $self->{template}) { 1994 if (exists $self->{template}) {
1818 $self->{template}->set_font ($self->{font}) if $self->{font}; 1995 $self->{template}->set_font ($self->{font}) if $self->{font};
1819 $self->{template}->set_width ($self->{max_w} || -1); 1996 $self->{template}->set_width ($max_w);
1820 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1821 1998
1822 my ($w2, $h2) = $self->{template}->size; 1999 my ($w2, $h2) = $self->{template}->size;
1823 2000
1824 $w = List::Util::max $w, $w2; 2001 $w = List::Util::max $w, $w2;
… …
1880 2057
1881 [$self->{layout}->size] 2058 [$self->{layout}->size]
1882 }; 2059 };
1883 2060
1884 unless (exists $self->{ox}) { 2061 unless (exists $self->{ox}) {
1885 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2062 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1886 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2063 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1887 : ($self->{w} - $size->[0]) * 0.5);
1888 2064
1889 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2065 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1890 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1891 : ($self->{h} - $size->[1]) * 0.5);
1892 }; 2066 };
1893 2067
1894 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2068# unless ($self->{list}) {
1895 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2069# $self->{list} = DC::OpenGL::glGenList;
1896 2070# DC::OpenGL::glNewList $self->{list};
1897 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2071# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2072# DC::OpenGL::glEndList;
2073# }
2074#
2075# DC::OpenGL::glCallList $self->{list};
2076
2077 $self->{layout}->draw;
1898} 2078}
2079
2080#sub destroy {
2081# my ($self) = @_;
2082#
2083# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2084#
2085# $self->SUPER::destroy;
2086#}
1899 2087
1900############################################################################# 2088#############################################################################
1901 2089
1902package CFPlus::UI::EntryBase; 2090package DC::UI::EntryBase;
1903 2091
1904our @ISA = CFPlus::UI::Label::; 2092our @ISA = DC::UI::Label::;
1905 2093
1906use CFPlus::OpenGL; 2094use DC::OpenGL;
1907 2095
1908sub new { 2096sub new {
1909 my $class = shift; 2097 my $class = shift;
1910 2098
1911 $class->SUPER::new ( 2099 $class->SUPER::new (
1912 fg => [1, 1, 1], 2100 fg => [1, 1, 1],
1913 bg => [0, 0, 0, 0.2], 2101 bg => [0, 0, 0, 0.2],
2102 outline => undef,
1914 active_bg => [1, 1, 1, 0.5], 2103 active_bg => [0, 0, 1, .2],
1915 active_fg => [0, 0, 0], 2104 active_fg => [1, 1, 1],
2105 active_outline => [1, 1, 0],
1916 can_hover => 1, 2106 can_hover => 1,
1917 can_focus => 1, 2107 can_focus => 1,
2108 align => 0,
1918 valign => 0, 2109 valign => 0.5,
1919 can_events => 1, 2110 can_events => 1,
1920 ellipsise => 0, 2111 ellipsise => 0,
2112 padding_x => 4,
2113 padding_y => 2,
1921 #text => ... 2114 #text => ...
1922 #hidden => "*", 2115 #hidden => "*",
1923 @_ 2116 @_
1924 ) 2117 )
1925} 2118}
… …
1970 my $sym = $ev->{sym}; 2163 my $sym = $ev->{sym};
1971 my $uni = $ev->{unicode}; 2164 my $uni = $ev->{unicode};
1972 2165
1973 my $text = $self->get_text; 2166 my $text = $self->get_text;
1974 2167
1975 if ($uni == 8) { 2168 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2169
2170 if ($sym == DC::SDLK_BACKSPACE) {
1976 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2171 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1977 } elsif ($uni == 127) { 2172 } elsif ($sym == DC::SDLK_DELETE) {
1978 substr $text, $self->{cursor}, 1, ""; 2173 substr $text, $self->{cursor}, 1, "";
1979 } elsif ($sym == CFPlus::SDLK_LEFT) { 2174 } elsif ($sym == DC::SDLK_LEFT) {
1980 --$self->{cursor} if $self->{cursor}; 2175 --$self->{cursor} if $self->{cursor};
1981 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2176 } elsif ($sym == DC::SDLK_RIGHT) {
1982 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2177 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1983 } elsif ($sym == CFPlus::SDLK_HOME) { 2178 } elsif ($sym == DC::SDLK_HOME) {
1984 # what a hack 2179 # what a hack
1985 $self->{cursor} = 2180 $self->{cursor} =
1986 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2181 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1987 ? length $1 2182 ? length $1
1988 : 0; 2183 : 0;
1989 } elsif ($sym == CFPlus::SDLK_END) { 2184 } elsif ($sym == DC::SDLK_END) {
1990 # uh, again 2185 # uh, again
1991 $self->{cursor} = 2186 $self->{cursor} =
1992 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2187 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1993 ? $self->{cursor} + length $1 2188 ? $self->{cursor} + length $1
1994 : length $self->{text}; 2189 : length $self->{text};
… …
2058 glColor_premultiply @{$self->{bg}}; 2253 glColor_premultiply @{$self->{bg}};
2059 } 2254 }
2060 2255
2061 glEnable GL_BLEND; 2256 glEnable GL_BLEND;
2062 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2257 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2063 glBegin GL_QUADS;
2064 glVertex 0 , 0;
2065 glVertex 0 , $self->{h};
2066 glVertex $self->{w}, $self->{h}; 2258 glRect 0, 0, $self->{w}, $self->{h};
2067 glVertex $self->{w}, 0;
2068 glEnd;
2069 glDisable GL_BLEND; 2259 glDisable GL_BLEND;
2070 2260
2071 $self->SUPER::_draw; 2261 $self->SUPER::_draw;
2072 2262
2073 #TODO: force update every cursor change :( 2263 #TODO: force update every cursor change :(
… …
2075 2265
2076 unless (exists $self->{cur_h}) { 2266 unless (exists $self->{cur_h}) {
2077 my $text = substr $self->{text}, 0, $self->{cursor}; 2267 my $text = substr $self->{text}, 0, $self->{cursor};
2078 utf8::encode $text; 2268 utf8::encode $text;
2079 2269
2080 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2081 } 2271 }
2082 2272
2273 glColor_premultiply @{$self->{active_fg}};
2083 glBegin GL_LINES; 2274 glBegin GL_LINES;
2084 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2275 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2085 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2276 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2086 glEnd; 2277 glEnd;
2278
2279 glLineWidth 3;
2280 glColor @{$self->{active_outline}};
2281 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2282 glLineWidth 1;
2283
2284 } else {
2285 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2286 glBegin GL_LINE_STRIP;
2287 glVertex .5, $self->{h} * .5;
2288 glVertex .5, $self->{h} - 2.5;
2289 glVertex $self->{w} - .5, $self->{h} - 2.5;
2290 glVertex $self->{w} - .5, $self->{h} * .5;
2291 glEnd;
2087 } 2292 }
2088} 2293}
2089 2294
2090############################################################################# 2295#############################################################################
2091 2296
2092package CFPlus::UI::Entry; 2297package DC::UI::Entry;
2093 2298
2094our @ISA = CFPlus::UI::EntryBase::; 2299our @ISA = DC::UI::EntryBase::;
2095 2300
2096use CFPlus::OpenGL; 2301use DC::OpenGL;
2302
2303sub new {
2304 my $class = shift;
2305
2306 $class->SUPER::new (
2307 history_pointer => -1,
2308 @_
2309 )
2310}
2311
2097 2312
2098sub invoke_key_down { 2313sub invoke_key_down {
2099 my ($self, $ev) = @_; 2314 my ($self, $ev) = @_;
2100 2315
2101 my $sym = $ev->{sym}; 2316 my $sym = $ev->{sym};
… …
2107 $self->{history_pointer} = -1; 2322 $self->{history_pointer} = -1;
2108 $self->{history_saveback} = ''; 2323 $self->{history_saveback} = '';
2109 $self->emit (activate => $txt); 2324 $self->emit (activate => $txt);
2110 $self->update; 2325 $self->update;
2111 2326
2112 } elsif ($sym == CFPlus::SDLK_UP) { 2327 } elsif ($sym == DC::SDLK_UP) {
2113 if ($self->{history_pointer} < 0) { 2328 if ($self->{history_pointer} < 0) {
2114 $self->{history_saveback} = $self->get_text; 2329 $self->{history_saveback} = $self->get_text;
2115 } 2330 }
2116 if (@{$self->{history} || []} > 0) { 2331 if (@{$self->{history} || []} > 0) {
2117 $self->{history_pointer}++; 2332 $self->{history_pointer}++;
… …
2119 $self->{history_pointer} = @{$self->{history} || []} - 1; 2334 $self->{history_pointer} = @{$self->{history} || []} - 1;
2120 } 2335 }
2121 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2336 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2122 } 2337 }
2123 2338
2124 } elsif ($sym == CFPlus::SDLK_DOWN) { 2339 } elsif ($sym == DC::SDLK_DOWN) {
2125 $self->{history_pointer}--; 2340 $self->{history_pointer}--;
2126 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2341 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2127 2342
2128 if ($self->{history_pointer} >= 0) { 2343 if ($self->{history_pointer} >= 0) {
2129 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2344 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2130 } else { 2345 } else {
2346 if (defined $self->{history_saveback}) {
2131 $self->set_text ($self->{history_saveback}); 2347 $self->set_text ($self->{history_saveback});
2348 $self->{history_saveback} = undef;
2349 }
2132 } 2350 }
2133 2351
2134 } else { 2352 } else {
2135 return $self->SUPER::invoke_key_down ($ev) 2353 return $self->SUPER::invoke_key_down ($ev)
2136 } 2354 }
… …
2138 1 2356 1
2139} 2357}
2140 2358
2141############################################################################# 2359#############################################################################
2142 2360
2143package CFPlus::UI::TextEdit; 2361package DC::UI::TextEdit;
2144 2362
2145our @ISA = CFPlus::UI::EntryBase::; 2363our @ISA = DC::UI::EntryBase::;
2146 2364
2147use CFPlus::OpenGL; 2365use DC::OpenGL;
2366
2367sub new {
2368 my $class = shift;
2369
2370 $class->SUPER::new (
2371 padding_y => 4,
2372
2373 @_
2374 )
2375}
2148 2376
2149sub move_cursor_ver { 2377sub move_cursor_ver {
2150 my ($self, $dy) = @_; 2378 my ($self, $dy) = @_;
2151 2379
2152 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2380 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2153 2381
2154 $y += $dy; 2382 $line += $dy;
2155 2383
2156 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2384 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2157 $self->{cursor} = $index; 2385 $self->{cursor} = $index;
2158 delete $self->{cur_h}; 2386 delete $self->{cur_h};
2159 $self->update; 2387 $self->update;
2160 return; 2388 return;
2161 } 2389 }
… …
2164sub invoke_key_down { 2392sub invoke_key_down {
2165 my ($self, $ev) = @_; 2393 my ($self, $ev) = @_;
2166 2394
2167 my $sym = $ev->{sym}; 2395 my $sym = $ev->{sym};
2168 2396
2169 if ($sym == CFPlus::SDLK_UP) { 2397 if ($sym == DC::SDLK_UP) {
2170 $self->move_cursor_ver (-1); 2398 $self->move_cursor_ver (-1);
2171 } elsif ($sym == CFPlus::SDLK_DOWN) { 2399 } elsif ($sym == DC::SDLK_DOWN) {
2172 $self->move_cursor_ver (+1); 2400 $self->move_cursor_ver (+1);
2173 } else { 2401 } else {
2174 return $self->SUPER::invoke_key_down ($ev) 2402 return $self->SUPER::invoke_key_down ($ev)
2175 } 2403 }
2176 2404
2177 1 2405 1
2178} 2406}
2179 2407
2180############################################################################# 2408#############################################################################
2181 2409
2182package CFPlus::UI::Button; 2410package DC::UI::ButtonBin;
2183 2411
2184our @ISA = CFPlus::UI::Label::; 2412our @ISA = DC::UI::Bin::;
2185 2413
2186use CFPlus::OpenGL; 2414use DC::OpenGL;
2187 2415
2188my @tex = 2416my @tex =
2189 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2417 map { new_from_resource DC::Texture $_, mipmap => 1 }
2190 qw(b1_button_active.png); 2418 qw(b1_button_inactive.png b1_button_active.png);
2191 2419
2192sub new { 2420sub new {
2193 my $class = shift; 2421 my $class = shift;
2194 2422
2195 $class->SUPER::new ( 2423 $class->SUPER::new (
2196 padding_x => 4,
2197 padding_y => 4,
2198 fg => [1, 1, 1],
2199 active_fg => [0, 0, 1],
2200 can_hover => 1, 2424 can_hover => 1,
2201 align => 0, 2425 align => 0.5,
2202 valign => 0, 2426 valign => 0.5,
2203 can_events => 1, 2427 can_events => 1,
2204 @_ 2428 @_
2205 ) 2429 )
2206} 2430}
2207 2431
… …
2216} 2440}
2217 2441
2218sub _draw { 2442sub _draw {
2219 my ($self) = @_; 2443 my ($self) = @_;
2220 2444
2221 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2222
2223 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
2226 2448
2449 my $tex = $tex[$GRAB == $self];
2227 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2228 2451
2229 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2230 2453
2231 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2232} 2455}
2233 2456
2234############################################################################# 2457#############################################################################
2235 2458
2236package CFPlus::UI::CheckBox; 2459package DC::UI::Button;
2237 2460
2238our @ISA = CFPlus::UI::DrawBG::; 2461our @ISA = DC::UI::Label::;
2462
2463use DC::OpenGL;
2239 2464
2240my @tex = 2465my @tex =
2241 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2466 map { new_from_resource DC::Texture $_, mipmap => 1 }
2242 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2467 qw(b1_button_inactive.png b1_button_active.png);
2243
2244use CFPlus::OpenGL;
2245 2468
2246sub new { 2469sub new {
2247 my $class = shift; 2470 my $class = shift;
2248 2471
2249 $class->SUPER::new ( 2472 $class->SUPER::new (
2473 padding_x => 8,
2474 padding_y => 4,
2475 fg => [1.0, 1.0, 1.0],
2476 active_fg => [0.8, 0.8, 0.8],
2477 can_hover => 1,
2478 align => 0.5,
2479 valign => 0.5,
2480 can_events => 1,
2481 @_
2482 )
2483}
2484
2485sub invoke_button_up {
2486 my ($self, $ev, $x, $y) = @_;
2487
2488 $self->emit ("activate")
2489 if $x >= 0 && $x < $self->{w}
2490 && $y >= 0 && $y < $self->{h};
2491
2492 1
2493}
2494
2495sub _draw {
2496 my ($self) = @_;
2497
2498 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2499
2500 glEnable GL_TEXTURE_2D;
2501 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2502 glColor 0, 0, 0, 1;
2503
2504 my $tex = $tex[$GRAB == $self];
2505 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2506
2507 glDisable GL_TEXTURE_2D;
2508
2509 $self->SUPER::_draw;
2510}
2511
2512#############################################################################
2513
2514package DC::UI::CheckBox;
2515
2516our @ISA = DC::UI::DrawBG::;
2517
2518my @tex =
2519 map { new_from_resource DC::Texture $_, mipmap => 1 }
2520 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2521
2522use DC::OpenGL;
2523
2524sub new {
2525 my $class = shift;
2526
2527 $class->SUPER::new (
2528 fontsize => 1,
2250 padding_x => 2, 2529 padding_x => 2,
2251 padding_y => 2, 2530 padding_y => 2,
2252 fg => [1, 1, 1], 2531 fg => [1, 1, 1],
2253 active_fg => [1, 1, 0], 2532 active_fg => [1, 1, 0],
2254 bg => [0, 0, 0, 0.2], 2533 bg => [0, 0, 0, 0.2],
… …
2260} 2539}
2261 2540
2262sub size_request { 2541sub size_request {
2263 my ($self) = @_; 2542 my ($self) = @_;
2264 2543
2265 (6) x 2 2544 ($self->{fontsize} * $::FONTSIZE) x 2
2266} 2545}
2267 2546
2268sub toggle { 2547sub toggle {
2269 my ($self) = @_; 2548 my ($self) = @_;
2270 2549
… …
2289sub _draw { 2568sub _draw {
2290 my ($self) = @_; 2569 my ($self) = @_;
2291 2570
2292 $self->SUPER::_draw; 2571 $self->SUPER::_draw;
2293 2572
2294 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2573 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2295 2574
2296 my ($w, $h) = @$self{qw(w h)}; 2575 my ($w, $h) = @$self{qw(w h)};
2297 2576
2298 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2577 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2299 2578
… …
2306 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2307} 2586}
2308 2587
2309############################################################################# 2588#############################################################################
2310 2589
2311package CFPlus::UI::Image; 2590package DC::UI::Image;
2312 2591
2313our @ISA = CFPlus::UI::Base::; 2592our @ISA = DC::UI::Base::;
2314 2593
2315use CFPlus::OpenGL; 2594use DC::OpenGL;
2316 2595
2317our %texture_cache; 2596our %texture_cache;
2318 2597
2319sub new { 2598sub new {
2320 my $class = shift; 2599 my $class = shift;
2321 2600
2322 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2323 can_events => 0, 2602 can_events => 0,
2603 scale => 1,
2324 @_, 2604 @_,
2325 ); 2605 );
2326 2606
2327 $self->{path} || $self->{tex} 2607 $self->{path} || $self->{tex}
2328 or Carp::croak "'path' or 'tex' attributes required"; 2608 or Carp::croak "'path' or 'tex' attributes required";
2329 2609
2330 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2610 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2331 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2611 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2332 2612
2333 CFPlus::weaken $texture_cache{$self->{path}}; 2613 DC::weaken $texture_cache{$self->{path}};
2334 2614
2335 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2615 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2336 2616
2337 $self 2617 $self
2338} 2618}
2339 2619
2340sub STORABLE_freeze { 2620sub STORABLE_freeze {
2341 my ($self, $cloning) = @_; 2621 my ($self, $cloning) = @_;
2342 2622
2343 $self->{path} 2623 $self->{path}
2344 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2624 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2345 2625
2346 $self->{path} 2626 $self->{path}
2347} 2627}
2348 2628
2349sub STORABLE_attach { 2629sub STORABLE_attach {
… …
2353} 2633}
2354 2634
2355sub size_request { 2635sub size_request {
2356 my ($self) = @_; 2636 my ($self) = @_;
2357 2637
2358 ($self->{tex}{w}, $self->{tex}{h}) 2638 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2359} 2639}
2360 2640
2361sub _draw { 2641sub _draw {
2362 my ($self) = @_; 2642 my ($self) = @_;
2363 2643
… …
2373 } 2653 }
2374 2654
2375 glEnable GL_TEXTURE_2D; 2655 glEnable GL_TEXTURE_2D;
2376 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2377 2657
2378 $tex->draw_quad (0, 0, $w, $h); 2658 $tex->draw_quad_alpha (0, 0, $w, $h);
2379 2659
2380 glDisable GL_TEXTURE_2D; 2660 glDisable GL_TEXTURE_2D;
2381} 2661}
2382 2662
2383############################################################################# 2663#############################################################################
2384 2664
2385package CFPlus::UI::ImageButton; 2665package DC::UI::ImageButton;
2386 2666
2387our @ISA = CFPlus::UI::Image::; 2667our @ISA = DC::UI::Image::;
2388 2668
2389use CFPlus::OpenGL; 2669use DC::OpenGL;
2390 2670
2391my %textures; 2671my %textures;
2392 2672
2393sub new { 2673sub new {
2394 my $class = shift; 2674 my $class = shift;
… …
2397 padding_x => 4, 2677 padding_x => 4,
2398 padding_y => 4, 2678 padding_y => 4,
2399 fg => [1, 1, 1], 2679 fg => [1, 1, 1],
2400 active_fg => [0, 0, 1], 2680 active_fg => [0, 0, 1],
2401 can_hover => 1, 2681 can_hover => 1,
2402 align => 0, 2682 align => 0.5,
2403 valign => 0, 2683 valign => 0.5,
2404 can_events => 1, 2684 can_events => 1,
2405 @_ 2685 @_
2406 ); 2686 );
2407} 2687}
2408 2688
2689sub invoke_button_down {
2690 my ($self, $ev, $x, $y) = @_;
2691
2692 1
2693}
2694
2409sub invoke_button_up { 2695sub invoke_button_up {
2410 my ($self, $ev, $x, $y) = @_; 2696 my ($self, $ev, $x, $y) = @_;
2411 2697
2412 $self->emit ("activate") 2698 $self->emit ("activate")
2413 if $x >= 0 && $x < $self->{w} 2699 if $x >= 0 && $x < $self->{w}
… …
2416 1 2702 1
2417} 2703}
2418 2704
2419############################################################################# 2705#############################################################################
2420 2706
2421package CFPlus::UI::VGauge; 2707package DC::UI::VGauge;
2422 2708
2423our @ISA = CFPlus::UI::Base::; 2709our @ISA = DC::UI::Base::;
2424 2710
2425use List::Util qw(min max); 2711use List::Util qw(min max);
2426 2712
2427use CFPlus::OpenGL; 2713use DC::OpenGL;
2428 2714
2429my %tex = ( 2715my %tex = (
2430 food => [ 2716 food => [
2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2432 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2718 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2433 ], 2719 ],
2434 grace => [ 2720 grace => [
2435 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2436 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2722 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2437 ], 2723 ],
2438 hp => [ 2724 hp => [
2439 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2725 map { new_from_resource DC::Texture $_, mipmap => 1 }
2440 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2726 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2441 ], 2727 ],
2442 mana => [ 2728 mana => [
2443 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2729 map { new_from_resource DC::Texture $_, mipmap => 1 }
2444 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2730 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2445 ], 2731 ],
2446); 2732);
2447 2733
2448# eg. VGauge->new (gauge => 'food'), default gauge: food 2734# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2551 glDisable GL_TEXTURE_2D; 2837 glDisable GL_TEXTURE_2D;
2552} 2838}
2553 2839
2554############################################################################# 2840#############################################################################
2555 2841
2842package DC::UI::Progress;
2843
2844our @ISA = DC::UI::Label::;
2845
2846use DC::OpenGL;
2847
2848sub new {
2849 my ($class, %arg) = @_;
2850
2851 my $self = $class->SUPER::new (
2852 padding_x => 2,
2853 padding_y => 2,
2854 fg => [1, 1, 1],
2855 bg => [0, 0, 1, 0.2],
2856 bar => [0.7, 0.5, 0.1, 0.8],
2857 outline => [0.4, 0.3, 0],
2858 fontsize => 0.9,
2859 valign => 0.5,
2860 align => 0.5,
2861 can_events => 1,
2862 ellipsise => 1,
2863 label => "%d%%",
2864 %arg,
2865 );
2866
2867 $self->set_value ($arg{value} || -1);
2868
2869 $self
2870}
2871
2872sub set_label {
2873 my ($self, $label) = @_;
2874
2875 return if $self->{label} eq $label;
2876 $self->{label} = $label;
2877
2878 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2879}
2880
2881sub set_value {
2882 my ($self, $value) = @_;
2883
2884 if ($self->{value} ne $value) {
2885 $self->{value} = $value;
2886
2887 if ($value < 0) {
2888 $self->set_text ("-");
2889 } else {
2890 $self->set_text (sprintf $self->{label}, $value * 100);
2891 }
2892
2893 $self->update;
2894 }
2895}
2896
2897sub _draw {
2898 my ($self) = @_;
2899
2900 glEnable GL_BLEND;
2901 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2902
2903 my $px = $self->{padding_x};
2904 my $py = $self->{padding_y};
2905
2906 if ($self->{value} >= 0) {
2907 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2908
2909 glColor_premultiply @{$self->{bar}};
2910 glRect $px, $py, $s, $self->{h} - $py;
2911 glColor_premultiply @{$self->{bg}};
2912 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2913 }
2914
2915 glColor_premultiply @{$self->{outline}};
2916
2917 $px -= .5;
2918 $py -= .5;
2919
2920 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2921
2922 glDisable GL_BLEND;
2923
2924 {
2925 local $self->{bg}; # do not draw background
2926 $self->SUPER::_draw;
2927 }
2928}
2929
2930#############################################################################
2931
2932package DC::UI::ExperienceProgress;
2933
2934our @ISA = DC::UI::Progress::;
2935
2936sub new {
2937 my ($class, %arg) = @_;
2938
2939 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2940
2941 my $self = $class->SUPER::new (
2942 %arg,
2943 tooltip => sub {
2944 my ($self) = @_;
2945
2946 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2947 $tt,
2948 $self->{lvl},
2949 ::formsep ($self->{exp}),
2950 ::formsep ($self->{nxt}),
2951 ::formsep ($self->{nxt} - $self->{exp}),
2952 $self->_percent * 100,
2953 },
2954 );
2955
2956 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2957 if $::CONN;
2958
2959 $self
2960}
2961
2962sub DESTROY {
2963 my ($self) = @_;
2964
2965 delete $::CONN->{on_exp_update}{$self+0}
2966 if $::CONN;
2967
2968 $self->SUPER::DESTROY;
2969}
2970
2971sub _percent {
2972 my ($self) = @_;
2973
2974 my $table = $::CONN && $::CONN->{exp_table}
2975 or return -1;
2976
2977 my $l0 = $table->[$self->{lvl} - 1];
2978 my $l1 = $table->[$self->{lvl}];
2979
2980 $self->{nxt} = $l1;
2981
2982 ($self->{exp} - $l0) / ($l1 - $l0)
2983}
2984
2985sub set_value {
2986 my ($self, $lvl, $exp) = @_;
2987
2988 $self->{lvl} = $lvl;
2989 $self->{exp} = $exp;
2990
2991 $self->SUPER::set_value ($self->_percent);
2992}
2993
2994#############################################################################
2995
2556package CFPlus::UI::Gauge; 2996package DC::UI::Gauge;
2557 2997
2558our @ISA = CFPlus::UI::VBox::; 2998our @ISA = DC::UI::VBox::;
2559 2999
2560sub new { 3000sub new {
2561 my ($class, %arg) = @_; 3001 my ($class, %arg) = @_;
2562 3002
2563 my $self = $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
… …
2565 can_hover => 1, 3005 can_hover => 1,
2566 can_events => 1, 3006 can_events => 1,
2567 %arg, 3007 %arg,
2568 ); 3008 );
2569 3009
2570 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3010 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2571 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3011 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2572 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3012 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2573 3013
2574 $self 3014 $self
2575} 3015}
2576 3016
2577sub set_fontsize { 3017sub set_fontsize {
… …
2598 $self->{value}->set_text ($val); 3038 $self->{value}->set_text ($val);
2599} 3039}
2600 3040
2601############################################################################# 3041#############################################################################
2602 3042
2603package CFPlus::UI::Slider; 3043package DC::UI::Slider;
2604 3044
2605use strict; 3045use strict;
2606 3046
2607use CFPlus::OpenGL; 3047use DC::OpenGL;
2608 3048
2609our @ISA = CFPlus::UI::DrawBG::; 3049our @ISA = DC::UI::DrawBG::;
2610 3050
2611my @tex = 3051my @tex =
2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3052 map { new_from_resource DC::Texture $_ }
2613 qw(s1_slider.png s1_slider_bg.png); 3053 qw(s1_slider.png s1_slider_bg.png);
2614 3054
2615sub new { 3055sub new {
2616 my $class = shift; 3056 my $class = shift;
2617 3057
… …
2654sub set_value { 3094sub set_value {
2655 my ($self, $value) = @_; 3095 my ($self, $value) = @_;
2656 3096
2657 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3097 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2658 3098
2659 $hi = $lo + 1 if $hi <= $lo; 3099 $hi = $lo if $hi < $lo;
2660 3100
2661 $page = $hi - $lo if $page > $hi - $lo; 3101 $value = $hi - $page if $value > $hi - $page;
2662
2663 $value = $lo if $value < $lo; 3102 $value = $lo if $value < $lo;
2664 $value = $hi - $page if $value > $hi - $page;
2665 3103
2666 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3104 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2667 if $unit; 3105 if $unit;
2668 3106
2669 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3107 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2685 3123
2686 $self->SUPER::invoke_button_down ($ev, $x, $y); 3124 $self->SUPER::invoke_button_down ($ev, $x, $y);
2687 3125
2688 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3126 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2689 3127
2690 $self->invoke_mouse_motion ($ev, $x, $y) 3128 $self->invoke_mouse_motion ($ev, $x, $y);
3129
3130 1
2691} 3131}
2692 3132
2693sub invoke_mouse_motion { 3133sub invoke_mouse_motion {
2694 my ($self, $ev, $x, $y) = @_; 3134 my ($self, $ev, $x, $y) = @_;
2695 3135
… …
2711sub invoke_mouse_wheel { 3151sub invoke_mouse_wheel {
2712 my ($self, $ev) = @_; 3152 my ($self, $ev) = @_;
2713 3153
2714 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3154 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2715 3155
2716 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3156 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2717 3157
2718 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3158 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2719 3159
2720 ! ! $delta 3160 1
2721} 3161}
2722 3162
2723sub update { 3163sub update {
2724 my ($self) = @_; 3164 my ($self) = @_;
2725 3165
… …
2731 my ($self) = @_; 3171 my ($self) = @_;
2732 3172
2733 unless ($self->{knob_w}) { 3173 unless ($self->{knob_w}) {
2734 $self->set_value ($self->{range}[0]); 3174 $self->set_value ($self->{range}[0]);
2735 3175
2736 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3176 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2737 my $range = ($hi - $page - $lo) || 1e-100; 3177 my $range = ($hi - $page - $lo) || 1e-10;
2738 3178
2739 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3179 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2740 3180
2741 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3181 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2742 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3182 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2743 3183
2744 $value = ($value - $lo) / $range; 3184 $value = ($value - $lo) / $range;
… …
2774 glDisable GL_TEXTURE_2D; 3214 glDisable GL_TEXTURE_2D;
2775} 3215}
2776 3216
2777############################################################################# 3217#############################################################################
2778 3218
2779package CFPlus::UI::ValSlider; 3219package DC::UI::ValSlider;
2780 3220
2781our @ISA = CFPlus::UI::HBox::; 3221our @ISA = DC::UI::HBox::;
2782 3222
2783sub new { 3223sub new {
2784 my ($class, %arg) = @_; 3224 my ($class, %arg) = @_;
2785 3225
2786 my $range = delete $arg{range}; 3226 my $range = delete $arg{range};
2787 3227
2788 my $self = $class->SUPER::new ( 3228 my $self = $class->SUPER::new (
2789 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3229 slider => (new DC::UI::Slider expand => 1, range => $range),
2790 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3230 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2791 to_value => sub { shift }, 3231 to_value => sub { shift },
2792 from_value => sub { shift }, 3232 from_value => sub { shift },
2793 %arg, 3233 %arg,
2794 ); 3234 );
2795 3235
… …
2815sub set_range { shift->{slider}->set_range (@_) } 3255sub set_range { shift->{slider}->set_range (@_) }
2816sub set_value { shift->{slider}->set_value (@_) } 3256sub set_value { shift->{slider}->set_value (@_) }
2817 3257
2818############################################################################# 3258#############################################################################
2819 3259
2820package CFPlus::UI::TextScroller; 3260package DC::UI::TextScroller;
2821 3261
2822our @ISA = CFPlus::UI::HBox::; 3262our @ISA = DC::UI::HBox::;
2823 3263
2824use CFPlus::OpenGL; 3264use DC::OpenGL;
2825 3265
2826sub new { 3266sub new {
2827 my $class = shift; 3267 my $class = shift;
2828 3268
2829 my $self = $class->SUPER::new ( 3269 my $self = $class->SUPER::new (
… …
2831 can_events => 1, 3271 can_events => 1,
2832 indent => 0, 3272 indent => 0,
2833 #font => default_font 3273 #font => default_font
2834 @_, 3274 @_,
2835 3275
2836 layout => (new CFPlus::Layout), 3276 layout => (new DC::Layout),
2837 par => [], 3277 par => [],
2838 max_par => 0, 3278 max_par => 0,
2839 height => 0, 3279 height => 0,
2840 children => [ 3280 children => [
2841 (new CFPlus::UI::Empty expand => 1), 3281 (new DC::UI::Empty expand => 1),
2842 (new CFPlus::UI::Slider vertical => 1), 3282 (new DC::UI::Slider vertical => 1),
2843 ], 3283 ],
2844 ); 3284 );
2845 3285
2846 $self->{children}[1]->connect (changed => sub { $self->update }); 3286 $self->{children}[1]->connect (changed => sub { $self->update });
2847 3287
… …
2856} 3296}
2857 3297
2858sub size_request { 3298sub size_request {
2859 my ($self) = @_; 3299 my ($self) = @_;
2860 3300
2861 my ($empty, $slider) = @{ $self->{children} }; 3301 my ($empty, $slider) = $self->visible_children;
2862 3302
2863 local $self->{children} = [$empty, $slider]; 3303 local $self->{children} = [$empty, $slider];
2864 $self->SUPER::size_request 3304 $self->SUPER::size_request
2865} 3305}
2866 3306
… …
2903 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3343 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2904 $layout->set_markup ($para->{markup}); 3344 $layout->set_markup ($para->{markup});
2905 3345
2906 $layout->set_shapes ( 3346 $layout->set_shapes (
2907 map 3347 map
2908 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3348 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2909 @{$para->{widget}} 3349 @{$para->{widget}}
2910 ); 3350 );
2911 3351
2912 $layout 3352 $layout
2913} 3353}
… …
3030 $ROOT->on_post_alloc ($self => sub { 3470 $ROOT->on_post_alloc ($self => sub {
3031 $self->force_uptodate; 3471 $self->force_uptodate;
3032 3472
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3473 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034 3474
3035 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3475 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3036 glClearColor 0, 0, 0, 0; 3476 glClearColor 0, 0, 0, 0;
3037 glClear GL_COLOR_BUFFER_BIT; 3477 glClear GL_COLOR_BUFFER_BIT;
3038 3478
3039 package CFPlus::UI::Base; 3479 package DC::UI::Base;
3040 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3480 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3041 (0, 0, $self->{w}, $self->{h}); 3481 (0, 0, $self->{w}, $self->{h});
3042 3482
3043 my $top = int $self->{children}[1]{range}[0]; 3483 my $top = int $self->{children}[1]{range}[0];
3044 3484
… …
3055 3495
3056 if ($y0 < $y + $h && $y < $y1) { 3496 if ($y0 < $y + $h && $y < $y1) {
3057 my $layout = $self->get_layout ($para); 3497 my $layout = $self->get_layout ($para);
3058 3498
3059 $layout->render ($para->{indent}, $y - $y0); 3499 $layout->render ($para->{indent}, $y - $y0);
3500 $layout->draw;
3060 3501
3061 if (my @w = @{ $para->{widget} }) { 3502 if (my @w = @{ $para->{widget} }) {
3062 my @s = $layout->get_shapes; 3503 my @s = $layout->get_shapes;
3063 3504
3064 for (@w) { 3505 for (@w) {
… …
3102 $self->{children}[1]->draw; 3543 $self->{children}[1]->draw;
3103} 3544}
3104 3545
3105############################################################################# 3546#############################################################################
3106 3547
3107package CFPlus::UI::Animator; 3548package DC::UI::Animator;
3108 3549
3109use CFPlus::OpenGL; 3550use DC::OpenGL;
3110 3551
3111our @ISA = CFPlus::UI::Bin::; 3552our @ISA = DC::UI::Bin::;
3112 3553
3113sub moveto { 3554sub moveto {
3114 my ($self, $x, $y) = @_; 3555 my ($self, $x, $y) = @_;
3115 3556
3116 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3557 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3144 glPopMatrix; 3585 glPopMatrix;
3145} 3586}
3146 3587
3147############################################################################# 3588#############################################################################
3148 3589
3149package CFPlus::UI::Flopper; 3590package DC::UI::Flopper;
3150 3591
3151our @ISA = CFPlus::UI::Button::; 3592our @ISA = DC::UI::Button::;
3152 3593
3153sub new { 3594sub new {
3154 my $class = shift; 3595 my $class = shift;
3155 3596
3156 my $self = $class->SUPER::new ( 3597 my $self = $class->SUPER::new (
… …
3168 $self->{other}->toggle_visibility; 3609 $self->{other}->toggle_visibility;
3169} 3610}
3170 3611
3171############################################################################# 3612#############################################################################
3172 3613
3173package CFPlus::UI::Tooltip; 3614package DC::UI::Tooltip;
3174 3615
3175our @ISA = CFPlus::UI::Bin::; 3616our @ISA = DC::UI::Bin::;
3176 3617
3177use CFPlus::OpenGL; 3618use DC::OpenGL;
3178 3619
3179sub new { 3620sub new {
3180 my $class = shift; 3621 my $class = shift;
3181 3622
3182 $class->SUPER::new ( 3623 $class->SUPER::new (
… …
3186} 3627}
3187 3628
3188sub set_tooltip_from { 3629sub set_tooltip_from {
3189 my ($self, $widget) = @_; 3630 my ($self, $widget) = @_;
3190 3631
3191 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3192 if $widget->{tooltip} =~ /^#(.*)$/;
3193
3194 my $tooltip = $widget->{tooltip}; 3632 my $tip = $widget->{tooltip};
3633 $tip = $tip->($widget) if "CODE" eq ref $tip;
3634
3635 $tip = DC::Pod::section_label tooltip => $1
3636 if $tip =~ /^#(.*)$/;
3195 3637
3196 if ($ENV{CFPLUS_DEBUG} & 2) { 3638 if ($ENV{CFPLUS_DEBUG} & 2) {
3197 $tooltip .= "\n\n" . (ref $widget) . "\n" 3639 $tip .= "\n\n" . (ref $widget) . "\n"
3198 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3640 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3199 . "req $widget->{req_w} $widget->{req_h}\n" 3641 . "req $widget->{req_w} $widget->{req_h}\n"
3200 . "visible $widget->{visible}"; 3642 . "visible $widget->{visible}";
3201 } 3643 }
3202 3644
3203 $tooltip =~ s/^\n+//; 3645 $tip =~ s/^\n+//;
3204 $tooltip =~ s/\n+$//; 3646 $tip =~ s/\n+$//;
3205 3647
3206 $self->add (new CFPlus::UI::Label 3648 $self->add (new DC::UI::Label
3649 fg => $DC::THEME{tooltip_fg},
3207 markup => $tooltip, 3650 markup => $tip,
3208 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3651 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3652 align => 0,
3209 fontsize => 0.8, 3653 fontsize => 0.8,
3210 style => 1, # FLAG_INVERSE 3654 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3211 ellipsise => 0, 3655 ellipsise => 0,
3212 font => ($widget->{tooltip_font} || $::FONT_PROP), 3656 font => ($widget->{tooltip_font} || $::FONT_PROP),
3213 ); 3657 );
3214} 3658}
3215 3659
… …
3250} 3694}
3251 3695
3252sub _draw { 3696sub _draw {
3253 my ($self) = @_; 3697 my ($self) = @_;
3254 3698
3255 glTranslate 0.375, 0.375;
3256
3257 my ($w, $h) = @$self{qw(w h)}; 3699 my ($w, $h) = @$self{qw(w h)};
3258 3700
3259 glColor 1, 0.8, 0.4; 3701 glColor @{ $DC::THEME{tooltip_bg} };
3260 glBegin GL_QUADS; 3702 glRect 0, 0, $w, $h;
3261 glVertex 0 , 0;
3262 glVertex 0 , $h;
3263 glVertex $w, $h;
3264 glVertex $w, 0;
3265 glEnd;
3266 3703
3267 glColor 0, 0, 0; 3704 glColor @{ $DC::THEME{tooltip_border} };
3268 glBegin GL_LINE_LOOP; 3705 glRect_lineloop .5, .5, $w + .5, $h + .5;
3269 glVertex 0 , 0;
3270 glVertex 0 , $h;
3271 glVertex $w, $h;
3272 glVertex $w, 0;
3273 glEnd;
3274 3706
3275 glTranslate 2 - 0.375, 2 - 0.375; 3707 glTranslate 2, 2;
3276 3708
3277 $self->SUPER::_draw; 3709 $self->SUPER::_draw;
3278} 3710}
3279 3711
3280############################################################################# 3712#############################################################################
3281 3713
3282package CFPlus::UI::Face; 3714package DC::UI::Face;
3283 3715
3284our @ISA = CFPlus::UI::DrawBG::; 3716our @ISA = DC::UI::DrawBG::;
3285 3717
3286use CFPlus::OpenGL; 3718use DC::OpenGL;
3287 3719
3288sub new { 3720sub new {
3289 my $class = shift; 3721 my $class = shift;
3290 3722
3291 my $self = $class->SUPER::new ( 3723 my $self = $class->SUPER::new (
3724 size_w => 32,
3725 size_h => 8,
3292 aspect => 1, 3726 aspect => 1,
3293 can_events => 0, 3727 can_events => 0,
3294 @_, 3728 @_,
3295 ); 3729 );
3296 3730
3297 if ($self->{anim} && $self->{animspeed}) { 3731 $self->update_anim;
3298 CFPlus::weaken (my $widget = $self);
3299
3300 $self->{timer} = Event->timer (
3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3302 hard => 1,
3303 interval => $self->{animspeed},
3304 cb => sub {
3305 ++$widget->{frame};
3306 $widget->update;
3307 },
3308 );
3309 }
3310 3732
3311 $self 3733 $self
3312} 3734}
3313 3735
3736sub update_timer {
3737 my ($self) = @_;
3738
3739 return unless $self->{timer};
3740
3741 if ($self->{visible}) {
3742 $self->{timer}->start;
3743 } else {
3744 $self->{timer}->stop;
3745 }
3746}
3747
3748sub update_face {
3749 my ($self) = @_;
3750
3751 if ($::CONN) {
3752 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3753 if ($anim && @$anim) {
3754 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3755 delete $self->{face_change_cb};
3756
3757 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3758 unless ($tex->{name} || $tex->{loading}) {
3759 $tex->upload (sub { $self->reconfigure });
3760 }
3761 }
3762 }
3763 }
3764 }
3765}
3766
3767sub update_anim {
3768 my ($self) = @_;
3769
3770 if ($self->{anim} && $self->{animspeed}) {
3771 DC::weaken (my $widget = $self);
3772
3773 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3774 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3775 return unless $::CONN;
3776
3777 my $w = $widget
3778 or return;
3779
3780 ++$w->{frame};
3781 $w->update_face;
3782
3783 # somehow, $widget can go away
3784 $w->update;
3785 $w->update_timer;
3786 };
3787
3788 $self->update_face;
3789 $self->update_timer;
3790 } else {
3791 delete $self->{timer};
3792 }
3793}
3794
3314sub size_request { 3795sub size_request {
3315 (32, 8) 3796 my ($self) = @_;
3797
3798 if ($::CONN) {
3799 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3800 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3801 if ($tex->{name}) {
3802 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3803 } elsif (!$tex->{loading}) {
3804 $tex->upload (sub { $self->reconfigure });
3805 }
3806 }
3807
3808 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3809 }
3810 }
3811
3812 ($self->{size_w} || 8, $self->{size_h} || 8)
3316} 3813}
3317 3814
3318sub update { 3815sub update {
3319 my ($self) = @_; 3816 my ($self) = @_;
3320 3817
3321 return unless $self->{visible}; 3818 return unless $self->{visible};
3322 3819
3323 $self->SUPER::update; 3820 $self->SUPER::update;
3324} 3821}
3325 3822
3823sub set_face {
3824 my ($self, $face) = @_;
3825
3826 $self->{face} = $face;
3827 $self->reconfigure;
3828}
3829
3830sub set_anim {
3831 my ($self, $anim) = @_;
3832
3833 $self->{anim} = $anim;
3834 $self->update_anim;
3835}
3836
3837sub set_animspeed {
3838 my ($self, $animspeed) = @_;
3839
3840 $self->{animspeed} = $animspeed;
3841 $self->update_anim;
3842}
3843
3844sub invoke_visibility_change {
3845 my ($self) = @_;
3846
3847 $self->update_timer;
3848
3849 0
3850}
3851
3326sub _draw { 3852sub _draw {
3327 my ($self) = @_; 3853 my ($self) = @_;
3328 3854
3329 return unless $::CONN;
3330
3331 $self->SUPER::_draw; 3855 $self->SUPER::_draw;
3332 3856
3333 my $face; 3857 if (my $tex = $self->{tex}) {
3334
3335 if ($self->{frame}) {
3336 my $anim = $::CONN->{anim}[$self->{anim}];
3337
3338 $face = $anim->[ $self->{frame} % @$anim ]
3339 if $anim && @$anim;
3340 }
3341
3342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3343
3344 if ($tex) {
3345 glEnable GL_TEXTURE_2D; 3858 glEnable GL_TEXTURE_2D;
3346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3347 glColor 0, 0, 0, 1; 3860 glColor 0, 0, 0, 1;
3348 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3349 glDisable GL_TEXTURE_2D; 3862 glDisable GL_TEXTURE_2D;
… …
3351} 3864}
3352 3865
3353sub destroy { 3866sub destroy {
3354 my ($self) = @_; 3867 my ($self) = @_;
3355 3868
3356 $self->{timer}->cancel 3869 (delete $self->{timer})->cancel
3357 if $self->{timer}; 3870 if $self->{timer};
3358 3871
3359 $self->SUPER::destroy; 3872 $self->SUPER::destroy;
3360} 3873}
3361 3874
3362############################################################################# 3875#############################################################################
3363 3876
3364package CFPlus::UI::Buttonbar; 3877package DC::UI::Buttonbar;
3365 3878
3366our @ISA = CFPlus::UI::HBox::; 3879our @ISA = DC::UI::HBox::;
3367 3880
3368# TODO: should actually wrap buttons and other goodies. 3881# TODO: should actually wrap buttons and other goodies.
3369 3882
3370############################################################################# 3883#############################################################################
3371 3884
3372package CFPlus::UI::Menu; 3885package DC::UI::Menu;
3373 3886
3374our @ISA = CFPlus::UI::Toplevel::; 3887our @ISA = DC::UI::Toplevel::;
3375 3888
3376use CFPlus::OpenGL; 3889use DC::OpenGL;
3377 3890
3378sub new { 3891sub new {
3379 my $class = shift; 3892 my $class = shift;
3380 3893
3381 my $self = $class->SUPER::new ( 3894 my $self = $class->SUPER::new (
3382 items => [], 3895 items => [],
3383 z => 100, 3896 z => 100,
3384 @_, 3897 @_,
3385 ); 3898 );
3386 3899
3387 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3900 $self->add ($self->{vbox} = new DC::UI::VBox);
3388 3901
3389 for my $item (@{ $self->{items} }) { 3902 for my $item (@{ $self->{items} }) {
3390 my ($widget, $cb, $tooltip) = @$item; 3903 my ($widget, $cb, $tooltip) = @$item;
3391 3904
3392 # handle various types of items, only text for now 3905 # handle various types of items, only text for now
3393 if (!ref $widget) { 3906 if (!ref $widget) {
3394 if ($widget =~ /\t/) { 3907 if ($widget =~ /\t/) {
3395 my ($left, $right) = split /\t/, $widget, 2; 3908 my ($left, $right) = split /\t/, $widget, 2;
3396 3909
3397 $widget = new CFPlus::UI::HBox 3910 $widget = new DC::UI::HBox
3398 can_hover => 1, 3911 can_hover => 1,
3399 can_events => 1, 3912 can_events => 1,
3400 tooltip => $tooltip, 3913 tooltip => $tooltip,
3401 children => [ 3914 children => [
3402 (new CFPlus::UI::Label markup => $left, expand => 1), 3915 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3403 (new CFPlus::UI::Label markup => $right, align => +1), 3916 (new DC::UI::Label markup => $right, align => 1),
3404 ], 3917 ],
3405 ; 3918 ;
3406 3919
3407 } else { 3920 } else {
3408 $widget = new CFPlus::UI::Label 3921 $widget = new DC::UI::Label
3409 can_hover => 1, 3922 can_hover => 1,
3410 can_events => 1, 3923 can_events => 1,
3924 align => 0,
3411 markup => $widget, 3925 markup => $widget,
3412 tooltip => $tooltip; 3926 tooltip => $tooltip;
3413 } 3927 }
3414 } 3928 }
3415 3929
… …
3430 # maybe save $GRAB? must be careful about events... 3944 # maybe save $GRAB? must be careful about events...
3431 $GRAB = $self; 3945 $GRAB = $self;
3432 $self->{button} = $ev->{button}; 3946 $self->{button} = $ev->{button};
3433 3947
3434 $self->show; 3948 $self->show;
3435 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3949
3950 my $x = $ev->{x};
3951 my $y = $ev->{y};
3952
3953 $self->{root}->on_post_alloc ($self => sub {
3954 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3955 });
3956
3957 1 # so it can be used inside event handlers
3436} 3958}
3437 3959
3438sub invoke_mouse_motion { 3960sub invoke_mouse_motion {
3439 my ($self, $ev, $x, $y) = @_; 3961 my ($self, $ev, $x, $y) = @_;
3440 3962
… …
3461 1 3983 1
3462} 3984}
3463 3985
3464############################################################################# 3986#############################################################################
3465 3987
3466package CFPlus::UI::Multiplexer; 3988package DC::UI::Multiplexer;
3467 3989
3468our @ISA = CFPlus::UI::Container::; 3990our @ISA = DC::UI::Container::;
3469 3991
3470sub new { 3992sub new {
3471 my $class = shift; 3993 my $class = shift;
3472 3994
3473 my $self = $class->SUPER::new ( 3995 my $self = $class->SUPER::new (
3474 @_, 3996 @_,
3475 ); 3997 );
3476 3998
3477 $self->{current} = $self->{children}[0] 3999 $self->set_current_page (0);
3478 if @{ $self->{children} };
3479 4000
3480 $self 4001 $self
3481} 4002}
3482 4003
3483sub add { 4004sub add {
3484 my ($self, @widgets) = @_; 4005 my ($self, @widgets) = @_;
3485 4006
3486 $self->SUPER::add (@widgets); 4007 $self->SUPER::add (@widgets);
3487 4008
3488 $self->{current} = $self->{children}[0] 4009 $self->set_current_page (0)
3489 if @{ $self->{children} }; 4010 if @widgets == @{ $self->{children} };
3490} 4011}
3491 4012
3492sub get_current_page { 4013sub get_current_page {
3493 my ($self) = @_; 4014 my ($self) = @_;
3494 4015
… …
3500 4021
3501 my $widget = ref $page_or_widget 4022 my $widget = ref $page_or_widget
3502 ? $page_or_widget 4023 ? $page_or_widget
3503 : $self->{children}[$page_or_widget]; 4024 : $self->{children}[$page_or_widget];
3504 4025
4026 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4027
3505 $self->{current} = $widget; 4028 if (($self->{current} = $widget)) {
4029 $self->{current}->set_visible if $self->{current} && $self->{visible};
3506 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4030 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3507 4031
3508 $self->emit (page_changed => $self->{current}); 4032 $self->emit (page_changed => $self->{current});
4033 }
3509 4034
3510 $self->realloc; 4035 $self->realloc;
3511} 4036}
3512 4037
3513sub visible_children { 4038sub visible_children {
3514 $_[0]{current} 4039 $_[0]{current} || ()
3515} 4040}
3516 4041
3517sub size_request { 4042sub size_request {
3518 my ($self) = @_; 4043 my ($self) = @_;
3519 4044
4045 $self->{current}
3520 $self->{current}->size_request 4046 ? $self->{current}->size_request
4047 : (0, 0)
3521} 4048}
3522 4049
3523sub invoke_size_allocate { 4050sub invoke_size_allocate {
3524 my ($self, $w, $h) = @_; 4051 my ($self, $w, $h) = @_;
3525 4052
3526 $self->{current}->configure (0, 0, $w, $h); 4053 $self->{current}->configure (0, 0, $w, $h)
4054 if $self->{current};
3527 4055
3528 1 4056 1
3529} 4057}
3530 4058
3531sub _draw { 4059sub _draw {
3532 my ($self) = @_; 4060 my ($self) = @_;
3533 4061
3534 $self->{current}->draw; 4062 $self->{current}->draw
4063 if $self->{current};
3535} 4064}
3536 4065
3537############################################################################# 4066#############################################################################
3538 4067
3539package CFPlus::UI::Notebook; 4068package DC::UI::Notebook;
3540 4069
4070use DC::OpenGL;
4071
3541our @ISA = CFPlus::UI::VBox::; 4072our @ISA = DC::UI::VBox::;
3542 4073
3543sub new { 4074sub new {
3544 my $class = shift; 4075 my $class = shift;
3545 4076
3546 my $self = $class->SUPER::new ( 4077 my $self = $class->SUPER::new (
3547 buttonbar => (new CFPlus::UI::Buttonbar), 4078 buttonbar => (new DC::UI::Buttonbar),
3548 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4079 multiplexer => (new DC::UI::Multiplexer expand => 1),
4080 active_outline => [.7, .7, 0.2],
3549 # filter => # will be put between multiplexer and $self 4081 # filter => # will be put between multiplexer and $self
3550 @_, 4082 @_,
3551 ); 4083 );
3552 4084
3553 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4085 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3554 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4086 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3555 4087
4088 {
4089 Scalar::Util::weaken (my $wself = $self);
4090
4091 $self->{multiplexer}->connect (c_add => sub {
4092 my ($mplex, $widgets) = @_;
4093
4094 for my $child (@$widgets) {
4095 Scalar::Util::weaken $child;
4096 $child->{c_tab_} ||= do {
4097 my $tab =
4098 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4099 ? $child->{c_tab}
4100 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4101
4102 $tab->connect (activate => sub {
4103 $wself->set_current_page ($child);
4104 });
4105
4106 $tab
4107 };
4108
4109 $self->{buttonbar}->add ($child->{c_tab_});
4110 }
4111 });
4112
4113 $self->{multiplexer}->connect (c_remove => sub {
4114 my ($mplex, $widgets) = @_;
4115
4116 for my $child (@$widgets) {
4117 $wself->{buttonbar}->remove ($child->{c_tab_});
4118 }
4119 });
4120 }
4121
3556 $self 4122 $self
3557} 4123}
3558 4124
3559sub add { 4125sub add {
4126 my ($self, @widgets) = @_;
4127
4128 $self->{multiplexer}->add (@widgets)
4129}
4130
4131sub remove {
4132 my ($self, @widgets) = @_;
4133
4134 $self->{multiplexer}->remove (@widgets)
4135}
4136
4137sub pages {
4138 my ($self) = @_;
4139 $self->{multiplexer}->children
4140}
4141
4142sub page_index {
4143 my ($self, $widget) = @_;
4144
4145 my $i = 0;
4146 for ($self->pages) {
4147 if ($_ eq $widget) { return $i };
4148 $i++;
4149 }
4150
4151 undef
4152}
4153
4154sub add_tab {
3560 my ($self, $title, $widget, $tooltip) = @_; 4155 my ($self, $title, $widget, $tooltip) = @_;
3561 4156
3562 CFPlus::weaken $self; 4157 $title = [$title, $tooltip] unless ref $title;
4158 $widget->{c_tab} = $title;
3563 4159
3564 $self->{buttonbar}->add (new CFPlus::UI::Button
3565 markup => $title,
3566 tooltip => $tooltip,
3567 on_activate => sub { $self->set_current_page ($widget) },
3568 );
3569
3570 $self->{multiplexer}->add ($widget); 4160 $self->add ($widget);
3571} 4161}
3572 4162
3573sub get_current_page { 4163sub get_current_page {
3574 my ($self) = @_; 4164 my ($self) = @_;
3575 4165
… …
3581 4171
3582 $self->{multiplexer}->set_current_page ($page); 4172 $self->{multiplexer}->set_current_page ($page);
3583 $self->emit (page_changed => $self->{multiplexer}{current}); 4173 $self->emit (page_changed => $self->{multiplexer}{current});
3584} 4174}
3585 4175
4176sub _draw {
4177 my ($self) = @_;
4178
4179 $self->SUPER::_draw ();
4180
4181 if (my $cur = $self->{multiplexer}{current}) {
4182 if ($cur = $cur->{c_tab_}) {
4183 glTranslate $self->{buttonbar}{x} + $cur->{x},
4184 $self->{buttonbar}{y} + $cur->{y};
4185 glLineWidth 3;
4186 #glEnable GL_BLEND;
4187 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4188 glColor @{$self->{active_outline}};
4189 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4190 glLineWidth 1;
4191 #glDisable GL_BLEND;
4192 }
4193 }
4194}
4195
3586############################################################################# 4196#############################################################################
3587 4197
3588package CFPlus::UI::Selector; 4198package DC::UI::Selector;
3589 4199
3590use utf8; 4200use utf8;
3591 4201
3592our @ISA = CFPlus::UI::Button::; 4202our @ISA = DC::UI::Button::;
3593 4203
3594sub new { 4204sub new {
3595 my $class = shift; 4205 my $class = shift;
3596 4206
3597 my $self = $class->SUPER::new ( 4207 my $self = $class->SUPER::new (
… …
3614 my ($value, $title, $tooltip) = @$_; 4224 my ($value, $title, $tooltip) = @$_;
3615 4225
3616 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4226 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3617 } 4227 }
3618 4228
3619 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4229 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3620} 4230}
3621 4231
3622sub _set_value { 4232sub _set_value {
3623 my ($self, $value) = @_; 4233 my ($self, $value) = @_;
3624 4234
3625 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4235 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4236 $item ||= $self->{options}[0]
3626 or return; 4237 or return;
3627 4238
3628 $self->{value} = $item->[0]; 4239 $self->{value} = $item->[0];
3629 $self->set_markup ("$item->[1] ⇓"); 4240 $self->set_markup ("$item->[1] ⇓");
3630 $self->set_tooltip ($item->[2]); 4241# $self->set_tooltip ($item->[2]);
3631} 4242}
3632 4243
3633sub set_value { 4244sub set_value {
3634 my ($self, $value) = @_; 4245 my ($self, $value) = @_;
3635 4246
… …
3637 4248
3638 $self->_set_value ($value); 4249 $self->_set_value ($value);
3639 $self->emit (changed => $value); 4250 $self->emit (changed => $value);
3640} 4251}
3641 4252
4253sub set_options {
4254 my ($self, $options) = @_;
4255
4256 $self->{options} = $options;
4257 $self->_set_value ($self->{value});
4258}
4259
3642############################################################################# 4260#############################################################################
3643 4261
3644package CFPlus::UI::Statusbox; 4262package DC::UI::Statusbox;
3645 4263
3646our @ISA = CFPlus::UI::VBox::; 4264our @ISA = DC::UI::VBox::;
3647 4265
3648sub new { 4266sub new {
3649 my $class = shift; 4267 my $class = shift;
3650 4268
3651 my $self = $class->SUPER::new ( 4269 my $self = $class->SUPER::new (
3652 fontsize => 0.8, 4270 fontsize => 0.8,
3653 @_, 4271 @_,
3654 ); 4272 );
3655 4273
3656 CFPlus::weaken (my $this = $self); 4274 DC::weaken (my $this = $self);
3657 4275
3658 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4276 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3659 4277
3660 $self 4278 $self
3661} 4279}
3662 4280
3663sub reorder { 4281sub reorder {
3664 my ($self) = @_; 4282 my ($self) = @_;
3665 my $NOW = Time::HiRes::time; 4283 my $NOW = EV::time;
3666 4284
3667 # freeze display when hovering over any label 4285 # freeze display when hovering over any label
3668 return if $CFPlus::UI::TOOLTIP->{owner} 4286 return if $DC::UI::TOOLTIP->{owner}
3669 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4287 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3670 values %{ $self->{item} }; 4288 values %{ $self->{item} };
3671 4289
3672 while (my ($k, $v) = each %{ $self->{item} }) { 4290 while (my ($k, $v) = each %{ $self->{item} }) {
3673 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4291 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3674 } 4292 }
4293
4294 $self->{timer}->set (1, 1);
3675 4295
3676 my @widgets; 4296 my @widgets;
3677 4297
3678 my @items = sort { 4298 my @items = sort {
3679 $a->{pri} <=> $b->{pri} 4299 $a->{pri} <=> $b->{pri}
3680 or $b->{id} <=> $a->{id} 4300 or $b->{id} <=> $a->{id}
3681 } values %{ $self->{item} }; 4301 } values %{ $self->{item} };
3682
3683 $self->{timer}->interval (1);
3684 4302
3685 my $count = 10 + 1; 4303 my $count = 10 + 1;
3686 for my $item (@items) { 4304 for my $item (@items) {
3687 last unless --$count; 4305 last unless --$count;
3688 4306
… …
3695 for ($short) { 4313 for ($short) {
3696 s/^\s+//; 4314 s/^\s+//;
3697 s/\s+/ /g; 4315 s/\s+/ /g;
3698 } 4316 }
3699 4317
3700 new CFPlus::UI::Label 4318 new DC::UI::Label
3701 markup => $short, 4319 markup => $short,
3702 tooltip => $item->{tooltip}, 4320 tooltip => $item->{tooltip},
3703 tooltip_font => $::FONT_PROP, 4321 tooltip_font => $::FONT_PROP,
3704 tooltip_width => 0.67, 4322 tooltip_width => 0.67,
3705 fontsize => $item->{fontsize} || $self->{fontsize}, 4323 fontsize => $item->{fontsize} || $self->{fontsize},
3706 max_w => $::WIDTH * 0.44, 4324 max_w => $::WIDTH * 0.44,
4325 align => 0,
3707 fg => [@{ $item->{fg} }], 4326 fg => [@{ $item->{fg} }],
3708 can_events => 1, 4327 can_events => 1,
3709 can_hover => 1 4328 can_hover => 1
3710 }; 4329 };
3711 4330
3712 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4331 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3713 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4332 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3714 $label->update; 4333 $label->update;
3715 $label->set_max_size (undef, $label->{req_h} * $diff) 4334 $label->set_max_size (undef, $label->{req_h} * $diff)
3716 if $diff < 1; 4335 if $diff < 1;
3717 $self->{timer}->interval (1/30); 4336 $self->{timer}->set (1/30, 1/30);
3718 } else { 4337 } else {
3719 $label->{fg}[3] = $item->{fg}[3] || 1; 4338 $label->{fg}[3] = $item->{fg}[3] || 1;
3720 } 4339 }
3721 4340
3722 push @widgets, $label; 4341 push @widgets, $label;
3723 } 4342 }
4343
4344 my $hash = join ",", @widgets;
4345 return if $hash eq $self->{last_widget_hash};
4346 $self->{last_widget_hash} = $hash;
3724 4347
3725 $self->clear; 4348 $self->clear;
3726 $self->SUPER::add (reverse @widgets); 4349 $self->SUPER::add (reverse @widgets);
3727} 4350}
3728 4351
… …
3784 $self->SUPER::destroy; 4407 $self->SUPER::destroy;
3785} 4408}
3786 4409
3787############################################################################# 4410#############################################################################
3788 4411
3789package CFPlus::UI::Root; 4412package DC::UI::Root;
3790 4413
3791our @ISA = CFPlus::UI::Container::; 4414our @ISA = DC::UI::Container::;
3792 4415
3793use List::Util qw(min max); 4416use List::Util qw(min max);
3794 4417
3795use CFPlus::OpenGL; 4418use DC::OpenGL;
3796 4419
3797sub new { 4420sub new {
3798 my $class = shift; 4421 my $class = shift;
3799 4422
3800 my $self = $class->SUPER::new ( 4423 my $self = $class->SUPER::new (
3801 visible => 1, 4424 visible => 1,
3802 @_, 4425 @_,
3803 ); 4426 );
3804 4427
3805 CFPlus::weaken ($self->{root} = $self); 4428 DC::weaken ($self->{root} = $self);
3806 4429
3807 $self 4430 $self
3808} 4431}
3809 4432
3810sub size_request { 4433sub size_request {
… …
3858} 4481}
3859 4482
3860sub update { 4483sub update {
3861 my ($self) = @_; 4484 my ($self) = @_;
3862 4485
3863 $::WANT_REFRESH++; 4486 $::WANT_REFRESH = 1;
3864} 4487}
3865 4488
3866sub add { 4489sub add {
3867 my ($self, @children) = @_; 4490 my ($self, @children) = @_;
3868 4491
… …
3905 while ($self->{refresh_hook}) { 4528 while ($self->{refresh_hook}) {
3906 $_->() 4529 $_->()
3907 for values %{delete $self->{refresh_hook}}; 4530 for values %{delete $self->{refresh_hook}};
3908 } 4531 }
3909 4532
3910 if ($self->{realloc}) { 4533 while ($self->{realloc}) {
3911 my %queue; 4534 my %queue;
3912 my @queue; 4535 my @queue;
3913 my $widget; 4536 my $widget;
3914 4537
3915 outer: 4538 outer:
… …
3935 4558
3936 delete $queue{$widget+0}; 4559 delete $queue{$widget+0};
3937 4560
3938 my ($w, $h) = $widget->size_request; 4561 my ($w, $h) = $widget->size_request;
3939 4562
3940 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4563 $w += $widget->{padding_x} * 2;
3941 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4564 $h += $widget->{padding_y} * 2;
4565
4566 $w = max $widget->{min_w}, $w;
4567 $h = max $widget->{min_h}, $h;
3942 4568
3943 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4569 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3944 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4570 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3945 4571
3946 $w = $widget->{force_w} if exists $widget->{force_w}; 4572 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3962 } 4588 }
3963 } 4589 }
3964 4590
3965 delete $self->{realloc}{$widget+0}; 4591 delete $self->{realloc}{$widget+0};
3966 } 4592 }
3967 }
3968 4593
3969 while (my $size_alloc = delete $self->{size_alloc}) { 4594 while (my $size_alloc = delete $self->{size_alloc}) {
3970 my @queue = sort { $b->{visible} <=> $a->{visible} } 4595 my @queue = sort { $a->{visible} <=> $b->{visible} }
3971 values %$size_alloc; 4596 values %$size_alloc;
3972 4597
3973 while () { 4598 while () {
3974 my $widget = pop @queue || last; 4599 my $widget = pop @queue || last;
3975 4600
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4601 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 4602
3978 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0;
3980
3981 $w = max $widget->{min_w}, $w; 4603 $w = max $widget->{min_w}, $w;
3982 $h = max $widget->{min_h}, $h; 4604 $h = max $widget->{min_h}, $h;
3983 4605
3984# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4606# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3985# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4607# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3986 4608
3987 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4609 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3988 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4610 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3989 4611
3990 $w = int $w + 0.5; 4612 $w = int $w + 0.5;
3991 $h = int $h + 0.5; 4613 $h = int $h + 0.5;
3992 4614
3993 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4615 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3994 $widget->{old_w} = $widget->{w}; 4616 $widget->{old_w} = $widget->{w};
3995 $widget->{old_h} = $widget->{h}; 4617 $widget->{old_h} = $widget->{h};
3996 4618
3997 $widget->{w} = $w; 4619 $widget->{w} = $w;
3998 $widget->{h} = $h; 4620 $widget->{h} = $h;
3999 4621
4000 $widget->emit (size_allocate => $w, $h); 4622 $widget->emit (size_allocate => $w, $h);
4623 }
4001 } 4624 }
4002 } 4625 }
4003 } 4626 }
4004 4627
4005 while ($self->{post_alloc_hook}) { 4628 while ($self->{post_alloc_hook}) {
4006 $_->() 4629 $_->()
4007 for values %{delete $self->{post_alloc_hook}}; 4630 for values %{delete $self->{post_alloc_hook}};
4008 } 4631 }
4009
4010 4632
4011 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4633 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4012 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4634 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4013 glClear GL_COLOR_BUFFER_BIT; 4635 glClear GL_COLOR_BUFFER_BIT;
4014 4636
… …
4017 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4639 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4018 glMatrixMode GL_MODELVIEW; 4640 glMatrixMode GL_MODELVIEW;
4019 glLoadIdentity; 4641 glLoadIdentity;
4020 4642
4021 { 4643 {
4022 package CFPlus::UI::Base; 4644 package DC::UI::Base;
4023 4645
4024 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4646 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4025 (0, 0, $self->{w}, $self->{h}); 4647 (0, 0, $self->{w}, $self->{h});
4026 4648
4027 $self->_draw; 4649 $self->_draw;
4028 } 4650 }
4029} 4651}
4030 4652
4031############################################################################# 4653#############################################################################
4032 4654
4033package CFPlus::UI; 4655package DC::UI;
4034 4656
4035$ROOT = new CFPlus::UI::Root; 4657$ROOT = new DC::UI::Root;
4036$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4658$TOOLTIP = new DC::UI::Tooltip z => 900;
4037 4659
40381 46601
4039

Diff Legend

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