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.353 by root, Thu Nov 16 19:42:45 2006 UTC vs.
Revision 1.475 by root, Sun Jan 11 22:15:23 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,
… …
514); 554);
515 555
516sub emit { 556sub emit {
517 my ($self, $signal, @args) = @_; 557 my ($self, $signal, @args) = @_;
518 558
519 # I do not really like this solution, but I dislike duplication 559 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 560 # and needlessly verbose code, either.
521 my @append 561 my @append
522 = $has_coords{$signal} 562 = $has_coords{$signal}
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 @_
… …
678 my ($w, $h) = @$self{qw(w h)}; 669 my ($w, $h) = @$self{qw(w h)};
679 670
680 glEnable GL_BLEND; 671 glEnable GL_BLEND;
681 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
682 glColor_premultiply @$color; 673 glColor_premultiply @$color;
683
684 glBegin GL_QUADS;
685 glVertex 0 , 0;
686 glVertex 0 , $h;
687 glVertex $w, $h; 674 glRect 0, 0, $w, $h;
688 glVertex $w, 0;
689 glEnd;
690
691 glDisable GL_BLEND; 675 glDisable GL_BLEND;
692 } 676 }
693} 677}
694 678
695############################################################################# 679#############################################################################
696 680
697package CFPlus::UI::Empty; 681package DC::UI::Empty;
698 682
699our @ISA = CFPlus::UI::Base::; 683our @ISA = DC::UI::Base::;
700 684
701sub new { 685sub new {
702 my ($class, %arg) = @_; 686 my ($class, %arg) = @_;
703 $class->SUPER::new (can_events => 0, %arg); 687 $class->SUPER::new (can_events => 0, %arg);
704} 688}
… …
711 695
712sub draw { } 696sub draw { }
713 697
714############################################################################# 698#############################################################################
715 699
716package CFPlus::UI::Container; 700package DC::UI::Container;
717 701
718our @ISA = CFPlus::UI::Base::; 702our @ISA = DC::UI::Base::;
719 703
720sub new { 704sub new {
721 my ($class, %arg) = @_; 705 my ($class, %arg) = @_;
722 706
723 my $children = delete $arg{children}; 707 my $children = delete $arg{children};
… …
727 can_events => 0, 711 can_events => 0,
728 %arg, 712 %arg,
729 ); 713 );
730 714
731 $self->add (@$children) 715 $self->add (@$children)
732 if $children; 716 if $children && @$children;
733 717
734 $self 718 $self
735} 719}
736 720
737sub realloc { 721sub realloc {
… …
746 my ($self, @widgets) = @_; 730 my ($self, @widgets) = @_;
747 731
748 $_->set_parent ($self) 732 $_->set_parent ($self)
749 for @widgets; 733 for @widgets;
750 734
735 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 736 use sort 'stable';
752 737
753 $self->{children} = [ 738 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 739 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 740 @{$self->{children}}, @widgets
756 ]; 741 ];
757 742
758 $self->realloc; 743 $self->realloc;
744
745 $self->emit (c_add => \@widgets);
746
747 map $_+0, @widgets
759} 748}
760 749
761sub children { 750sub children {
762 @{ $_[0]{children} } 751 @{ $_[0]{children} }
763} 752}
764 753
765sub remove { 754sub remove {
766 my ($self, $child) = @_; 755 my ($self, @widgets) = @_;
767 756
757 $self->emit (c_remove => \@widgets);
758
759 for my $child (@widgets) {
768 delete $child->{parent}; 760 delete $child->{parent};
769 $child->hide; 761 $child->hide;
770
771 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 762 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
763 }
772 764
773 $self->realloc; 765 $self->realloc;
774} 766}
775 767
776sub clear { 768sub clear {
777 my ($self) = @_; 769 my ($self) = @_;
778 770
779 my $children = delete $self->{children}; 771 my $children = $self->{children};
780 $self->{children} = []; 772 $self->{children} = [];
781 773
782 for (@$children) { 774 for (@$children) {
783 delete $_->{parent}; 775 delete $_->{parent};
784 $_->hide; 776 $_->hide;
… …
804} 796}
805 797
806sub _draw { 798sub _draw {
807 my ($self) = @_; 799 my ($self) = @_;
808 800
809 $_->draw for @{$self->{children}}; 801 $_->draw for $self->visible_children;
810} 802}
811 803
812############################################################################# 804#############################################################################
813 805
814package CFPlus::UI::Bin; 806package DC::UI::Bin;
815 807
816our @ISA = CFPlus::UI::Container::; 808our @ISA = DC::UI::Container::;
817 809
818sub new { 810sub new {
819 my ($class, %arg) = @_; 811 my ($class, %arg) = @_;
820 812
821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 813 my $child = (delete $arg{child}) || new DC::UI::Empty::;
822 814
823 $class->SUPER::new (children => [$child], %arg) 815 $class->SUPER::new (children => [$child], %arg)
824} 816}
825 817
826sub add { 818sub add {
827 my ($self, $child) = @_; 819 my ($self, $child) = @_;
828 820
829 $self->SUPER::remove ($_) for @{ $self->{children} }; 821 $self->clear;
830 $self->SUPER::add ($child); 822 $self->SUPER::add ($child);
831} 823}
832 824
833sub remove { 825sub remove {
834 my ($self, $widget) = @_; 826 my ($self, $widget) = @_;
835 827
836 $self->SUPER::remove ($widget); 828 $self->SUPER::remove ($widget);
837 829
838 $self->{children} = [new CFPlus::UI::Empty] 830 $self->{children} = [new DC::UI::Empty]
839 unless @{$self->{children}}; 831 unless @{$self->{children}};
840} 832}
841 833
842sub child { $_[0]->{children}[0] } 834sub child { $_[0]->{children}[0] }
843 835
… …
852 844
853 1 845 1
854} 846}
855 847
856############################################################################# 848#############################################################################
857
858# back-buffered drawing area 849# back-buffered drawing area
859 850
860package CFPlus::UI::Window; 851package DC::UI::Window;
861 852
862our @ISA = CFPlus::UI::Bin::; 853our @ISA = DC::UI::Bin::;
863 854
864use CFPlus::OpenGL; 855use DC::OpenGL;
865 856
866sub new { 857sub new {
867 my ($class, %arg) = @_; 858 my ($class, %arg) = @_;
868 859
869 my $self = $class->SUPER::new (%arg); 860 my $self = $class->SUPER::new (%arg);
… …
891} 882}
892 883
893sub render_child { 884sub render_child {
894 my ($self) = @_; 885 my ($self) = @_;
895 886
896 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 887 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
897 glClearColor 0, 0, 0, 0; 888 glClearColor 0, 0, 0, 0;
898 glClear GL_COLOR_BUFFER_BIT; 889 glClear GL_COLOR_BUFFER_BIT;
899 890
900 { 891 {
901 package CFPlus::UI::Base; 892 package DC::UI::Base;
902 893
903 local ($draw_x, $draw_y, $draw_w, $draw_h) = 894 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 895 (0, 0, $self->{w}, $self->{h});
905 896
906 $self->_render; 897 $self->_render;
… …
923 glDisable GL_TEXTURE_2D; 914 glDisable GL_TEXTURE_2D;
924} 915}
925 916
926############################################################################# 917#############################################################################
927 918
928package CFPlus::UI::ViewPort; 919package DC::UI::ViewPort;
929 920
921use List::Util qw(min max);
922
930our @ISA = CFPlus::UI::Window::; 923our @ISA = DC::UI::Window::;
931 924
932sub new { 925sub new {
933 my $class = shift; 926 my $class = shift;
934 927
935 $class->SUPER::new ( 928 $class->SUPER::new (
… …
942sub size_request { 935sub size_request {
943 my ($self) = @_; 936 my ($self) = @_;
944 937
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 938 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 939
947 $w = 10 if $self->{scroll_x}; 940 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 941 $h = 1 if $self->{scroll_y};
949 942
950 ($w, $h) 943 ($w, $h)
951} 944}
952 945
953sub invoke_size_allocate { 946sub invoke_size_allocate {
… …
965} 958}
966 959
967sub set_offset { 960sub set_offset {
968 my ($self, $x, $y) = @_; 961 my ($self, $x, $y) = @_;
969 962
963 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
964 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
965
966 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 967 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 968 $self->{view_y} = $y;
972 969
970 $self->emit (changed => $x, $y);
973 $self->update; 971 $self->update;
972 }
973}
974
975sub set_center {
976 my ($self, $x, $y) = @_;
977
978 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
979}
980
981sub make_visible {
982 my ($self, $x, $y, $border) = @_;
983
984 if ( $x < $self->{view_x} + $self->{w} * $border
985 || $x > $self->{view_x} + $self->{w} * (1 - $border)
986 || $y < $self->{view_y} + $self->{h} * $border
987 || $y > $self->{view_y} + $self->{h} * (1 - $border)
988 ) {
989 $self->set_center ($x, $y);
990 }
974} 991}
975 992
976# hmm, this does not work for topleft of $self... but we should not ask for that 993# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 994sub coord2local {
978 my ($self, $x, $y) = @_; 995 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 1010 my ($self, $x, $y) = @_;
994 1011
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1012 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1013 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 1014 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1015 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 1016 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1017 $self->DC::UI::Base::find_widget ($x, $y)
1001 } 1018 }
1002} 1019}
1003 1020
1004sub _render { 1021sub _render {
1005 my ($self) = @_; 1022 my ($self) = @_;
1006 1023
1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1024 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1025 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1009 1026
1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1027 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1011 1028
1012 $self->SUPER::_render; 1029 $self->SUPER::_render;
1013} 1030}
1014 1031
1015############################################################################# 1032#############################################################################
1016 1033
1017package CFPlus::UI::ScrolledWindow; 1034package DC::UI::ScrolledWindow;
1018 1035
1019our @ISA = CFPlus::UI::HBox::; 1036our @ISA = DC::UI::Table::;
1020 1037
1021sub new { 1038sub new {
1022 my ($class, %arg) = @_; 1039 my ($class, %arg) = @_;
1023 1040
1024 my $child = delete $arg{child}; 1041 my $child = delete $arg{child};
1025 1042
1026 my $self; 1043 my $self;
1027 1044
1028 my $slider = new CFPlus::UI::Slider 1045 my $hslider = new DC::UI::Slider
1046 c_col => 0,
1047 c_row => 1,
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new DC::UI::Slider
1057 c_col => 1,
1058 c_row => 0,
1029 vertical => 1, 1059 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1060 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1061 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1062 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1064 },
1034 ; 1065 ;
1035 1066
1036 $self = $class->SUPER::new ( 1067 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1068 scroll_x => 0,
1069 scroll_y => 1,
1038 can_events => 1, 1070 can_events => 1,
1039 slider => $slider, 1071 hslider => $hslider,
1072 vslider => $vslider,
1073 col_expand => [1, 0],
1074 row_expand => [1, 0],
1040 %arg, 1075 %arg,
1041 ); 1076 );
1042 1077
1078 $self->{vp} = new DC::UI::ViewPort
1079 c_col => 0,
1080 c_row => 0,
1081 expand => 1,
1082 scroll_x => $self->{scroll_x},
1083 scroll_y => $self->{scroll_y},
1084 on_changed => sub {
1085 my ($vp, $x, $y) = @_;
1086
1087 $vp->{parent}{hslider}->set_value ($x);
1088 $vp->{parent}{vslider}->set_value ($y);
1089
1090 0
1091 },
1092 on_size_allocate => sub {
1093 my ($vp, $w, $h) = @_;
1094 $vp->{parent}->update_slider;
1095 0
1096 },
1097 ;
1098
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1099 $self->SUPER::add ($self->{vp});
1100
1044 $self->add ($child) if $child; 1101 $self->add ($child) if $child;
1045 1102
1046 $self 1103 $self
1047} 1104}
1048
1049#TODO# update range on size_allocate depending on child
1050 1105
1051sub add { 1106sub add {
1052 my ($self, $widget) = @_; 1107 my ($self, $widget) = @_;
1053 1108
1054 $self->{vp}->add ($self->{child} = $widget); 1109 $self->{vp}->add ($self->{child} = $widget);
1055} 1110}
1056 1111
1112sub set_offset { shift->{vp}->set_offset (@_) }
1113sub set_center { shift->{vp}->set_center (@_) }
1114sub make_visible { shift->{vp}->make_visible (@_) }
1115
1116sub update_slider {
1117 my ($self) = @_;
1118
1119 my $child = ($self->{vp} or return)->child;
1120
1121 if ($self->{scroll_x}) {
1122 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1123 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1124
1125 my $visible = $w1 > $w2;
1126 if ($visible != $self->{hslider_visible}) {
1127 $self->{hslider_visible} = $visible;
1128 $visible ? $self->SUPER::add ($self->{hslider})
1129 : $self->SUPER::remove ($self->{hslider});
1130 }
1131 }
1132
1133 if ($self->{scroll_y}) {
1134 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1135 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1136
1137 my $visible = $h1 > $h2;
1138 if ($visible != $self->{vslider_visible}) {
1139 $self->{vslider_visible} = $visible;
1140 $visible ? $self->SUPER::add ($self->{vslider})
1141 : $self->SUPER::remove ($self->{vslider});
1142 }
1143 }
1144}
1145
1146sub start_dragging {
1147 my ($self, $ev) = @_;
1148
1149 $self->grab_focus;
1150
1151 my $ox = $self->{vp}{view_x};
1152 my $oy = $self->{vp}{view_y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1156
1157 $ox -= $ev->{xrel};
1158 $oy -= $ev->{yrel};
1159
1160 $self->{vp}->set_offset ($ox, $oy);
1161 };
1162}
1163
1057sub invoke_mouse_wheel { 1164sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1165 my ($self, $ev) = @_;
1059 1166
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1167 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1168 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063 1169
1064 1 1170 1
1065} 1171}
1066 1172
1067sub update_slider { 1173sub invoke_button_down {
1068 my ($self) = @_; 1174 my ($self, $ev, $x, $y) = @_;
1069 1175
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1176 if ($ev->{button} == 2) {
1071} 1177 $self->start_dragging ($ev);
1178 return 1;
1179 }
1072 1180
1073sub update { 1181 0
1074 my ($self) = @_; 1182}
1075 1183
1076 $self->SUPER::update; 1184sub invoke_button_up {
1185 my ($self, $ev, $x, $y) = @_;
1077 1186
1078 $self->update_slider; 1187 if (delete $self->{motion}) {
1188 return 1;
1189 }
1190
1191 0
1192}
1193
1194sub invoke_mouse_motion {
1195 my ($self, $ev, $x, $y) = @_;
1196
1197 if ($self->{motion}) {
1198 $self->{motion}->($ev, $x, $y);
1199 return 1;
1200 }
1201
1202 0
1079} 1203}
1080 1204
1081sub invoke_size_allocate { 1205sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1206 my ($self, $w, $h) = @_;
1083 1207
1084 $self->update_slider; 1208 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1209 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1210}
1088 1211
1089############################################################################# 1212#############################################################################
1090 1213
1091package CFPlus::UI::Frame; 1214package DC::UI::Frame;
1092 1215
1093our @ISA = CFPlus::UI::Bin::; 1216our @ISA = DC::UI::Bin::;
1094 1217
1095use CFPlus::OpenGL; 1218use DC::OpenGL;
1096 1219
1097sub new { 1220sub new {
1098 my $class = shift; 1221 my $class = shift;
1099 1222
1100 $class->SUPER::new ( 1223 $class->SUPER::new (
… …
1110 my ($w, $h) = @$self{qw(w h)}; 1233 my ($w, $h) = @$self{qw(w h)};
1111 1234
1112 glEnable GL_BLEND; 1235 glEnable GL_BLEND;
1113 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1236 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1114 glColor_premultiply @{ $self->{bg} }; 1237 glColor_premultiply @{ $self->{bg} };
1115
1116 glBegin GL_QUADS;
1117 glVertex 0 , 0;
1118 glVertex 0 , $h;
1119 glVertex $w, $h; 1238 glRect 0, 0, $w, $h;
1120 glVertex $w, 0;
1121 glEnd;
1122
1123 glDisable GL_BLEND; 1239 glDisable GL_BLEND;
1124 } 1240 }
1125 1241
1126 $self->SUPER::_draw; 1242 $self->SUPER::_draw;
1127} 1243}
1128 1244
1129############################################################################# 1245#############################################################################
1130 1246
1131package CFPlus::UI::FancyFrame; 1247package DC::UI::FancyFrame;
1132 1248
1133our @ISA = CFPlus::UI::Bin::; 1249our @ISA = DC::UI::Bin::;
1134 1250
1135use CFPlus::OpenGL; 1251use DC::OpenGL;
1136 1252
1137sub new { 1253sub new {
1138 my ($class, %arg) = @_; 1254 my ($class, %arg) = @_;
1139 1255
1140 if ((exists $arg{label}) && !ref $arg{label}) { 1256 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label 1257 $arg{label} = new DC::UI::Label
1142 align => 1, 1258 align => 1,
1143 valign => 0, 1259 valign => 0.5,
1144 text => $arg{label}, 1260 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75; 1261 fontsize => ($arg{border} || 0.8) * 0.75;
1146 } 1262 }
1147 1263
1148 my $self = $class->SUPER::new ( 1264 my $self = $class->SUPER::new (
1149 # label => "", 1265 # label => "",
1150 fg => [0.6, 0.3, 0.1], 1266 fg => undef,
1151 border => 0.8, 1267 border => 0.8,
1152 style => 'single', 1268 style => 'single',
1153 %arg, 1269 %arg,
1154 ); 1270 );
1155 1271
… …
1158 1274
1159sub add { 1275sub add {
1160 my ($self, @widgets) = @_; 1276 my ($self, @widgets) = @_;
1161 1277
1162 $self->SUPER::add (@widgets); 1278 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1279 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1164} 1280}
1165 1281
1166sub border { 1282sub border {
1167 int $_[0]{border} * $::FONTSIZE 1283 int $_[0]{border} * $::FONTSIZE
1168} 1284}
… …
1208 my $border = $self->border; 1324 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h}); 1325 my ($w, $h) = ($self->{w}, $self->{h});
1210 1326
1211 $child->draw; 1327 $child->draw;
1212 1328
1213 glColor @{$self->{fg}}; 1329 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1214 glBegin GL_LINE_STRIP; 1330 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1331 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1332 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1333 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1334 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1226 } 1342 }
1227} 1343}
1228 1344
1229############################################################################# 1345#############################################################################
1230 1346
1231package CFPlus::UI::Toplevel; 1347package DC::UI::Toplevel;
1232 1348
1233our @ISA = CFPlus::UI::Bin::; 1349our @ISA = DC::UI::Bin::;
1234 1350
1235use CFPlus::OpenGL; 1351use DC::OpenGL;
1236 1352
1237my $bg = 1353my $bg =
1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1354 new_from_resource DC::Texture "d1_bg.png",
1239 mipmap => 1, wrap => 1; 1355 mipmap => 1, wrap => 1;
1240 1356
1241my @border = 1357my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1358 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); 1359 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1360
1361my @icon =
1362 map { new_from_resource DC::Texture $_, mipmap => 1 }
1363 qw(x1_move.png x1_resize.png);
1244 1364
1245sub new { 1365sub new {
1246 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1247 1367
1248 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1369 bg => [1, 1, 1, 1],
1250 border_bg => [1, 1, 1, 1], 1370 border_bg => [1, 1, 1, 1],
1251 border => 0.6, 1371 border => 0.8,
1252 can_events => 1, 1372 can_events => 1,
1253 min_w => 64, 1373 min_w => 64,
1254 min_h => 32, 1374 min_h => 32,
1255 %arg, 1375 %arg,
1256 ); 1376 );
1257 1377
1258 $self->{title_widget} = new CFPlus::UI::Label 1378 $self->{title_widget} = new DC::UI::Label
1259 align => 0, 1379 align => 0.5,
1260 valign => 1, 1380 valign => 1,
1261 text => $self->{title}, 1381 text => $self->{title},
1262 fontsize => $self->{border}, 1382 fontsize => $self->{border},
1263 if exists $self->{title}; 1383 if exists $self->{title};
1264 1384
1265 if ($self->{has_close_button}) { 1385 if ($self->{has_close_button}) {
1266 $self->{close_button} = 1386 $self->{close_button} =
1267 new CFPlus::UI::ImageButton 1387 new DC::UI::ImageButton
1268 path => 'x1_close.png', 1388 path => 'x1_close.png',
1269 on_activate => sub { $self->emit ("delete") }; 1389 on_activate => sub { $self->emit ("delete") };
1270 1390
1271 $self->CFPlus::UI::Container::add ($self->{close_button}); 1391 $self->DC::UI::Container::add ($self->{close_button});
1272 } 1392 }
1273 1393
1274 $self 1394 $self
1275} 1395}
1276 1396
1277sub add { 1397sub add {
1278 my ($self, @widgets) = @_; 1398 my ($self, @widgets) = @_;
1279 1399
1280 $self->SUPER::add (@widgets); 1400 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1401 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1282 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1402 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1283} 1403}
1284 1404
1285sub border { 1405sub border {
1286 int $_[0]{border} * $::FONTSIZE 1406 int $_[0]{border} * $::FONTSIZE
1407}
1408
1409sub get_max_wh {
1410 my ($self) = @_;
1411
1412 return ($self->{w}, $self->{h})
1413 if $self->{visible} && $self->{w};
1414
1415 $self->SUPER::get_max_wh
1287} 1416}
1288 1417
1289sub size_request { 1418sub size_request {
1290 my ($self) = @_; 1419 my ($self) = @_;
1291 1420
… …
1416 glEnable GL_TEXTURE_2D; 1545 glEnable GL_TEXTURE_2D;
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1546 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1547
1419 my $border = $self->border; 1548 my $border = $self->border;
1420 1549
1550 if ($border) {
1421 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1556
1557 # move
1558 my $w2 = ($w - $border) * .5;
1559 my $h2 = ($h - $border) * .5;
1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1563
1564 # resize
1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1567 unless $self->{has_close_button};
1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1570 }
1426 1571
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1572 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1573 glColor @{ $self->{bg} };
1429 1574
1430 # TODO: repeat texture not scale 1575 # TODO: repeat texture not scale
… …
1449 if $self->{close_button}; 1594 if $self->{close_button};
1450} 1595}
1451 1596
1452############################################################################# 1597#############################################################################
1453 1598
1454package CFPlus::UI::Table; 1599package DC::UI::Table;
1455 1600
1456our @ISA = CFPlus::UI::Base::; 1601our @ISA = DC::UI::Container::;
1457 1602
1458use List::Util qw(max sum); 1603use List::Util qw(max sum);
1459 1604
1460use CFPlus::OpenGL; 1605use DC::OpenGL;
1461 1606
1462sub new { 1607sub new {
1463 my $class = shift; 1608 my $class = shift;
1464 1609
1465 $class->SUPER::new ( 1610 $class->SUPER::new (
1466 col_expand => [], 1611 col_expand => [],
1612 row_expand => [],
1467 @_, 1613 @_,
1468 ) 1614 )
1469} 1615}
1470 1616
1471sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473}
1474
1475sub add { 1617sub add {
1618 my ($self, @widgets) = @_;
1619
1620 for my $child (@widgets) {
1621 $child->{c_rowspan} ||= 1;
1622 $child->{c_colspan} ||= 1;
1623 }
1624
1625 $self->SUPER::add (@widgets);
1626}
1627
1628sub add_at {
1476 my ($self) = shift; 1629 my $self = shift;
1630
1631 my @widgets;
1477 1632
1478 while (@_) { 1633 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1634 my ($col, $row, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child;
1482 }
1483 1635
1484 $self->{force_realloc} = 1; 1636 $child->{c_row} = $row;
1485 $self->{force_size_alloc} = 1; 1637 $child->{c_col} = $col;
1486 $self->realloc;
1487}
1488 1638
1489sub remove { 1639 push @widgets, $child;
1640 }
1641
1642 $self->add (@widgets);
1643}
1644
1645sub get_wh {
1490 my ($self, $child) = @_; 1646 my ($self) = @_;
1491 1647
1492 # TODO: not yet implemented 1648 my (@w, @h);
1493}
1494
1495# TODO: move to container class maybe? send children a signal on removal?
1496sub clear {
1497 my ($self) = @_;
1498 1649
1499 my @children = $self->children; 1650 my @children = $self->children;
1500 delete $self->{children}; 1651
1652 # first pass, columns
1653 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1654 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1655
1656 my $sw = sum @w[$c .. $c + $cs - 1];
1657
1658 if ($w > $sw) {
1659 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1660 }
1501 1661 }
1502 for (@children) {
1503 delete $_->{parent};
1504 $_->hide;
1505 }
1506 1662
1507 $self->realloc; 1663 # second pass, rows
1508} 1664 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)}; 1665 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1523 1666
1524 $w[$x] = max $w[$x], $w; 1667 my $sh = sum @h[$r .. $r + $rs - 1];
1525 $h[$y] = max $h[$y], $h; 1668
1669 if ($h > $sh) {
1670 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526 } 1671 }
1527 } 1672 }
1528 1673
1529 (\@w, \@h) 1674 (\@w, \@h)
1530} 1675}
… …
1546 my ($ws, $hs) = $self->get_wh; 1691 my ($ws, $hs) = $self->get_wh;
1547 1692
1548 my $req_w = (sum @$ws) || 1; 1693 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1694 my $req_h = (sum @$hs) || 1;
1550 1695
1551 # TODO: nicer code && do row_expand 1696 # now linearly scale the rows/columns to the allocated size
1552 my @col_expand = @{$self->{col_expand}}; 1697 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1698 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1699 my $col_expand = (sum @col_expand) || 1;
1555 1700
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1702
1560 CFPlus::UI::harmonize $ws; 1703 DC::UI::harmonize $ws;
1704
1705 my @row_expand = @{$self->{row_expand}};
1706 @row_expand = (1) x @$ws unless @row_expand;
1707 my $row_expand = (sum @row_expand) || 1;
1708
1709 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1710
1561 CFPlus::UI::harmonize $hs; 1711 DC::UI::harmonize $hs;
1562 1712
1563 my $y; 1713 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1714 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564 1715
1565 for my $r (0 .. $#{$self->{children}}) { 1716 for my $widget ($self->children) {
1566 my $row = $self->{children}[$r] 1717 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1567 or next;
1568 1718
1569 my $x = 0; 1719 $widget->configure (
1570 my $row_h = $hs->[$r]; 1720 $x[$c], $y[$r],
1721 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571 1722 );
1572 for my $c (0 .. $#$row) { 1723 }
1573 my $col_w = $ws->[$c];
1574 1724
1575 if (my $widget = $row->[$c]) { 1725 1
1576 $widget->configure ($x, $y, $col_w, $row_h); 1726}
1577 }
1578 1727
1579 $x += $col_w; 1728#############################################################################
1729
1730package DC::UI::Fixed;
1731
1732use List::Util qw(min max);
1733
1734our @ISA = DC::UI::Container::;
1735
1736sub _scale($$$) {
1737 my ($rel, $val, $max) = @_;
1738
1739 $rel ? $val * $max : $val
1740}
1741
1742sub size_request {
1743 my ($self) = @_;
1744
1745 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1746
1747 # determine overall size by querying abs widgets
1748 for my $child ($self->visible_children) {
1749 unless ($child->{c_rel}) {
1750 my $x = $child->{c_x};
1751 my $y = $child->{c_y};
1752
1753 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1754 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1580 } 1755 }
1756 }
1581 1757
1582 $y += $row_h; 1758 my $W = $x2 - $x1;
1759 my $H = $y2 - $y1;
1760
1761 # now layout remaining widgets
1762 for my $child ($self->visible_children) {
1763 if ($child->{c_rel}) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1768 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1769 }
1770 }
1771
1772 my $W = $x2 - $x1;
1773 my $H = $y2 - $y1;
1774
1775 ($W, $H)
1776}
1777
1778sub invoke_size_allocate {
1779 my ($self, $W, $H) = @_;
1780
1781 for my $child ($self->visible_children) {
1782 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1783 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1784
1785 $x += $child->{c_halign} * $child->{req_w};
1786 $y += $child->{c_valign} * $child->{req_h};
1787
1788 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1583 } 1789 }
1584 1790
1585 1 1791 1
1586} 1792}
1587 1793
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############################################################################# 1794#############################################################################
1613 1795
1614package CFPlus::UI::Box; 1796package DC::UI::Box;
1615 1797
1616our @ISA = CFPlus::UI::Container::; 1798our @ISA = DC::UI::Container::;
1617 1799
1618sub size_request { 1800sub size_request {
1619 my ($self) = @_; 1801 my ($self) = @_;
1802
1803 my @children = $self->visible_children;
1620 1804
1621 $self->{vertical} 1805 $self->{vertical}
1622 ? ( 1806 ? (
1623 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1807 (List::Util::max map $_->{req_w}, @children),
1624 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1808 (List::Util::sum map $_->{req_h}, @children),
1625 ) 1809 )
1626 : ( 1810 : (
1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1811 (List::Util::sum map $_->{req_w}, @children),
1628 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1812 (List::Util::max map $_->{req_h}, @children),
1629 ) 1813 )
1630} 1814}
1631 1815
1632sub invoke_size_allocate { 1816sub invoke_size_allocate {
1633 my ($self, $w, $h) = @_; 1817 my ($self, $w, $h) = @_;
… …
1654 $req[$_] += $space * $children[$_]{expand} 1838 $req[$_] += $space * $children[$_]{expand}
1655 for 0 .. $#children; 1839 for 0 .. $#children;
1656 } 1840 }
1657 } 1841 }
1658 1842
1659 CFPlus::UI::harmonize \@req; 1843 DC::UI::harmonize \@req;
1660 1844
1661 my $pos = 0; 1845 my $pos = 0;
1662 for (0 .. $#children) { 1846 for (0 .. $#children) {
1663 my $alloc = $req[$_]; 1847 my $alloc = $req[$_];
1664 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1848 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1669 1 1853 1
1670} 1854}
1671 1855
1672############################################################################# 1856#############################################################################
1673 1857
1674package CFPlus::UI::HBox; 1858package DC::UI::HBox;
1675 1859
1676our @ISA = CFPlus::UI::Box::; 1860our @ISA = DC::UI::Box::;
1677 1861
1678sub new { 1862sub new {
1679 my $class = shift; 1863 my $class = shift;
1680 1864
1681 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1684 ) 1868 )
1685} 1869}
1686 1870
1687############################################################################# 1871#############################################################################
1688 1872
1689package CFPlus::UI::VBox; 1873package DC::UI::VBox;
1690 1874
1691our @ISA = CFPlus::UI::Box::; 1875our @ISA = DC::UI::Box::;
1692 1876
1693sub new { 1877sub new {
1694 my $class = shift; 1878 my $class = shift;
1695 1879
1696 $class->SUPER::new ( 1880 $class->SUPER::new (
… …
1699 ) 1883 )
1700} 1884}
1701 1885
1702############################################################################# 1886#############################################################################
1703 1887
1704package CFPlus::UI::Label; 1888package DC::UI::Label;
1705 1889
1706our @ISA = CFPlus::UI::DrawBG::; 1890our @ISA = DC::UI::DrawBG::;
1707 1891
1708use CFPlus::OpenGL; 1892use DC::OpenGL;
1709 1893
1710sub new { 1894sub new {
1711 my ($class, %arg) = @_; 1895 my ($class, %arg) = @_;
1712 1896
1713 my $self = $class->SUPER::new ( 1897 my $self = $class->SUPER::new (
… …
1718 #text => initial text 1902 #text => initial text
1719 #markup => initial narkup 1903 #markup => initial narkup
1720 #max_w => maximum pixel width 1904 #max_w => maximum pixel width
1721 #style => 0, # render flags 1905 #style => 0, # render flags
1722 ellipsise => 3, # end 1906 ellipsise => 3, # end
1723 layout => (new CFPlus::Layout), 1907 layout => (new DC::Layout),
1724 fontsize => 1, 1908 fontsize => 1,
1725 align => -1, 1909 align => 0.5,
1726 valign => -1, 1910 valign => 0.5,
1727 padding_x => 2, 1911 padding_x => 4,
1728 padding_y => 2, 1912 padding_y => 2,
1729 can_events => 0, 1913 can_events => 0,
1730 %arg 1914 %arg
1731 ); 1915 );
1732 1916
1733 if (exists $self->{template}) { 1917 if (exists $self->{template}) {
1734 my $layout = new CFPlus::Layout; 1918 my $layout = new DC::Layout;
1735 $layout->set_text (delete $self->{template}); 1919 $layout->set_text (delete $self->{template});
1736 $self->{template} = $layout; 1920 $self->{template} = $layout;
1737 } 1921 }
1738 1922
1739 if (exists $self->{markup}) { 1923 if (exists $self->{markup}) {
… …
1757 1941
1758 delete $self->{ox}; 1942 delete $self->{ox};
1759 $self->SUPER::realloc; 1943 $self->SUPER::realloc;
1760} 1944}
1761 1945
1946sub clear {
1947 my ($self) = @_;
1948
1949 $self->set_text ("");
1950}
1951
1762sub set_text { 1952sub set_text {
1763 my ($self, $text) = @_; 1953 my ($self, $text) = @_;
1764 1954
1765 return if $self->{text} eq "T$text"; 1955 return if $self->{text} eq "T$text";
1766 $self->{text} = "T$text"; 1956 $self->{text} = "T$text";
… …
1789 1979
1790sub size_request { 1980sub size_request {
1791 my ($self) = @_; 1981 my ($self) = @_;
1792 1982
1793 $self->{size_req} ||= do { 1983 $self->{size_req} ||= do {
1984 my ($max_w, $max_h) = $self->get_max_wh;
1985
1794 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1986 $self->{layout}->set_font ($self->{font}) if $self->{font};
1795 $self->{layout}->set_width ($self->{max_w} || -1); 1987 $self->{layout}->set_width ($max_w);
1796 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1988 $self->{layout}->set_ellipsise ($self->{ellipsise});
1797 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1989 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1798 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1799 1991
1800 my ($w, $h) = $self->{layout}->size; 1992 my ($w, $h) = $self->{layout}->size;
1801 1993
1802 if (exists $self->{template}) { 1994 if (exists $self->{template}) {
1803 $self->{template}->set_font ($self->{font}) if $self->{font}; 1995 $self->{template}->set_font ($self->{font}) if $self->{font};
1804 $self->{template}->set_width ($self->{max_w} || -1); 1996 $self->{template}->set_width ($max_w);
1805 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1806 1998
1807 my ($w2, $h2) = $self->{template}->size; 1999 my ($w2, $h2) = $self->{template}->size;
1808 2000
1809 $w = List::Util::max $w, $w2; 2001 $w = List::Util::max $w, $w2;
… …
1865 2057
1866 [$self->{layout}->size] 2058 [$self->{layout}->size]
1867 }; 2059 };
1868 2060
1869 unless (exists $self->{ox}) { 2061 unless (exists $self->{ox}) {
1870 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2062 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1871 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2063 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1872 : ($self->{w} - $size->[0]) * 0.5);
1873 2064
1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2065 $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 }; 2066 };
1878 2067
1879 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2068# unless ($self->{list}) {
1880 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2069# $self->{list} = DC::OpenGL::glGenList;
1881 2070# DC::OpenGL::glNewList $self->{list};
1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2071# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2072# DC::OpenGL::glEndList;
2073# }
2074#
2075# DC::OpenGL::glCallList $self->{list};
2076
2077 $self->{layout}->draw;
1883} 2078}
2079
2080#sub destroy {
2081# my ($self) = @_;
2082#
2083# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2084#
2085# $self->SUPER::destroy;
2086#}
1884 2087
1885############################################################################# 2088#############################################################################
1886 2089
1887package CFPlus::UI::EntryBase; 2090package DC::UI::EntryBase;
1888 2091
1889our @ISA = CFPlus::UI::Label::; 2092our @ISA = DC::UI::Label::;
1890 2093
1891use CFPlus::OpenGL; 2094use DC::OpenGL;
1892 2095
1893sub new { 2096sub new {
1894 my $class = shift; 2097 my $class = shift;
1895 2098
1896 $class->SUPER::new ( 2099 $class->SUPER::new (
1897 fg => [1, 1, 1], 2100 fg => [1, 1, 1],
1898 bg => [0, 0, 0, 0.2], 2101 bg => [0, 0, 0, 0.2],
2102 outline => undef,
1899 active_bg => [1, 1, 1, 0.5], 2103 active_bg => [0, 0, 1, .2],
1900 active_fg => [0, 0, 0], 2104 active_fg => [1, 1, 1],
2105 active_outline => [1, 1, 0],
1901 can_hover => 1, 2106 can_hover => 1,
1902 can_focus => 1, 2107 can_focus => 1,
2108 align => 0,
1903 valign => 0, 2109 valign => 0.5,
1904 can_events => 1, 2110 can_events => 1,
2111 ellipsise => 0,
2112 padding_x => 4,
2113 padding_y => 2,
1905 #text => ... 2114 #text => ...
1906 #hidden => "*", 2115 #hidden => "*",
1907 @_ 2116 @_
1908 ) 2117 )
1909} 2118}
… …
1954 my $sym = $ev->{sym}; 2163 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2164 my $uni = $ev->{unicode};
1956 2165
1957 my $text = $self->get_text; 2166 my $text = $self->get_text;
1958 2167
1959 if ($uni == 8) { 2168 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2169
2170 if ($sym == DC::SDLK_BACKSPACE) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2171 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2172 } elsif ($sym == DC::SDLK_DELETE) {
1962 substr $text, $self->{cursor}, 1, ""; 2173 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2174 } elsif ($sym == DC::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2175 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2176 } elsif ($sym == DC::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2177 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2178 } elsif ($sym == DC::SDLK_HOME) {
2179 # what a hack
1968 $self->{cursor} = 0; 2180 $self->{cursor} =
2181 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2182 ? length $1
2183 : 0;
1969 } elsif ($sym == CFPlus::SDLK_END) { 2184 } elsif ($sym == DC::SDLK_END) {
2185 # uh, again
2186 $self->{cursor} =
2187 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1970 $self->{cursor} = length $text; 2188 ? $self->{cursor} + length $1
2189 : length $self->{text};
1971 } elsif ($uni == 21) { # ctrl-u 2190 } elsif ($uni == 21) { # ctrl-u
1972 $text = ""; 2191 $text = "";
1973 $self->{cursor} = 0; 2192 $self->{cursor} = 0;
1974 } elsif ($uni == 27) { 2193 } elsif ($uni == 27) {
1975 $self->emit ('escape'); 2194 $self->emit ('escape');
1976 } elsif ($uni) { 2195 } elsif ($uni == 0x0d) {
2196 substr $text, $self->{cursor}++, 0, "\012";
2197 } elsif ($uni >= 0x20) {
1977 substr $text, $self->{cursor}++, 0, chr $uni; 2198 substr $text, $self->{cursor}++, 0, chr $uni;
1978 } else { 2199 } else {
1979 return 0; 2200 return 0;
1980 } 2201 }
1981 2202
1982 $self->_set_text ($text); 2203 $self->_set_text ($text);
1983 2204
1984 $self->realloc; 2205 $self->realloc;
2206 $self->update;
1985 2207
1986 1 2208 1
1987} 2209}
1988 2210
1989sub invoke_focus_in { 2211sub invoke_focus_in {
… …
2031 glColor_premultiply @{$self->{bg}}; 2253 glColor_premultiply @{$self->{bg}};
2032 } 2254 }
2033 2255
2034 glEnable GL_BLEND; 2256 glEnable GL_BLEND;
2035 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2257 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2036 glBegin GL_QUADS;
2037 glVertex 0 , 0;
2038 glVertex 0 , $self->{h};
2039 glVertex $self->{w}, $self->{h}; 2258 glRect 0, 0, $self->{w}, $self->{h};
2040 glVertex $self->{w}, 0;
2041 glEnd;
2042 glDisable GL_BLEND; 2259 glDisable GL_BLEND;
2043 2260
2044 $self->SUPER::_draw; 2261 $self->SUPER::_draw;
2045 2262
2046 #TODO: force update every cursor change :( 2263 #TODO: force update every cursor change :(
… …
2048 2265
2049 unless (exists $self->{cur_h}) { 2266 unless (exists $self->{cur_h}) {
2050 my $text = substr $self->{text}, 0, $self->{cursor}; 2267 my $text = substr $self->{text}, 0, $self->{cursor};
2051 utf8::encode $text; 2268 utf8::encode $text;
2052 2269
2053 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2054 } 2271 }
2055 2272
2273 glColor_premultiply @{$self->{active_fg}};
2056 glBegin GL_LINES; 2274 glBegin GL_LINES;
2057 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2275 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2276 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2059 glEnd; 2277 glEnd;
2060 }
2061}
2062 2278
2279 glLineWidth 3;
2280 glColor @{$self->{active_outline}};
2281 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2282 glLineWidth 1;
2283
2284 } else {
2285 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2286 glBegin GL_LINE_STRIP;
2287 glVertex .5, $self->{h} * .5;
2288 glVertex .5, $self->{h} - 2.5;
2289 glVertex $self->{w} - .5, $self->{h} - 2.5;
2290 glVertex $self->{w} - .5, $self->{h} * .5;
2291 glEnd;
2292 }
2293}
2294
2295#############################################################################
2296
2063package CFPlus::UI::Entry; 2297package DC::UI::Entry;
2064 2298
2065our @ISA = CFPlus::UI::EntryBase::; 2299our @ISA = DC::UI::EntryBase::;
2066 2300
2067use CFPlus::OpenGL; 2301use DC::OpenGL;
2302
2303sub new {
2304 my $class = shift;
2305
2306 $class->SUPER::new (
2307 history_pointer => -1,
2308 @_
2309 )
2310}
2311
2068 2312
2069sub invoke_key_down { 2313sub invoke_key_down {
2070 my ($self, $ev) = @_; 2314 my ($self, $ev) = @_;
2071 2315
2072 my $sym = $ev->{sym}; 2316 my $sym = $ev->{sym};
2073 2317
2074 if ($sym == 13) { 2318 if ($ev->{uni} == 0x0d || $sym == 13) {
2075 unshift @{$self->{history}}, 2319 unshift @{$self->{history}},
2076 my $txt = $self->get_text; 2320 my $txt = $self->get_text;
2077 2321
2078 $self->{history_pointer} = -1; 2322 $self->{history_pointer} = -1;
2079 $self->{history_saveback} = ''; 2323 $self->{history_saveback} = '';
2080 $self->emit (activate => $txt); 2324 $self->emit (activate => $txt);
2081 $self->update; 2325 $self->update;
2082 2326
2083 } elsif ($sym == CFPlus::SDLK_UP) { 2327 } elsif ($sym == DC::SDLK_UP) {
2084 if ($self->{history_pointer} < 0) { 2328 if ($self->{history_pointer} < 0) {
2085 $self->{history_saveback} = $self->get_text; 2329 $self->{history_saveback} = $self->get_text;
2086 } 2330 }
2087 if (@{$self->{history} || []} > 0) { 2331 if (@{$self->{history} || []} > 0) {
2088 $self->{history_pointer}++; 2332 $self->{history_pointer}++;
… …
2090 $self->{history_pointer} = @{$self->{history} || []} - 1; 2334 $self->{history_pointer} = @{$self->{history} || []} - 1;
2091 } 2335 }
2092 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2336 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2093 } 2337 }
2094 2338
2095 } elsif ($sym == CFPlus::SDLK_DOWN) { 2339 } elsif ($sym == DC::SDLK_DOWN) {
2096 $self->{history_pointer}--; 2340 $self->{history_pointer}--;
2097 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2341 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2098 2342
2099 if ($self->{history_pointer} >= 0) { 2343 if ($self->{history_pointer} >= 0) {
2100 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2344 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2101 } else { 2345 } else {
2346 if (defined $self->{history_saveback}) {
2102 $self->set_text ($self->{history_saveback}); 2347 $self->set_text ($self->{history_saveback});
2348 $self->{history_saveback} = undef;
2349 }
2103 } 2350 }
2104 2351
2105 } else { 2352 } else {
2106 return $self->SUPER::invoke_key_down ($ev) 2353 return $self->SUPER::invoke_key_down ($ev)
2107 } 2354 }
… …
2109 1 2356 1
2110} 2357}
2111 2358
2112############################################################################# 2359#############################################################################
2113 2360
2114package CFPlus::UI::Button; 2361package DC::UI::TextEdit;
2115 2362
2116our @ISA = CFPlus::UI::Label::; 2363our @ISA = DC::UI::EntryBase::;
2117 2364
2118use CFPlus::OpenGL; 2365use DC::OpenGL;
2119
2120my @tex =
2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2122 qw(b1_button_active.png);
2123 2366
2124sub new { 2367sub new {
2125 my $class = shift; 2368 my $class = shift;
2126 2369
2127 $class->SUPER::new ( 2370 $class->SUPER::new (
2128 padding_x => 4,
2129 padding_y => 4, 2371 padding_y => 4,
2130 fg => [1, 1, 1], 2372
2131 active_fg => [0, 0, 1], 2373 @_
2374 )
2375}
2376
2377sub move_cursor_ver {
2378 my ($self, $dy) = @_;
2379
2380 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2381
2382 $line += $dy;
2383
2384 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2385 $self->{cursor} = $index;
2386 delete $self->{cur_h};
2387 $self->update;
2388 return;
2389 }
2390}
2391
2392sub invoke_key_down {
2393 my ($self, $ev) = @_;
2394
2395 my $sym = $ev->{sym};
2396
2397 if ($sym == DC::SDLK_UP) {
2398 $self->move_cursor_ver (-1);
2399 } elsif ($sym == DC::SDLK_DOWN) {
2400 $self->move_cursor_ver (+1);
2401 } else {
2402 return $self->SUPER::invoke_key_down ($ev)
2403 }
2404
2405 1
2406}
2407
2408#############################################################################
2409
2410package DC::UI::ButtonBin;
2411
2412our @ISA = DC::UI::Bin::;
2413
2414use DC::OpenGL;
2415
2416my @tex =
2417 map { new_from_resource DC::Texture $_, mipmap => 1 }
2418 qw(b1_button_inactive.png b1_button_active.png);
2419
2420sub new {
2421 my $class = shift;
2422
2423 $class->SUPER::new (
2132 can_hover => 1, 2424 can_hover => 1,
2133 align => 0, 2425 align => 0.5,
2134 valign => 0, 2426 valign => 0.5,
2135 can_events => 1, 2427 can_events => 1,
2136 @_ 2428 @_
2137 ) 2429 )
2138} 2430}
2139 2431
… …
2148} 2440}
2149 2441
2150sub _draw { 2442sub _draw {
2151 my ($self) = @_; 2443 my ($self) = @_;
2152 2444
2153 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2154
2155 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
2156 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
2158 2448
2449 my $tex = $tex[$GRAB == $self];
2159 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2160 2451
2161 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2162 2453
2163 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2164} 2455}
2165 2456
2166############################################################################# 2457#############################################################################
2167 2458
2168package CFPlus::UI::CheckBox; 2459package DC::UI::Button;
2169 2460
2170our @ISA = CFPlus::UI::DrawBG::; 2461our @ISA = DC::UI::Label::;
2462
2463use DC::OpenGL;
2171 2464
2172my @tex = 2465my @tex =
2173 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2466 map { new_from_resource DC::Texture $_, mipmap => 1 }
2174 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2467 qw(b1_button_inactive.png b1_button_active.png);
2175
2176use CFPlus::OpenGL;
2177 2468
2178sub new { 2469sub new {
2179 my $class = shift; 2470 my $class = shift;
2180 2471
2181 $class->SUPER::new ( 2472 $class->SUPER::new (
2473 padding_x => 8,
2474 padding_y => 4,
2475 fg => [1.0, 1.0, 1.0],
2476 active_fg => [0.8, 0.8, 0.8],
2477 can_hover => 1,
2478 align => 0.5,
2479 valign => 0.5,
2480 can_events => 1,
2481 @_
2482 )
2483}
2484
2485sub invoke_button_up {
2486 my ($self, $ev, $x, $y) = @_;
2487
2488 $self->emit ("activate")
2489 if $x >= 0 && $x < $self->{w}
2490 && $y >= 0 && $y < $self->{h};
2491
2492 1
2493}
2494
2495sub _draw {
2496 my ($self) = @_;
2497
2498 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2499
2500 glEnable GL_TEXTURE_2D;
2501 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2502 glColor 0, 0, 0, 1;
2503
2504 my $tex = $tex[$GRAB == $self];
2505 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2506
2507 glDisable GL_TEXTURE_2D;
2508
2509 $self->SUPER::_draw;
2510}
2511
2512#############################################################################
2513
2514package DC::UI::CheckBox;
2515
2516our @ISA = DC::UI::DrawBG::;
2517
2518my @tex =
2519 map { new_from_resource DC::Texture $_, mipmap => 1 }
2520 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2521
2522use DC::OpenGL;
2523
2524sub new {
2525 my $class = shift;
2526
2527 $class->SUPER::new (
2528 fontsize => 1,
2182 padding_x => 2, 2529 padding_x => 2,
2183 padding_y => 2, 2530 padding_y => 2,
2184 fg => [1, 1, 1], 2531 fg => [1, 1, 1],
2185 active_fg => [1, 1, 0], 2532 active_fg => [1, 1, 0],
2186 bg => [0, 0, 0, 0.2], 2533 bg => [0, 0, 0, 0.2],
… …
2192} 2539}
2193 2540
2194sub size_request { 2541sub size_request {
2195 my ($self) = @_; 2542 my ($self) = @_;
2196 2543
2197 (6) x 2 2544 ($self->{fontsize} * $::FONTSIZE) x 2
2198} 2545}
2199 2546
2200sub toggle { 2547sub toggle {
2201 my ($self) = @_; 2548 my ($self) = @_;
2202 2549
… …
2221sub _draw { 2568sub _draw {
2222 my ($self) = @_; 2569 my ($self) = @_;
2223 2570
2224 $self->SUPER::_draw; 2571 $self->SUPER::_draw;
2225 2572
2226 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2573 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2227 2574
2228 my ($w, $h) = @$self{qw(w h)}; 2575 my ($w, $h) = @$self{qw(w h)};
2229 2576
2230 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2577 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2231 2578
… …
2238 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2239} 2586}
2240 2587
2241############################################################################# 2588#############################################################################
2242 2589
2243package CFPlus::UI::Image; 2590package DC::UI::Image;
2244 2591
2245our @ISA = CFPlus::UI::Base::; 2592our @ISA = DC::UI::Base::;
2246 2593
2247use CFPlus::OpenGL; 2594use DC::OpenGL;
2248 2595
2249our %texture_cache; 2596our %texture_cache;
2250 2597
2251sub new { 2598sub new {
2252 my $class = shift; 2599 my $class = shift;
2253 2600
2254 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2255 can_events => 0, 2602 can_events => 0,
2603 scale => 1,
2256 @_, 2604 @_,
2257 ); 2605 );
2258 2606
2259 $self->{path} || $self->{tex} 2607 $self->{path} || $self->{tex}
2260 or Carp::croak "'path' or 'tex' attributes required"; 2608 or Carp::croak "'path' or 'tex' attributes required";
2261 2609
2262 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2610 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2611 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2264 2612
2265 Scalar::Util::weaken $texture_cache{$self->{path}}; 2613 DC::weaken $texture_cache{$self->{path}};
2266 2614
2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2615 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268 2616
2269 $self 2617 $self
2270} 2618}
2271 2619
2272sub STORABLE_freeze { 2620sub STORABLE_freeze {
2273 my ($self, $cloning) = @_; 2621 my ($self, $cloning) = @_;
2274 2622
2275 $self->{path} 2623 $self->{path}
2276 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2624 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2277 2625
2278 $self->{path} 2626 $self->{path}
2279} 2627}
2280 2628
2281sub STORABLE_attach { 2629sub STORABLE_attach {
… …
2285} 2633}
2286 2634
2287sub size_request { 2635sub size_request {
2288 my ($self) = @_; 2636 my ($self) = @_;
2289 2637
2290 ($self->{tex}{w}, $self->{tex}{h}) 2638 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2291} 2639}
2292 2640
2293sub _draw { 2641sub _draw {
2294 my ($self) = @_; 2642 my ($self) = @_;
2295 2643
… …
2305 } 2653 }
2306 2654
2307 glEnable GL_TEXTURE_2D; 2655 glEnable GL_TEXTURE_2D;
2308 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2309 2657
2310 $tex->draw_quad (0, 0, $w, $h); 2658 $tex->draw_quad_alpha (0, 0, $w, $h);
2311 2659
2312 glDisable GL_TEXTURE_2D; 2660 glDisable GL_TEXTURE_2D;
2313} 2661}
2314 2662
2315############################################################################# 2663#############################################################################
2316 2664
2317package CFPlus::UI::ImageButton; 2665package DC::UI::ImageButton;
2318 2666
2319our @ISA = CFPlus::UI::Image::; 2667our @ISA = DC::UI::Image::;
2320 2668
2321use CFPlus::OpenGL; 2669use DC::OpenGL;
2322 2670
2323my %textures; 2671my %textures;
2324 2672
2325sub new { 2673sub new {
2326 my $class = shift; 2674 my $class = shift;
… …
2329 padding_x => 4, 2677 padding_x => 4,
2330 padding_y => 4, 2678 padding_y => 4,
2331 fg => [1, 1, 1], 2679 fg => [1, 1, 1],
2332 active_fg => [0, 0, 1], 2680 active_fg => [0, 0, 1],
2333 can_hover => 1, 2681 can_hover => 1,
2334 align => 0, 2682 align => 0.5,
2335 valign => 0, 2683 valign => 0.5,
2336 can_events => 1, 2684 can_events => 1,
2337 @_ 2685 @_
2338 ); 2686 );
2339} 2687}
2340 2688
2689sub invoke_button_down {
2690 my ($self, $ev, $x, $y) = @_;
2691
2692 1
2693}
2694
2341sub invoke_button_up { 2695sub invoke_button_up {
2342 my ($self, $ev, $x, $y) = @_; 2696 my ($self, $ev, $x, $y) = @_;
2343 2697
2344 $self->emit ("activate") 2698 $self->emit ("activate")
2345 if $x >= 0 && $x < $self->{w} 2699 if $x >= 0 && $x < $self->{w}
… …
2348 1 2702 1
2349} 2703}
2350 2704
2351############################################################################# 2705#############################################################################
2352 2706
2353package CFPlus::UI::VGauge; 2707package DC::UI::VGauge;
2354 2708
2355our @ISA = CFPlus::UI::Base::; 2709our @ISA = DC::UI::Base::;
2356 2710
2357use List::Util qw(min max); 2711use List::Util qw(min max);
2358 2712
2359use CFPlus::OpenGL; 2713use DC::OpenGL;
2360 2714
2361my %tex = ( 2715my %tex = (
2362 food => [ 2716 food => [
2363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2364 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2718 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2365 ], 2719 ],
2366 grace => [ 2720 grace => [
2367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2368 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2722 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2369 ], 2723 ],
2370 hp => [ 2724 hp => [
2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2725 map { new_from_resource DC::Texture $_, mipmap => 1 }
2372 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2726 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2373 ], 2727 ],
2374 mana => [ 2728 mana => [
2375 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2729 map { new_from_resource DC::Texture $_, mipmap => 1 }
2376 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2730 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2377 ], 2731 ],
2378); 2732);
2379 2733
2380# eg. VGauge->new (gauge => 'food'), default gauge: food 2734# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2483 glDisable GL_TEXTURE_2D; 2837 glDisable GL_TEXTURE_2D;
2484} 2838}
2485 2839
2486############################################################################# 2840#############################################################################
2487 2841
2842package DC::UI::Progress;
2843
2844our @ISA = DC::UI::Label::;
2845
2846use DC::OpenGL;
2847
2848sub new {
2849 my ($class, %arg) = @_;
2850
2851 my $self = $class->SUPER::new (
2852 padding_x => 2,
2853 padding_y => 2,
2854 fg => [1, 1, 1],
2855 bg => [0, 0, 1, 0.2],
2856 bar => [0.7, 0.5, 0.1, 0.8],
2857 outline => [0.4, 0.3, 0],
2858 fontsize => 0.9,
2859 valign => 0.5,
2860 align => 0.5,
2861 can_events => 1,
2862 ellipsise => 1,
2863 label => "%d%%",
2864 %arg,
2865 );
2866
2867 $self->set_value ($arg{value} || -1);
2868
2869 $self
2870}
2871
2872sub set_label {
2873 my ($self, $label) = @_;
2874
2875 return if $self->{label} eq $label;
2876 $self->{label} = $label;
2877
2878 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2879}
2880
2881sub set_value {
2882 my ($self, $value) = @_;
2883
2884 if ($self->{value} ne $value) {
2885 $self->{value} = $value;
2886
2887 if ($value < 0) {
2888 $self->set_text ("-");
2889 } else {
2890 $self->set_text (sprintf $self->{label}, $value * 100);
2891 }
2892
2893 $self->update;
2894 }
2895}
2896
2897sub _draw {
2898 my ($self) = @_;
2899
2900 glEnable GL_BLEND;
2901 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2902
2903 my $px = $self->{padding_x};
2904 my $py = $self->{padding_y};
2905
2906 if ($self->{value} >= 0) {
2907 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2908
2909 glColor_premultiply @{$self->{bar}};
2910 glRect $px, $py, $s, $self->{h} - $py;
2911 glColor_premultiply @{$self->{bg}};
2912 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2913 }
2914
2915 glColor_premultiply @{$self->{outline}};
2916
2917 $px -= .5;
2918 $py -= .5;
2919
2920 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2921
2922 glDisable GL_BLEND;
2923
2924 {
2925 local $self->{bg}; # do not draw background
2926 $self->SUPER::_draw;
2927 }
2928}
2929
2930#############################################################################
2931
2932package DC::UI::ExperienceProgress;
2933
2934our @ISA = DC::UI::Progress::;
2935
2936sub new {
2937 my ($class, %arg) = @_;
2938
2939 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2940
2941 my $self = $class->SUPER::new (
2942 %arg,
2943 tooltip => sub {
2944 my ($self) = @_;
2945
2946 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2947 $tt,
2948 $self->{lvl},
2949 ::formsep ($self->{exp}),
2950 ::formsep ($self->{nxt}),
2951 ::formsep ($self->{nxt} - $self->{exp}),
2952 $self->_percent * 100,
2953 },
2954 );
2955
2956 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2957 if $::CONN;
2958
2959 $self
2960}
2961
2962sub DESTROY {
2963 my ($self) = @_;
2964
2965 delete $::CONN->{on_exp_update}{$self+0}
2966 if $::CONN;
2967
2968 $self->SUPER::DESTROY;
2969}
2970
2971sub _percent {
2972 my ($self) = @_;
2973
2974 my $table = $::CONN && $::CONN->{exp_table}
2975 or return -1;
2976
2977 my $l0 = $table->[$self->{lvl} - 1];
2978 my $l1 = $table->[$self->{lvl}];
2979
2980 $self->{nxt} = $l1;
2981
2982 ($self->{exp} - $l0) / ($l1 - $l0)
2983}
2984
2985sub set_value {
2986 my ($self, $lvl, $exp) = @_;
2987
2988 $self->{lvl} = $lvl;
2989 $self->{exp} = $exp;
2990
2991 $self->SUPER::set_value ($self->_percent);
2992}
2993
2994#############################################################################
2995
2488package CFPlus::UI::Gauge; 2996package DC::UI::Gauge;
2489 2997
2490our @ISA = CFPlus::UI::VBox::; 2998our @ISA = DC::UI::VBox::;
2491 2999
2492sub new { 3000sub new {
2493 my ($class, %arg) = @_; 3001 my ($class, %arg) = @_;
2494 3002
2495 my $self = $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
… …
2497 can_hover => 1, 3005 can_hover => 1,
2498 can_events => 1, 3006 can_events => 1,
2499 %arg, 3007 %arg,
2500 ); 3008 );
2501 3009
2502 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3010 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2503 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3011 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2504 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3012 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2505 3013
2506 $self 3014 $self
2507} 3015}
2508 3016
2509sub set_fontsize { 3017sub set_fontsize {
… …
2530 $self->{value}->set_text ($val); 3038 $self->{value}->set_text ($val);
2531} 3039}
2532 3040
2533############################################################################# 3041#############################################################################
2534 3042
2535package CFPlus::UI::Slider; 3043package DC::UI::Slider;
2536 3044
2537use strict; 3045use strict;
2538 3046
2539use CFPlus::OpenGL; 3047use DC::OpenGL;
2540 3048
2541our @ISA = CFPlus::UI::DrawBG::; 3049our @ISA = DC::UI::DrawBG::;
2542 3050
2543my @tex = 3051my @tex =
2544 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3052 map { new_from_resource DC::Texture $_ }
2545 qw(s1_slider.png s1_slider_bg.png); 3053 qw(s1_slider.png s1_slider_bg.png);
2546 3054
2547sub new { 3055sub new {
2548 my $class = shift; 3056 my $class = shift;
2549 3057
… …
2586sub set_value { 3094sub set_value {
2587 my ($self, $value) = @_; 3095 my ($self, $value) = @_;
2588 3096
2589 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3097 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2590 3098
2591 $hi = $lo + 1 if $hi <= $lo; 3099 $hi = $lo if $hi < $lo;
2592 3100
2593 $page = $hi - $lo if $page > $hi - $lo; 3101 $value = $hi - $page if $value > $hi - $page;
2594
2595 $value = $lo if $value < $lo; 3102 $value = $lo if $value < $lo;
2596 $value = $hi - $page if $value > $hi - $page;
2597 3103
2598 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3104 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2599 if $unit; 3105 if $unit;
2600 3106
2601 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3107 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2617 3123
2618 $self->SUPER::invoke_button_down ($ev, $x, $y); 3124 $self->SUPER::invoke_button_down ($ev, $x, $y);
2619 3125
2620 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3126 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2621 3127
2622 $self->invoke_mouse_motion ($ev, $x, $y) 3128 $self->invoke_mouse_motion ($ev, $x, $y);
3129
3130 1
2623} 3131}
2624 3132
2625sub invoke_mouse_motion { 3133sub invoke_mouse_motion {
2626 my ($self, $ev, $x, $y) = @_; 3134 my ($self, $ev, $x, $y) = @_;
2627 3135
… …
2643sub invoke_mouse_wheel { 3151sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_; 3152 my ($self, $ev) = @_;
2645 3153
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3154 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647 3155
3156 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3157
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3158 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649 3159
2650 ! ! $delta 3160 1
2651} 3161}
2652 3162
2653sub update { 3163sub update {
2654 my ($self) = @_; 3164 my ($self) = @_;
2655 3165
… …
2661 my ($self) = @_; 3171 my ($self) = @_;
2662 3172
2663 unless ($self->{knob_w}) { 3173 unless ($self->{knob_w}) {
2664 $self->set_value ($self->{range}[0]); 3174 $self->set_value ($self->{range}[0]);
2665 3175
2666 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3176 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2667 my $range = ($hi - $page - $lo) || 1e-100; 3177 my $range = ($hi - $page - $lo) || 1e-10;
2668 3178
2669 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3179 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2670 3180
2671 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3181 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2672 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3182 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2673 3183
2674 $value = ($value - $lo) / $range; 3184 $value = ($value - $lo) / $range;
… …
2704 glDisable GL_TEXTURE_2D; 3214 glDisable GL_TEXTURE_2D;
2705} 3215}
2706 3216
2707############################################################################# 3217#############################################################################
2708 3218
2709package CFPlus::UI::ValSlider; 3219package DC::UI::ValSlider;
2710 3220
2711our @ISA = CFPlus::UI::HBox::; 3221our @ISA = DC::UI::HBox::;
2712 3222
2713sub new { 3223sub new {
2714 my ($class, %arg) = @_; 3224 my ($class, %arg) = @_;
2715 3225
2716 my $range = delete $arg{range}; 3226 my $range = delete $arg{range};
2717 3227
2718 my $self = $class->SUPER::new ( 3228 my $self = $class->SUPER::new (
2719 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3229 slider => (new DC::UI::Slider expand => 1, range => $range),
2720 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3230 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2721 to_value => sub { shift }, 3231 to_value => sub { shift },
2722 from_value => sub { shift }, 3232 from_value => sub { shift },
2723 %arg, 3233 %arg,
2724 ); 3234 );
2725 3235
… …
2745sub set_range { shift->{slider}->set_range (@_) } 3255sub set_range { shift->{slider}->set_range (@_) }
2746sub set_value { shift->{slider}->set_value (@_) } 3256sub set_value { shift->{slider}->set_value (@_) }
2747 3257
2748############################################################################# 3258#############################################################################
2749 3259
2750package CFPlus::UI::TextScroller; 3260package DC::UI::TextScroller;
2751 3261
2752our @ISA = CFPlus::UI::HBox::; 3262our @ISA = DC::UI::HBox::;
2753 3263
2754use CFPlus::OpenGL; 3264use DC::OpenGL;
2755 3265
2756sub new { 3266sub new {
2757 my $class = shift; 3267 my $class = shift;
2758 3268
2759 my $self = $class->SUPER::new ( 3269 my $self = $class->SUPER::new (
… …
2761 can_events => 1, 3271 can_events => 1,
2762 indent => 0, 3272 indent => 0,
2763 #font => default_font 3273 #font => default_font
2764 @_, 3274 @_,
2765 3275
2766 layout => (new CFPlus::Layout), 3276 layout => (new DC::Layout),
2767 par => [], 3277 par => [],
3278 max_par => 0,
2768 height => 0, 3279 height => 0,
2769 children => [ 3280 children => [
2770 (new CFPlus::UI::Empty expand => 1), 3281 (new DC::UI::Empty expand => 1),
2771 (new CFPlus::UI::Slider vertical => 1), 3282 (new DC::UI::Slider vertical => 1),
2772 ], 3283 ],
2773 ); 3284 );
2774 3285
2775 $self->{children}[1]->connect (changed => sub { $self->update }); 3286 $self->{children}[1]->connect (changed => sub { $self->update });
2776 3287
… …
2785} 3296}
2786 3297
2787sub size_request { 3298sub size_request {
2788 my ($self) = @_; 3299 my ($self) = @_;
2789 3300
2790 my ($empty, $slider) = @{ $self->{children} }; 3301 my ($empty, $slider) = $self->visible_children;
2791 3302
2792 local $self->{children} = [$empty, $slider]; 3303 local $self->{children} = [$empty, $slider];
2793 $self->SUPER::size_request 3304 $self->SUPER::size_request
2794} 3305}
2795 3306
… …
2832 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3343 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2833 $layout->set_markup ($para->{markup}); 3344 $layout->set_markup ($para->{markup});
2834 3345
2835 $layout->set_shapes ( 3346 $layout->set_shapes (
2836 map 3347 map
2837 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3348 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2838 @{$para->{widget}} 3349 @{$para->{widget}}
2839 ); 3350 );
2840 3351
2841 $layout 3352 $layout
2842} 3353}
… …
2897 3408
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3409 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para; 3410 push @{$self->{par}}, $para;
2900 } 3411 }
2901 3412
3413 if (my $max = $self->{max_par}) {
3414 shift @{$self->{par}} while @{$self->{par}} > $max;
3415 }
3416
2902 $self->{need_reflow}++; 3417 $self->{need_reflow}++;
2903 $self->update; 3418 $self->update;
2904} 3419}
2905 3420
2906sub scroll_to_bottom { 3421sub scroll_to_bottom {
… …
2955 $ROOT->on_post_alloc ($self => sub { 3470 $ROOT->on_post_alloc ($self => sub {
2956 $self->force_uptodate; 3471 $self->force_uptodate;
2957 3472
2958 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3473 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2959 3474
2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3475 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2961 glClearColor 0, 0, 0, 0; 3476 glClearColor 0, 0, 0, 0;
2962 glClear GL_COLOR_BUFFER_BIT; 3477 glClear GL_COLOR_BUFFER_BIT;
2963 3478
2964 package CFPlus::UI::Base; 3479 package DC::UI::Base;
2965 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3480 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2966 (0, 0, $self->{w}, $self->{h}); 3481 (0, 0, $self->{w}, $self->{h});
2967 3482
2968 my $top = int $self->{children}[1]{range}[0]; 3483 my $top = int $self->{children}[1]{range}[0];
2969 3484
… …
2980 3495
2981 if ($y0 < $y + $h && $y < $y1) { 3496 if ($y0 < $y + $h && $y < $y1) {
2982 my $layout = $self->get_layout ($para); 3497 my $layout = $self->get_layout ($para);
2983 3498
2984 $layout->render ($para->{indent}, $y - $y0); 3499 $layout->render ($para->{indent}, $y - $y0);
3500 $layout->draw;
2985 3501
2986 if (my @w = @{ $para->{widget} }) { 3502 if (my @w = @{ $para->{widget} }) {
2987 my @s = $layout->get_shapes; 3503 my @s = $layout->get_shapes;
2988 3504
2989 for (@w) { 3505 for (@w) {
… …
3027 $self->{children}[1]->draw; 3543 $self->{children}[1]->draw;
3028} 3544}
3029 3545
3030############################################################################# 3546#############################################################################
3031 3547
3032package CFPlus::UI::Animator; 3548package DC::UI::Animator;
3033 3549
3034use CFPlus::OpenGL; 3550use DC::OpenGL;
3035 3551
3036our @ISA = CFPlus::UI::Bin::; 3552our @ISA = DC::UI::Bin::;
3037 3553
3038sub moveto { 3554sub moveto {
3039 my ($self, $x, $y) = @_; 3555 my ($self, $x, $y) = @_;
3040 3556
3041 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3557 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3069 glPopMatrix; 3585 glPopMatrix;
3070} 3586}
3071 3587
3072############################################################################# 3588#############################################################################
3073 3589
3074package CFPlus::UI::Flopper; 3590package DC::UI::Flopper;
3075 3591
3076our @ISA = CFPlus::UI::Button::; 3592our @ISA = DC::UI::Button::;
3077 3593
3078sub new { 3594sub new {
3079 my $class = shift; 3595 my $class = shift;
3080 3596
3081 my $self = $class->SUPER::new ( 3597 my $self = $class->SUPER::new (
… …
3093 $self->{other}->toggle_visibility; 3609 $self->{other}->toggle_visibility;
3094} 3610}
3095 3611
3096############################################################################# 3612#############################################################################
3097 3613
3098package CFPlus::UI::Tooltip; 3614package DC::UI::Tooltip;
3099 3615
3100our @ISA = CFPlus::UI::Bin::; 3616our @ISA = DC::UI::Bin::;
3101 3617
3102use CFPlus::OpenGL; 3618use DC::OpenGL;
3103 3619
3104sub new { 3620sub new {
3105 my $class = shift; 3621 my $class = shift;
3106 3622
3107 $class->SUPER::new ( 3623 $class->SUPER::new (
… …
3111} 3627}
3112 3628
3113sub set_tooltip_from { 3629sub set_tooltip_from {
3114 my ($self, $widget) = @_; 3630 my ($self, $widget) = @_;
3115 3631
3116 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3117 if $widget->{tooltip} =~ /^#(.*)$/;
3118
3119 my $tooltip = $widget->{tooltip}; 3632 my $tip = $widget->{tooltip};
3633 $tip = $tip->($widget) if "CODE" eq ref $tip;
3634
3635 $tip = DC::Pod::section_label tooltip => $1
3636 if $tip =~ /^#(.*)$/;
3120 3637
3121 if ($ENV{CFPLUS_DEBUG} & 2) { 3638 if ($ENV{CFPLUS_DEBUG} & 2) {
3122 $tooltip .= "\n\n" . (ref $widget) . "\n" 3639 $tip .= "\n\n" . (ref $widget) . "\n"
3123 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3640 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3124 . "req $widget->{req_w} $widget->{req_h}\n" 3641 . "req $widget->{req_w} $widget->{req_h}\n"
3125 . "visible $widget->{visible}"; 3642 . "visible $widget->{visible}";
3126 } 3643 }
3127 3644
3128 $tooltip =~ s/^\n+//; 3645 $tip =~ s/^\n+//;
3129 $tooltip =~ s/\n+$//; 3646 $tip =~ s/\n+$//;
3130 3647
3131 $self->add (new CFPlus::UI::Label 3648 $self->add (new DC::UI::Label
3649 fg => $DC::THEME{tooltip_fg},
3132 markup => $tooltip, 3650 markup => $tip,
3133 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3651 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3652 align => 0,
3134 fontsize => 0.8, 3653 fontsize => 0.8,
3135 style => 1, # FLAG_INVERSE 3654 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3136 ellipsise => 0, 3655 ellipsise => 0,
3137 font => ($widget->{tooltip_font} || $::FONT_PROP), 3656 font => ($widget->{tooltip_font} || $::FONT_PROP),
3138 ); 3657 );
3139} 3658}
3140 3659
… …
3175} 3694}
3176 3695
3177sub _draw { 3696sub _draw {
3178 my ($self) = @_; 3697 my ($self) = @_;
3179 3698
3180 glTranslate 0.375, 0.375;
3181
3182 my ($w, $h) = @$self{qw(w h)}; 3699 my ($w, $h) = @$self{qw(w h)};
3183 3700
3184 glColor 1, 0.8, 0.4; 3701 glColor @{ $DC::THEME{tooltip_bg} };
3185 glBegin GL_QUADS; 3702 glRect 0, 0, $w, $h;
3186 glVertex 0 , 0;
3187 glVertex 0 , $h;
3188 glVertex $w, $h;
3189 glVertex $w, 0;
3190 glEnd;
3191 3703
3192 glColor 0, 0, 0; 3704 glColor @{ $DC::THEME{tooltip_border} };
3193 glBegin GL_LINE_LOOP; 3705 glRect_lineloop .5, .5, $w + .5, $h + .5;
3194 glVertex 0 , 0;
3195 glVertex 0 , $h;
3196 glVertex $w, $h;
3197 glVertex $w, 0;
3198 glEnd;
3199 3706
3200 glTranslate 2 - 0.375, 2 - 0.375; 3707 glTranslate 2, 2;
3201 3708
3202 $self->SUPER::_draw; 3709 $self->SUPER::_draw;
3203} 3710}
3204 3711
3205############################################################################# 3712#############################################################################
3206 3713
3207package CFPlus::UI::Face; 3714package DC::UI::Face;
3208 3715
3209our @ISA = CFPlus::UI::DrawBG::; 3716our @ISA = DC::UI::DrawBG::;
3210 3717
3211use CFPlus::OpenGL; 3718use DC::OpenGL;
3212 3719
3213sub new { 3720sub new {
3214 my $class = shift; 3721 my $class = shift;
3215 3722
3216 my $self = $class->SUPER::new ( 3723 my $self = $class->SUPER::new (
3724 size_w => 32,
3725 size_h => 8,
3217 aspect => 1, 3726 aspect => 1,
3218 can_events => 0, 3727 can_events => 0,
3219 @_, 3728 @_,
3220 ); 3729 );
3221 3730
3222 if ($self->{anim} && $self->{animspeed}) { 3731 if ($self->{anim} && $self->{animspeed}) {
3223 Scalar::Util::weaken (my $widget = $self); 3732 DC::weaken (my $widget = $self);
3224 3733
3225 $self->{timer} = Event->timer ( 3734 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3226 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3735 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3227 hard => 1, 3736 return unless $::CONN;
3228 interval => $self->{animspeed}, 3737
3229 cb => sub { 3738 my $w = $widget
3739 or return;
3740
3230 ++$widget->{frame}; 3741 ++$w->{frame};
3742 $w->update_face;
3743
3744 # somehow, $widget can go away
3231 $widget->update; 3745 $w->update;
3232 }, 3746 $w->update_timer;
3233 ); 3747 };
3748
3749 $self->update_face;
3750 $self->update_timer;
3234 } 3751 }
3235 3752
3236 $self 3753 $self
3237} 3754}
3238 3755
3756sub update_timer {
3757 my ($self) = @_;
3758
3759 return unless $self->{timer};
3760
3761 if ($self->{visible}) {
3762 $self->{timer}->start;
3763 } else {
3764 $self->{timer}->stop;
3765 }
3766}
3767
3768sub update_face {
3769 my ($self) = @_;
3770
3771 if ($::CONN) {
3772 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3773 if ($anim && @$anim) {
3774 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3775 delete $self->{face_change_cb};
3776
3777 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3778 unless ($tex->{name} || $tex->{loading}) {
3779 $tex->upload (sub { $self->reconfigure });
3780 }
3781 }
3782 }
3783 }
3784 }
3785}
3786
3239sub size_request { 3787sub size_request {
3240 (32, 8) 3788 my ($self) = @_;
3789
3790 if ($::CONN) {
3791 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3792 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3793 if ($tex->{name}) {
3794 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3795 } elsif (!$tex->{loading}) {
3796 $tex->upload (sub { $self->reconfigure });
3797 }
3798 }
3799
3800 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3801 }
3802 }
3803
3804 ($self->{size_w} || 8, $self->{size_h} || 8)
3241} 3805}
3242 3806
3243sub update { 3807sub update {
3244 my ($self) = @_; 3808 my ($self) = @_;
3245 3809
3246 return unless $self->{visible}; 3810 return unless $self->{visible};
3247 3811
3248 $self->SUPER::update; 3812 $self->SUPER::update;
3249} 3813}
3250 3814
3815sub invoke_visibility_change {
3816 my ($self) = @_;
3817
3818 $self->update_timer;
3819
3820 0
3821}
3822
3251sub _draw { 3823sub _draw {
3252 my ($self) = @_; 3824 my ($self) = @_;
3253 3825
3254 return unless $::CONN;
3255
3256 $self->SUPER::_draw; 3826 $self->SUPER::_draw;
3257 3827
3258 my $face; 3828 if (my $tex = $self->{tex}) {
3259
3260 if ($self->{frame}) {
3261 my $anim = $::CONN->{anim}[$self->{anim}];
3262
3263 $face = $anim->[ $self->{frame} % @$anim ]
3264 if $anim && @$anim;
3265 }
3266
3267 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3268
3269 if ($tex) {
3270 glEnable GL_TEXTURE_2D; 3829 glEnable GL_TEXTURE_2D;
3271 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3830 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3272 glColor 0, 0, 0, 1; 3831 glColor 0, 0, 0, 1;
3273 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3832 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3274 glDisable GL_TEXTURE_2D; 3833 glDisable GL_TEXTURE_2D;
… …
3276} 3835}
3277 3836
3278sub destroy { 3837sub destroy {
3279 my ($self) = @_; 3838 my ($self) = @_;
3280 3839
3281 $self->{timer}->cancel 3840 (delete $self->{timer})->cancel
3282 if $self->{timer}; 3841 if $self->{timer};
3283 3842
3284 $self->SUPER::destroy; 3843 $self->SUPER::destroy;
3285} 3844}
3286 3845
3287############################################################################# 3846#############################################################################
3288 3847
3289package CFPlus::UI::Buttonbar; 3848package DC::UI::Buttonbar;
3290 3849
3291our @ISA = CFPlus::UI::HBox::; 3850our @ISA = DC::UI::HBox::;
3292 3851
3293# TODO: should actually wrap buttons and other goodies. 3852# TODO: should actually wrap buttons and other goodies.
3294 3853
3295############################################################################# 3854#############################################################################
3296 3855
3297package CFPlus::UI::Menu; 3856package DC::UI::Menu;
3298 3857
3299our @ISA = CFPlus::UI::Toplevel::; 3858our @ISA = DC::UI::Toplevel::;
3300 3859
3301use CFPlus::OpenGL; 3860use DC::OpenGL;
3302 3861
3303sub new { 3862sub new {
3304 my $class = shift; 3863 my $class = shift;
3305 3864
3306 my $self = $class->SUPER::new ( 3865 my $self = $class->SUPER::new (
3307 items => [], 3866 items => [],
3308 z => 100, 3867 z => 100,
3309 @_, 3868 @_,
3310 ); 3869 );
3311 3870
3312 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3871 $self->add ($self->{vbox} = new DC::UI::VBox);
3313 3872
3314 for my $item (@{ $self->{items} }) { 3873 for my $item (@{ $self->{items} }) {
3315 my ($widget, $cb, $tooltip) = @$item; 3874 my ($widget, $cb, $tooltip) = @$item;
3316 3875
3317 # handle various types of items, only text for now 3876 # handle various types of items, only text for now
3318 if (!ref $widget) { 3877 if (!ref $widget) {
3319 if ($widget =~ /\t/) { 3878 if ($widget =~ /\t/) {
3320 my ($left, $right) = split /\t/, $widget, 2; 3879 my ($left, $right) = split /\t/, $widget, 2;
3321 3880
3322 $widget = new CFPlus::UI::HBox 3881 $widget = new DC::UI::HBox
3323 can_hover => 1, 3882 can_hover => 1,
3324 can_events => 1, 3883 can_events => 1,
3325 tooltip => $tooltip, 3884 tooltip => $tooltip,
3326 children => [ 3885 children => [
3327 (new CFPlus::UI::Label markup => $left, expand => 1), 3886 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3328 (new CFPlus::UI::Label markup => $right, align => +1), 3887 (new DC::UI::Label markup => $right, align => 1),
3329 ], 3888 ],
3330 ; 3889 ;
3331 3890
3332 } else { 3891 } else {
3333 $widget = new CFPlus::UI::Label 3892 $widget = new DC::UI::Label
3334 can_hover => 1, 3893 can_hover => 1,
3335 can_events => 1, 3894 can_events => 1,
3895 align => 0,
3336 markup => $widget, 3896 markup => $widget,
3337 tooltip => $tooltip; 3897 tooltip => $tooltip;
3338 } 3898 }
3339 } 3899 }
3340 3900
… …
3355 # maybe save $GRAB? must be careful about events... 3915 # maybe save $GRAB? must be careful about events...
3356 $GRAB = $self; 3916 $GRAB = $self;
3357 $self->{button} = $ev->{button}; 3917 $self->{button} = $ev->{button};
3358 3918
3359 $self->show; 3919 $self->show;
3360 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3920
3921 my $x = $ev->{x};
3922 my $y = $ev->{y};
3923
3924 $self->{root}->on_post_alloc ($self => sub {
3925 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3926 });
3927
3928 1 # so it can be used inside event handlers
3361} 3929}
3362 3930
3363sub invoke_mouse_motion { 3931sub invoke_mouse_motion {
3364 my ($self, $ev, $x, $y) = @_; 3932 my ($self, $ev, $x, $y) = @_;
3365 3933
… …
3386 1 3954 1
3387} 3955}
3388 3956
3389############################################################################# 3957#############################################################################
3390 3958
3391package CFPlus::UI::Multiplexer; 3959package DC::UI::Multiplexer;
3392 3960
3393our @ISA = CFPlus::UI::Container::; 3961our @ISA = DC::UI::Container::;
3394 3962
3395sub new { 3963sub new {
3396 my $class = shift; 3964 my $class = shift;
3397 3965
3398 my $self = $class->SUPER::new ( 3966 my $self = $class->SUPER::new (
3399 @_, 3967 @_,
3400 ); 3968 );
3401 3969
3402 $self->{current} = $self->{children}[0] 3970 $self->set_current_page (0);
3403 if @{ $self->{children} };
3404 3971
3405 $self 3972 $self
3406} 3973}
3407 3974
3408sub add { 3975sub add {
3409 my ($self, @widgets) = @_; 3976 my ($self, @widgets) = @_;
3410 3977
3411 $self->SUPER::add (@widgets); 3978 $self->SUPER::add (@widgets);
3412 3979
3413 $self->{current} = $self->{children}[0] 3980 $self->set_current_page (0)
3414 if @{ $self->{children} }; 3981 if @widgets == @{ $self->{children} };
3415} 3982}
3416 3983
3417sub get_current_page { 3984sub get_current_page {
3418 my ($self) = @_; 3985 my ($self) = @_;
3419 3986
… …
3425 3992
3426 my $widget = ref $page_or_widget 3993 my $widget = ref $page_or_widget
3427 ? $page_or_widget 3994 ? $page_or_widget
3428 : $self->{children}[$page_or_widget]; 3995 : $self->{children}[$page_or_widget];
3429 3996
3997 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3998
3430 $self->{current} = $widget; 3999 if (($self->{current} = $widget)) {
4000 $self->{current}->set_visible if $self->{current} && $self->{visible};
3431 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4001 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3432 4002
3433 $self->emit (page_changed => $self->{current}); 4003 $self->emit (page_changed => $self->{current});
4004 }
3434 4005
3435 $self->realloc; 4006 $self->realloc;
3436} 4007}
3437 4008
3438sub visible_children { 4009sub visible_children {
3439 $_[0]{current} 4010 $_[0]{current} || ()
3440} 4011}
3441 4012
3442sub size_request { 4013sub size_request {
3443 my ($self) = @_; 4014 my ($self) = @_;
3444 4015
4016 $self->{current}
3445 $self->{current}->size_request 4017 ? $self->{current}->size_request
4018 : (0, 0)
3446} 4019}
3447 4020
3448sub invoke_size_allocate { 4021sub invoke_size_allocate {
3449 my ($self, $w, $h) = @_; 4022 my ($self, $w, $h) = @_;
3450 4023
3451 $self->{current}->configure (0, 0, $w, $h); 4024 $self->{current}->configure (0, 0, $w, $h)
4025 if $self->{current};
3452 4026
3453 1 4027 1
3454} 4028}
3455 4029
3456sub _draw { 4030sub _draw {
3457 my ($self) = @_; 4031 my ($self) = @_;
3458 4032
3459 $self->{current}->draw; 4033 $self->{current}->draw
4034 if $self->{current};
3460} 4035}
3461 4036
3462############################################################################# 4037#############################################################################
3463 4038
3464package CFPlus::UI::Notebook; 4039package DC::UI::Notebook;
3465 4040
4041use DC::OpenGL;
4042
3466our @ISA = CFPlus::UI::VBox::; 4043our @ISA = DC::UI::VBox::;
3467 4044
3468sub new { 4045sub new {
3469 my $class = shift; 4046 my $class = shift;
3470 4047
3471 my $self = $class->SUPER::new ( 4048 my $self = $class->SUPER::new (
3472 buttonbar => (new CFPlus::UI::Buttonbar), 4049 buttonbar => (new DC::UI::Buttonbar),
3473 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4050 multiplexer => (new DC::UI::Multiplexer expand => 1),
4051 active_outline => [.7, .7, 0.2],
3474 # filter => # will be put between multiplexer and $self 4052 # filter => # will be put between multiplexer and $self
3475 @_, 4053 @_,
3476 ); 4054 );
3477 4055
3478 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3479 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4057 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3480 4058
4059 {
4060 Scalar::Util::weaken (my $wself = $self);
4061
4062 $self->{multiplexer}->connect (c_add => sub {
4063 my ($mplex, $widgets) = @_;
4064
4065 for my $child (@$widgets) {
4066 Scalar::Util::weaken $child;
4067 $child->{c_tab_} ||= do {
4068 my $tab =
4069 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4070 ? $child->{c_tab}
4071 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4072
4073 $tab->connect (activate => sub {
4074 $wself->set_current_page ($child);
4075 });
4076
4077 $tab
4078 };
4079
4080 $self->{buttonbar}->add ($child->{c_tab_});
4081 }
4082 });
4083
4084 $self->{multiplexer}->connect (c_remove => sub {
4085 my ($mplex, $widgets) = @_;
4086
4087 for my $child (@$widgets) {
4088 $wself->{buttonbar}->remove ($child->{c_tab_});
4089 }
4090 });
4091 }
4092
3481 $self 4093 $self
3482} 4094}
3483 4095
3484sub add { 4096sub add {
4097 my ($self, @widgets) = @_;
4098
4099 $self->{multiplexer}->add (@widgets)
4100}
4101
4102sub remove {
4103 my ($self, @widgets) = @_;
4104
4105 $self->{multiplexer}->remove (@widgets)
4106}
4107
4108sub pages {
4109 my ($self) = @_;
4110 $self->{multiplexer}->children
4111}
4112
4113sub page_index {
4114 my ($self, $widget) = @_;
4115
4116 my $i = 0;
4117 for ($self->pages) {
4118 if ($_ eq $widget) { return $i };
4119 $i++;
4120 }
4121
4122 undef
4123}
4124
4125sub add_tab {
3485 my ($self, $title, $widget, $tooltip) = @_; 4126 my ($self, $title, $widget, $tooltip) = @_;
3486 4127
3487 Scalar::Util::weaken $self; 4128 $title = [$title, $tooltip] unless ref $title;
4129 $widget->{c_tab} = $title;
3488 4130
3489 $self->{buttonbar}->add (new CFPlus::UI::Button
3490 markup => $title,
3491 tooltip => $tooltip,
3492 on_activate => sub { $self->set_current_page ($widget) },
3493 );
3494
3495 $self->{multiplexer}->add ($widget); 4131 $self->add ($widget);
3496} 4132}
3497 4133
3498sub get_current_page { 4134sub get_current_page {
3499 my ($self) = @_; 4135 my ($self) = @_;
3500 4136
… …
3506 4142
3507 $self->{multiplexer}->set_current_page ($page); 4143 $self->{multiplexer}->set_current_page ($page);
3508 $self->emit (page_changed => $self->{multiplexer}{current}); 4144 $self->emit (page_changed => $self->{multiplexer}{current});
3509} 4145}
3510 4146
4147sub _draw {
4148 my ($self) = @_;
4149
4150 $self->SUPER::_draw ();
4151
4152 if (my $cur = $self->{multiplexer}{current}) {
4153 if ($cur = $cur->{c_tab_}) {
4154 glTranslate $self->{buttonbar}{x} + $cur->{x},
4155 $self->{buttonbar}{y} + $cur->{y};
4156 glLineWidth 3;
4157 #glEnable GL_BLEND;
4158 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4159 glColor @{$self->{active_outline}};
4160 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4161 glLineWidth 1;
4162 #glDisable GL_BLEND;
4163 }
4164 }
4165}
4166
3511############################################################################# 4167#############################################################################
3512 4168
3513package CFPlus::UI::Selector; 4169package DC::UI::Selector;
3514 4170
3515use utf8; 4171use utf8;
3516 4172
3517our @ISA = CFPlus::UI::Button::; 4173our @ISA = DC::UI::Button::;
3518 4174
3519sub new { 4175sub new {
3520 my $class = shift; 4176 my $class = shift;
3521 4177
3522 my $self = $class->SUPER::new ( 4178 my $self = $class->SUPER::new (
… …
3539 my ($value, $title, $tooltip) = @$_; 4195 my ($value, $title, $tooltip) = @$_;
3540 4196
3541 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4197 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3542 } 4198 }
3543 4199
3544 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4200 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3545} 4201}
3546 4202
3547sub _set_value { 4203sub _set_value {
3548 my ($self, $value) = @_; 4204 my ($self, $value) = @_;
3549 4205
3550 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4206 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4207 $item ||= $self->{options}[0]
3551 or return; 4208 or return;
3552 4209
3553 $self->{value} = $item->[0]; 4210 $self->{value} = $item->[0];
3554 $self->set_markup ("$item->[1] ⇓"); 4211 $self->set_markup ("$item->[1] ⇓");
3555 $self->set_tooltip ($item->[2]); 4212# $self->set_tooltip ($item->[2]);
3556} 4213}
3557 4214
3558sub set_value { 4215sub set_value {
3559 my ($self, $value) = @_; 4216 my ($self, $value) = @_;
3560 4217
… …
3562 4219
3563 $self->_set_value ($value); 4220 $self->_set_value ($value);
3564 $self->emit (changed => $value); 4221 $self->emit (changed => $value);
3565} 4222}
3566 4223
4224sub set_options {
4225 my ($self, $options) = @_;
4226
4227 $self->{options} = $options;
4228 $self->_set_value ($self->{value});
4229}
4230
3567############################################################################# 4231#############################################################################
3568 4232
3569package CFPlus::UI::Statusbox; 4233package DC::UI::Statusbox;
3570 4234
3571our @ISA = CFPlus::UI::VBox::; 4235our @ISA = DC::UI::VBox::;
3572 4236
3573sub new { 4237sub new {
3574 my $class = shift; 4238 my $class = shift;
3575 4239
3576 my $self = $class->SUPER::new ( 4240 my $self = $class->SUPER::new (
3577 fontsize => 0.8, 4241 fontsize => 0.8,
3578 @_, 4242 @_,
3579 ); 4243 );
3580 4244
3581 Scalar::Util::weaken (my $this = $self); 4245 DC::weaken (my $this = $self);
3582 4246
3583 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4247 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3584 4248
3585 $self 4249 $self
3586} 4250}
3587 4251
3588sub reorder { 4252sub reorder {
3589 my ($self) = @_; 4253 my ($self) = @_;
3590 my $NOW = Time::HiRes::time; 4254 my $NOW = EV::time;
3591 4255
3592 # freeze display when hovering over any label 4256 # freeze display when hovering over any label
3593 return if $CFPlus::UI::TOOLTIP->{owner} 4257 return if $DC::UI::TOOLTIP->{owner}
3594 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4258 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3595 values %{ $self->{item} }; 4259 values %{ $self->{item} };
3596 4260
3597 while (my ($k, $v) = each %{ $self->{item} }) { 4261 while (my ($k, $v) = each %{ $self->{item} }) {
3598 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4262 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3599 } 4263 }
4264
4265 $self->{timer}->set (1, 1);
3600 4266
3601 my @widgets; 4267 my @widgets;
3602 4268
3603 my @items = sort { 4269 my @items = sort {
3604 $a->{pri} <=> $b->{pri} 4270 $a->{pri} <=> $b->{pri}
3605 or $b->{id} <=> $a->{id} 4271 or $b->{id} <=> $a->{id}
3606 } values %{ $self->{item} }; 4272 } values %{ $self->{item} };
3607
3608 $self->{timer}->interval (1);
3609 4273
3610 my $count = 10 + 1; 4274 my $count = 10 + 1;
3611 for my $item (@items) { 4275 for my $item (@items) {
3612 last unless --$count; 4276 last unless --$count;
3613 4277
… …
3620 for ($short) { 4284 for ($short) {
3621 s/^\s+//; 4285 s/^\s+//;
3622 s/\s+/ /g; 4286 s/\s+/ /g;
3623 } 4287 }
3624 4288
3625 new CFPlus::UI::Label 4289 new DC::UI::Label
3626 markup => $short, 4290 markup => $short,
3627 tooltip => $item->{tooltip}, 4291 tooltip => $item->{tooltip},
3628 tooltip_font => $::FONT_PROP, 4292 tooltip_font => $::FONT_PROP,
3629 tooltip_width => 0.67, 4293 tooltip_width => 0.67,
3630 fontsize => $item->{fontsize} || $self->{fontsize}, 4294 fontsize => $item->{fontsize} || $self->{fontsize},
3631 max_w => $::WIDTH * 0.44, 4295 max_w => $::WIDTH * 0.44,
4296 align => 0,
3632 fg => [@{ $item->{fg} }], 4297 fg => [@{ $item->{fg} }],
3633 can_events => 1, 4298 can_events => 1,
3634 can_hover => 1 4299 can_hover => 1
3635 }; 4300 };
3636 4301
3637 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4302 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3638 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4303 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3639 $label->update; 4304 $label->update;
3640 $label->set_max_size (undef, $label->{req_h} * $diff) 4305 $label->set_max_size (undef, $label->{req_h} * $diff)
3641 if $diff < 1; 4306 if $diff < 1;
3642 $self->{timer}->interval (1/30); 4307 $self->{timer}->set (1/30, 1/30);
3643 } else { 4308 } else {
3644 $label->{fg}[3] = $item->{fg}[3] || 1; 4309 $label->{fg}[3] = $item->{fg}[3] || 1;
3645 } 4310 }
3646 4311
3647 push @widgets, $label; 4312 push @widgets, $label;
3648 } 4313 }
4314
4315 my $hash = join ",", @widgets;
4316 return if $hash eq $self->{last_widget_hash};
4317 $self->{last_widget_hash} = $hash;
3649 4318
3650 $self->clear; 4319 $self->clear;
3651 $self->SUPER::add (reverse @widgets); 4320 $self->SUPER::add (reverse @widgets);
3652} 4321}
3653 4322
… …
3709 $self->SUPER::destroy; 4378 $self->SUPER::destroy;
3710} 4379}
3711 4380
3712############################################################################# 4381#############################################################################
3713 4382
3714package CFPlus::UI::Inventory;
3715
3716our @ISA = CFPlus::UI::Table::;
3717
3718sub new {
3719 my $class = shift;
3720
3721 my $self = $class->SUPER::new (
3722 col_expand => [0, 1, 0],
3723 items => [],
3724 @_,
3725 );
3726
3727 $self->set_sort_order (undef);
3728
3729 $self
3730}
3731
3732sub update_items {
3733 my ($self) = @_;
3734
3735 $self->clear;
3736
3737 my @item = $self->{sort}->(@{ $self->{items} });
3738
3739 my @adds;
3740 my $row = 0;
3741 for my $item ($self->{sort}->(@{ $self->{items} })) {
3742 CFPlus::Item::update_widgets $item;
3743
3744 push @adds, 0, $row, $item->{face_widget};
3745 push @adds, 1, $row, $item->{desc_widget};
3746 push @adds, 2, $row, $item->{weight_widget};
3747
3748 $row++;
3749 }
3750
3751 $self->add (@adds);
3752}
3753
3754sub set_sort_order {
3755 my ($self, $order) = @_;
3756
3757 $self->{sort} = $order ||= sub {
3758 sort {
3759 $a->{type} <=> $b->{type}
3760 or $a->{name} cmp $b->{name}
3761 } @_
3762 };
3763
3764 $self->update_items;
3765}
3766
3767sub set_items {
3768 my ($self, $items) = @_;
3769
3770 $self->{items} = [$items ? values %$items : ()];
3771 $self->update_items;
3772}
3773
3774#############################################################################
3775
3776package CFPlus::UI::SpellList;
3777
3778our @ISA = CFPlus::UI::Table::;
3779
3780sub new {
3781 my $class = shift;
3782
3783 my $self = $class->SUPER::new (
3784 binding => [],
3785 commands => [],
3786 @_,
3787 )
3788}
3789
3790my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3791
3792my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3793 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3794my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3795 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3796my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3797 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3798my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3799 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3800my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3801 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3802
3803sub rebuild_spell_list {
3804 my ($self) = @_;
3805
3806 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3807 $self->clear;
3808
3809 return unless $::CONN;
3810
3811 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3812 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3813 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3814 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3815 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3816
3817 my $row = 0;
3818
3819 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3820 my $spell = $self->{spell}{$_};
3821
3822 $row++;
3823
3824 my $spell_cb = sub {
3825 my ($widget, $ev) = @_;
3826
3827 if ($ev->{button} == 1) {
3828 $::CONN->user_send ("cast $spell->{name}");
3829 } elsif ($ev->{button} == 2) {
3830 $::CONN->user_send ("invoke $spell->{name}");
3831 } elsif ($ev->{button} == 3) {
3832 (new CFPlus::UI::Menu
3833 items => [
3834 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3835 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3836 ],
3837 )->popup ($ev);
3838 } else {
3839 return 0;
3840 }
3841
3842 1
3843 };
3844
3845 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3846
3847 #TODO: add path info to tooltip
3848 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3849
3850 $self->add (0, $row, new CFPlus::UI::Face
3851 face => $spell->{face},
3852 can_hover => 1,
3853 can_events => 1,
3854 tooltip => $tooltip,
3855 on_button_down => $spell_cb,
3856 );
3857
3858 $self->add (1, $row, new CFPlus::UI::Label
3859 expand => 1,
3860 text => $spell->{name},
3861 can_hover => 1,
3862 can_events => 1,
3863 tooltip => $tooltip,
3864 on_button_down => $spell_cb,
3865 );
3866
3867 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3868 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3869 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3870 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3871 }
3872 });
3873}
3874
3875sub add_spell {
3876 my ($self, $spell) = @_;
3877
3878 $self->{spell}->{$spell->{name}} = $spell;
3879 $self->rebuild_spell_list;
3880}
3881
3882sub remove_spell {
3883 my ($self, $spell) = @_;
3884
3885 delete $self->{spell}->{$spell->{name}};
3886 $self->rebuild_spell_list;
3887}
3888
3889sub clear_spells {
3890 my ($self) = @_;
3891
3892 $self->{spell} = {};
3893 $self->rebuild_spell_list;
3894}
3895
3896#############################################################################
3897
3898package CFPlus::UI::Root; 4383package DC::UI::Root;
3899 4384
3900our @ISA = CFPlus::UI::Container::; 4385our @ISA = DC::UI::Container::;
3901 4386
3902use List::Util qw(min max); 4387use List::Util qw(min max);
3903 4388
3904use CFPlus::OpenGL; 4389use DC::OpenGL;
3905 4390
3906sub new { 4391sub new {
3907 my $class = shift; 4392 my $class = shift;
3908 4393
3909 my $self = $class->SUPER::new ( 4394 my $self = $class->SUPER::new (
3910 visible => 1, 4395 visible => 1,
3911 @_, 4396 @_,
3912 ); 4397 );
3913 4398
3914 Scalar::Util::weaken ($self->{root} = $self); 4399 DC::weaken ($self->{root} = $self);
3915 4400
3916 $self 4401 $self
3917} 4402}
3918 4403
3919sub size_request { 4404sub size_request {
… …
3967} 4452}
3968 4453
3969sub update { 4454sub update {
3970 my ($self) = @_; 4455 my ($self) = @_;
3971 4456
3972 $::WANT_REFRESH++; 4457 $::WANT_REFRESH = 1;
3973} 4458}
3974 4459
3975sub add { 4460sub add {
3976 my ($self, @children) = @_; 4461 my ($self, @children) = @_;
3977 4462
… …
4014 while ($self->{refresh_hook}) { 4499 while ($self->{refresh_hook}) {
4015 $_->() 4500 $_->()
4016 for values %{delete $self->{refresh_hook}}; 4501 for values %{delete $self->{refresh_hook}};
4017 } 4502 }
4018 4503
4019 if ($self->{realloc}) { 4504 while ($self->{realloc}) {
4020 my %queue; 4505 my %queue;
4021 my @queue; 4506 my @queue;
4022 my $widget; 4507 my $widget;
4023 4508
4024 outer: 4509 outer:
… …
4044 4529
4045 delete $queue{$widget+0}; 4530 delete $queue{$widget+0};
4046 4531
4047 my ($w, $h) = $widget->size_request; 4532 my ($w, $h) = $widget->size_request;
4048 4533
4049 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4534 $w += $widget->{padding_x} * 2;
4050 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4535 $h += $widget->{padding_y} * 2;
4536
4537 $w = max $widget->{min_w}, $w;
4538 $h = max $widget->{min_h}, $h;
4051 4539
4052 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4540 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4053 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4541 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4054 4542
4055 $w = $widget->{force_w} if exists $widget->{force_w}; 4543 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4071 } 4559 }
4072 } 4560 }
4073 4561
4074 delete $self->{realloc}{$widget+0}; 4562 delete $self->{realloc}{$widget+0};
4075 } 4563 }
4076 }
4077 4564
4078 while (my $size_alloc = delete $self->{size_alloc}) { 4565 while (my $size_alloc = delete $self->{size_alloc}) {
4079 my @queue = sort { $b->{visible} <=> $a->{visible} } 4566 my @queue = sort { $a->{visible} <=> $b->{visible} }
4080 values %$size_alloc; 4567 values %$size_alloc;
4081 4568
4082 while () { 4569 while () {
4083 my $widget = pop @queue || last; 4570 my $widget = pop @queue || last;
4084 4571
4085 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4572 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4086 4573
4087 $w = 0 if $w < 0;
4088 $h = 0 if $h < 0;
4089
4090 $w = max $widget->{min_w}, $w; 4574 $w = max $widget->{min_w}, $w;
4091 $h = max $widget->{min_h}, $h; 4575 $h = max $widget->{min_h}, $h;
4092 4576
4093# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4577# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4094# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4578# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4095 4579
4096 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4580 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4097 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4581 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4098 4582
4099 $w = int $w + 0.5; 4583 $w = int $w + 0.5;
4100 $h = int $h + 0.5; 4584 $h = int $h + 0.5;
4101 4585
4102 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4586 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4103 $widget->{old_w} = $widget->{w}; 4587 $widget->{old_w} = $widget->{w};
4104 $widget->{old_h} = $widget->{h}; 4588 $widget->{old_h} = $widget->{h};
4105 4589
4106 $widget->{w} = $w; 4590 $widget->{w} = $w;
4107 $widget->{h} = $h; 4591 $widget->{h} = $h;
4108 4592
4109 $widget->emit (size_allocate => $w, $h); 4593 $widget->emit (size_allocate => $w, $h);
4594 }
4110 } 4595 }
4111 } 4596 }
4112 } 4597 }
4113 4598
4114 while ($self->{post_alloc_hook}) { 4599 while ($self->{post_alloc_hook}) {
4115 $_->() 4600 $_->()
4116 for values %{delete $self->{post_alloc_hook}}; 4601 for values %{delete $self->{post_alloc_hook}};
4117 } 4602 }
4118
4119 4603
4120 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4604 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4121 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4605 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4122 glClear GL_COLOR_BUFFER_BIT; 4606 glClear GL_COLOR_BUFFER_BIT;
4123 4607
… …
4126 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4610 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4127 glMatrixMode GL_MODELVIEW; 4611 glMatrixMode GL_MODELVIEW;
4128 glLoadIdentity; 4612 glLoadIdentity;
4129 4613
4130 { 4614 {
4131 package CFPlus::UI::Base; 4615 package DC::UI::Base;
4132 4616
4133 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4617 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4134 (0, 0, $self->{w}, $self->{h}); 4618 (0, 0, $self->{w}, $self->{h});
4135 4619
4136 $self->_draw; 4620 $self->_draw;
4137 } 4621 }
4138} 4622}
4139 4623
4140############################################################################# 4624#############################################################################
4141 4625
4142package CFPlus::UI; 4626package DC::UI;
4143 4627
4144$ROOT = new CFPlus::UI::Root; 4628$ROOT = new DC::UI::Root;
4145$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4629$TOOLTIP = new DC::UI::Tooltip z => 900;
4146 4630
41471 46311
4148

Diff Legend

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