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

Diff Legend

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