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.478 by root, Tue Dec 22 00:35:44 2009 UTC

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

Diff Legend

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