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

Diff Legend

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