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.359 by root, Fri Dec 8 15:07:08 2006 UTC vs.
Revision 1.477 by root, Sun Jan 11 23:50:27 2009 UTC

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

Diff Legend

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