ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.483 by root, Wed Jan 4 11:23:23 2012 UTC

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

Diff Legend

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