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.356 by root, Wed Dec 6 00:15:12 2006 UTC vs.
Revision 1.486 by root, Wed Nov 21 13:23:10 2012 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
6use Scalar::Util ();
7use List::Util (); 5use List::Util ();
6
8use Event; 7use AnyEvent ();
8use Guard ();
9 9
10use CFPlus; 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 common::sense;
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
… …
347} 363}
348 364
349sub set_size { 365sub set_size {
350 my ($self, $w, $h) = @_; 366 my ($self, $w, $h) = @_;
351 367
352 $self->{force_w} = $w; 368 $self->{force_w} = List::Util::min $w, ($self->{max_w} || $::WIDTH );
353 $self->{force_h} = $h; 369 $self->{force_h} = List::Util::min $h, ($self->{max_h} || $::HEIGHT);
354 370
355 $self->realloc; 371 $self->realloc;
372}
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)
356} 390}
357 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";
… …
368 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
369 403
370 if ($self->{aspect}) { 404 if ($self->{aspect}) {
371 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
372 406
373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
375 409
376 # use alignment to adjust x, y 410 # use alignment to adjust x, y
377 411
378 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
379 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
… …
420 454
421 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
422 456
423 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
424 458
425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
426 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
427 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
428 } 462 }
429} 463}
430 464
431# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
432sub coord2local { 466sub coord2local {
433 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
434 468
435 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
436 470
437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
438} 472}
439 473
440# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
441sub coord2global { 475sub coord2global {
442 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
443 477
444 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
445 479
446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
447} 481}
448 482
449sub invoke_focus_in { 483sub invoke_focus_in {
… …
498sub connect { 532sub connect {
499 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
500 534
501 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
502 536
503 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
506 } 540 }
541}
542
543sub disconnect_all {
544 my ($self, $signal) = @_;
545
546 delete $self->{signal_cb}{$signal};
507} 547}
508 548
509my %has_coords = ( 549my %has_coords = (
510 button_down => 1, 550 button_down => 1,
511 button_up => 1, 551 button_up => 1,
… …
523 ? $args[0]->xy ($self) 563 ? $args[0]->xy ($self)
524 : (); 564 : ();
525 565
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 566 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 567
528 #d##TODO# stop propagating at first true, do not use sum 568 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 569 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 570 ($self->can ("invoke_$signal") || sub { 1 }), # closure
571 ) {
572 return $cb->($self, @args, @append) || next;
573 }
574
575 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 576 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 577}
533 578
534sub find_widget { 579#sub find_widget {
535 my ($self, $x, $y) = @_; 580# in .xs
536
537 return () unless $self->{can_events};
538
539 return $self
540 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
541 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
542
543 ()
544}
545 581
546sub set_parent { 582sub set_parent {
547 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
548 584
549 Scalar::Util::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
551} 587}
552 588
553sub realloc { 589sub realloc {
554 my ($self) = @_; 590 my ($self) = @_;
… …
580 616
581# using global variables seems a bit hacky, but passing through all drawing 617# using global variables seems a bit hacky, but passing through all drawing
582# functions seems pointless. 618# functions seems pointless.
583our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 619our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
584 620
585sub draw { 621#sub draw {
586 my ($self) = @_; 622#CFPlus.xs
587
588 return unless $self->{h} && $self->{w};
589
590 # update screen rectangle
591 local $draw_x = $draw_x + $self->{x};
592 local $draw_y = $draw_y + $self->{y};
593
594 # skip widgets that are entirely outside the drawing area
595 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
596 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
597
598 glPushMatrix;
599 glTranslate $self->{x}, $self->{y}, 0;
600
601 if ($self == $HOVER && $self->{can_hover}) {
602 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
603 glEnable GL_BLEND;
604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glBegin GL_QUADS;
606 glVertex 0 , 0;
607 glVertex $self->{w}, 0;
608 glVertex $self->{w}, $self->{h};
609 glVertex 0 , $self->{h};
610 glEnd;
611 glDisable GL_BLEND;
612 }
613
614 if ($ENV{CFPLUS_DEBUG} & 1) {
615 glPushMatrix;
616 glColor 1, 1, 0, 1;
617 glTranslate 0.375, 0.375;
618 glBegin GL_LINE_LOOP;
619 glVertex 0 , 0;
620 glVertex $self->{w} - 1, 0;
621 glVertex $self->{w} - 1, $self->{h} - 1;
622 glVertex 0 , $self->{h} - 1;
623 glEnd;
624 glPopMatrix;
625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
626 }
627
628 $self->_draw;
629 glPopMatrix;
630}
631 623
632sub _draw { 624sub _draw {
633 my ($self) = @_; 625 my ($self) = @_;
634 626
635 warn "no draw defined for $self\n"; 627 warn "no draw defined for $self\n";
636} 628}
637 629
638sub DESTROY { 630sub DESTROY {
639 my ($self) = @_; 631 my ($self) = @_;
640 632
641 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
642 634
643 delete $WIDGET{$self+0}; 635 local $@;
644
645 eval { $self->destroy }; 636 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
638
639 delete $WIDGET{$self+0};
647} 640}
648 641
649############################################################################# 642#############################################################################
650 643
651package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
652 645
653our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
654 647
655use strict; 648use common::sense;
649
656use CFPlus::OpenGL; 650use DC::OpenGL;
657 651
658sub new { 652sub new {
659 my $class = shift; 653 my $class = shift;
660
661 # range [value, low, high, page]
662 654
663 $class->SUPER::new ( 655 $class->SUPER::new (
664 #bg => [0, 0, 0, 0.2], 656 #bg => [0, 0, 0, 0.2],
665 #active_bg => [1, 1, 1, 0.5], 657 #active_bg => [1, 1, 1, 0.5],
666 @_ 658 @_
667 ) 659 )
668} 660}
669 661
662sub set_bg {
663 my ($self, $bg) = @_;
664
665 $self->{bg} = $bg;
666 $self->update;
667}
668
670sub _draw { 669sub _draw {
671 my ($self) = @_; 670 my ($self) = @_;
672 671
673 my $color = $FOCUS == $self && $self->{active_bg} 672 my $color = $FOCUS == $self
674 ? $self->{active_bg} 673 ? $self->{active_bg} || $self->{bg}
675 : $self->{bg}; 674 : $self->{bg};
676 675
677 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
678 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
679 678
680 glEnable GL_BLEND; 679 glEnable GL_BLEND;
681 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
682 glColor_premultiply @$color; 681 glColor_premultiply @$color;
683
684 glBegin GL_QUADS;
685 glVertex 0 , 0;
686 glVertex 0 , $h;
687 glVertex $w, $h; 682 glRect 0, 0, $w, $h;
688 glVertex $w, 0;
689 glEnd;
690
691 glDisable GL_BLEND; 683 glDisable GL_BLEND;
692 } 684 }
693} 685}
694 686
695############################################################################# 687#############################################################################
696 688
697package CFPlus::UI::Empty; 689package DC::UI::Empty;
698 690
699our @ISA = CFPlus::UI::Base::; 691our @ISA = DC::UI::Base::;
700 692
701sub new { 693sub new {
702 my ($class, %arg) = @_; 694 my ($class, %arg) = @_;
703 $class->SUPER::new (can_events => 0, %arg); 695 $class->SUPER::new (can_events => 0, %arg);
704} 696}
… …
711 703
712sub draw { } 704sub draw { }
713 705
714############################################################################# 706#############################################################################
715 707
716package CFPlus::UI::Container; 708package DC::UI::Container;
717 709
718our @ISA = CFPlus::UI::Base::; 710our @ISA = DC::UI::Base::;
719 711
720sub new { 712sub new {
721 my ($class, %arg) = @_; 713 my ($class, %arg) = @_;
722 714
723 my $children = delete $arg{children}; 715 my $children = delete $arg{children};
… …
727 can_events => 0, 719 can_events => 0,
728 %arg, 720 %arg,
729 ); 721 );
730 722
731 $self->add (@$children) 723 $self->add (@$children)
732 if $children; 724 if $children && @$children;
733 725
734 $self 726 $self
735} 727}
736 728
737sub realloc { 729sub realloc {
… …
746 my ($self, @widgets) = @_; 738 my ($self, @widgets) = @_;
747 739
748 $_->set_parent ($self) 740 $_->set_parent ($self)
749 for @widgets; 741 for @widgets;
750 742
743 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 744 use sort 'stable';
752 745
753 $self->{children} = [ 746 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 747 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 748 @{$self->{children}}, @widgets
756 ]; 749 ];
757 750
758 $self->realloc; 751 $self->realloc;
752
753 $self->emit (c_add => \@widgets);
754
755 map $_+0, @widgets
759} 756}
760 757
761sub children { 758sub children {
762 @{ $_[0]{children} } 759 @{ $_[0]{children} }
763} 760}
764 761
765sub remove { 762sub remove {
766 my ($self, $child) = @_; 763 my ($self, @widgets) = @_;
767 764
765 $self->emit (c_remove => \@widgets);
766
767 for my $child (@widgets) {
768 delete $child->{parent}; 768 delete $child->{parent};
769 $child->hide; 769 $child->hide;
770
771 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
771 }
772 772
773 $self->realloc; 773 $self->realloc;
774} 774}
775 775
776sub clear { 776sub clear {
777 my ($self) = @_; 777 my ($self) = @_;
778 778
779 my $children = delete $self->{children}; 779 my $children = $self->{children};
780 $self->{children} = []; 780 $self->{children} = [];
781 781
782 for (@$children) { 782 for (@$children) {
783 delete $_->{parent}; 783 delete $_->{parent};
784 $_->hide; 784 $_->hide;
… …
804} 804}
805 805
806sub _draw { 806sub _draw {
807 my ($self) = @_; 807 my ($self) = @_;
808 808
809 $_->draw for @{$self->{children}}; 809 $_->draw for $self->visible_children;
810} 810}
811 811
812############################################################################# 812#############################################################################
813 813
814package CFPlus::UI::Bin; 814package DC::UI::Bin;
815 815
816our @ISA = CFPlus::UI::Container::; 816our @ISA = DC::UI::Container::;
817 817
818sub new { 818sub new {
819 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
820 820
821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 821 my $child = (delete $arg{child}) || new DC::UI::Empty::;
822 822
823 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
824} 824}
825 825
826sub add { 826sub add {
827 my ($self, $child) = @_; 827 my ($self, $child) = @_;
828 828
829 $self->SUPER::remove ($_) for @{ $self->{children} }; 829 $self->clear;
830 $self->SUPER::add ($child); 830 $self->SUPER::add ($child);
831} 831}
832 832
833sub remove { 833sub remove {
834 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
835 835
836 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
837 837
838 $self->{children} = [new CFPlus::UI::Empty] 838 $self->{children} = [new DC::UI::Empty]
839 unless @{$self->{children}}; 839 unless @{$self->{children}};
840} 840}
841 841
842sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
843 843
… …
852 852
853 1 853 1
854} 854}
855 855
856############################################################################# 856#############################################################################
857
858# back-buffered drawing area 857# back-buffered drawing area
859 858
860package CFPlus::UI::Window; 859package DC::UI::Window;
861 860
862our @ISA = CFPlus::UI::Bin::; 861our @ISA = DC::UI::Bin::;
863 862
864use CFPlus::OpenGL; 863use DC::OpenGL;
865 864
866sub new { 865sub new {
867 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
868 867
869 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
… …
891} 890}
892 891
893sub render_child { 892sub render_child {
894 my ($self) = @_; 893 my ($self) = @_;
895 894
896 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
897 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
898 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
899 898
900 { 899 {
901 package CFPlus::UI::Base; 900 package DC::UI::Base;
902 901
903 local ($draw_x, $draw_y, $draw_w, $draw_h) = 902 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
905 904
906 $self->_render; 905 $self->_render;
… …
923 glDisable GL_TEXTURE_2D; 922 glDisable GL_TEXTURE_2D;
924} 923}
925 924
926############################################################################# 925#############################################################################
927 926
928package CFPlus::UI::ViewPort; 927package DC::UI::ViewPort;
929 928
929use List::Util qw(min max);
930
930our @ISA = CFPlus::UI::Window::; 931our @ISA = DC::UI::Window::;
931 932
932sub new { 933sub new {
933 my $class = shift; 934 my $class = shift;
934 935
935 $class->SUPER::new ( 936 $class->SUPER::new (
… …
942sub size_request { 943sub size_request {
943 my ($self) = @_; 944 my ($self) = @_;
944 945
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 946 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 947
947 $w = 10 if $self->{scroll_x}; 948 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 949 $h = 1 if $self->{scroll_y};
949 950
950 ($w, $h) 951 ($w, $h)
951} 952}
952 953
953sub invoke_size_allocate { 954sub invoke_size_allocate {
… …
965} 966}
966 967
967sub set_offset { 968sub set_offset {
968 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
969 970
971 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
972 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
973
974 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 975 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 976 $self->{view_y} = $y;
972 977
978 $self->emit (changed => $x, $y);
973 $self->update; 979 $self->update;
980 }
981}
982
983sub set_center {
984 my ($self, $x, $y) = @_;
985
986 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
987}
988
989sub make_visible {
990 my ($self, $x, $y, $border) = @_;
991
992 if ( $x < $self->{view_x} + $self->{w} * $border
993 || $x > $self->{view_x} + $self->{w} * (1 - $border)
994 || $y < $self->{view_y} + $self->{h} * $border
995 || $y > $self->{view_y} + $self->{h} * (1 - $border)
996 ) {
997 $self->set_center ($x, $y);
998 }
974} 999}
975 1000
976# hmm, this does not work for topleft of $self... but we should not ask for that 1001# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 1002sub coord2local {
978 my ($self, $x, $y) = @_; 1003 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 1018 my ($self, $x, $y) = @_;
994 1019
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 1022 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 1024 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1025 $self->DC::UI::Base::find_widget ($x, $y)
1001 } 1026 }
1002} 1027}
1003 1028
1004sub _render { 1029sub _render {
1005 my ($self) = @_; 1030 my ($self) = @_;
1006 1031
1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1032 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1033 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1009 1034
1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1035 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1011 1036
1012 $self->SUPER::_render; 1037 $self->SUPER::_render;
1013} 1038}
1014 1039
1015############################################################################# 1040#############################################################################
1016 1041
1017package CFPlus::UI::ScrolledWindow; 1042package DC::UI::ScrolledWindow;
1018 1043
1019our @ISA = CFPlus::UI::HBox::; 1044our @ISA = DC::UI::Table::;
1020 1045
1021sub new { 1046sub new {
1022 my ($class, %arg) = @_; 1047 my ($class, %arg) = @_;
1023 1048
1024 my $child = delete $arg{child}; 1049 my $child = delete $arg{child};
1025 1050
1026 my $self; 1051 my $self;
1027 1052
1028 my $slider = new CFPlus::UI::Slider 1053 my $hslider = new DC::UI::Slider
1054 c_col => 0,
1055 c_row => 1,
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new DC::UI::Slider
1065 c_col => 1,
1066 c_row => 0,
1029 vertical => 1, 1067 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1069 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1070 $self->{vpos} = $_[1];
1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1072 },
1034 ; 1073 ;
1035 1074
1036 $self = $class->SUPER::new ( 1075 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1076 scroll_x => 0,
1077 scroll_y => 1,
1038 can_events => 1, 1078 can_events => 1,
1039 slider => $slider, 1079 hslider => $hslider,
1080 vslider => $vslider,
1081 col_expand => [1, 0],
1082 row_expand => [1, 0],
1040 %arg, 1083 %arg,
1041 ); 1084 );
1042 1085
1086 $self->{vp} = new DC::UI::ViewPort
1087 c_col => 0,
1088 c_row => 0,
1089 expand => 1,
1090 scroll_x => $self->{scroll_x},
1091 scroll_y => $self->{scroll_y},
1092 on_changed => sub {
1093 my ($vp, $x, $y) = @_;
1094
1095 $vp->{parent}{hslider}->set_value ($x);
1096 $vp->{parent}{vslider}->set_value ($y);
1097
1098 0
1099 },
1100 on_size_allocate => sub {
1101 my ($vp, $w, $h) = @_;
1102 $vp->{parent}->update_slider;
1103 0
1104 },
1105 ;
1106
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1107 $self->SUPER::add ($self->{vp});
1108
1044 $self->add ($child) if $child; 1109 $self->add ($child) if $child;
1045 1110
1046 $self 1111 $self
1047} 1112}
1048
1049#TODO# update range on size_allocate depending on child
1050 1113
1051sub add { 1114sub add {
1052 my ($self, $widget) = @_; 1115 my ($self, $widget) = @_;
1053 1116
1054 $self->{vp}->add ($self->{child} = $widget); 1117 $self->{vp}->add ($self->{child} = $widget);
1055} 1118}
1056 1119
1120sub set_offset { shift->{vp}->set_offset (@_) }
1121sub set_center { shift->{vp}->set_center (@_) }
1122sub make_visible { shift->{vp}->make_visible (@_) }
1123
1124sub update_slider {
1125 my ($self) = @_;
1126
1127 my $child = ($self->{vp} or return)->child;
1128
1129 if ($self->{scroll_x}) {
1130 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1131 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1132
1133 my $visible = $w1 > $w2;
1134 if ($visible != $self->{hslider_visible}) {
1135 $self->{hslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{hslider})
1137 : $self->SUPER::remove ($self->{hslider});
1138 }
1139 }
1140
1141 if ($self->{scroll_y}) {
1142 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1143 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1144
1145 my $visible = $h1 > $h2;
1146 if ($visible != $self->{vslider_visible}) {
1147 $self->{vslider_visible} = $visible;
1148 $visible ? $self->SUPER::add ($self->{vslider})
1149 : $self->SUPER::remove ($self->{vslider});
1150 }
1151 }
1152}
1153
1154sub start_dragging {
1155 my ($self, $ev) = @_;
1156
1157 $self->grab_focus;
1158
1159 my $ox = $self->{vp}{view_x};
1160 my $oy = $self->{vp}{view_y};
1161
1162 $self->{motion} = sub {
1163 my ($ev, $x, $y) = @_;
1164
1165 $ox -= $ev->{xrel};
1166 $oy -= $ev->{yrel};
1167
1168 $self->{vp}->set_offset ($ox, $oy);
1169 };
1170}
1171
1057sub invoke_mouse_wheel { 1172sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1173 my ($self, $ev) = @_;
1059 1174
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1175 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1176 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063 1177
1064 1 1178 1
1065} 1179}
1066 1180
1067sub update_slider { 1181sub invoke_button_down {
1068 my ($self) = @_; 1182 my ($self, $ev, $x, $y) = @_;
1069 1183
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1184 if ($ev->{button} == 2) {
1071} 1185 $self->start_dragging ($ev);
1186 return 1;
1187 }
1072 1188
1073sub update { 1189 0
1074 my ($self) = @_; 1190}
1075 1191
1076 $self->SUPER::update; 1192sub invoke_button_up {
1193 my ($self, $ev, $x, $y) = @_;
1077 1194
1078 $self->update_slider; 1195 if (delete $self->{motion}) {
1196 return 1;
1197 }
1198
1199 0
1200}
1201
1202sub invoke_mouse_motion {
1203 my ($self, $ev, $x, $y) = @_;
1204
1205 if ($self->{motion}) {
1206 $self->{motion}->($ev, $x, $y);
1207 return 1;
1208 }
1209
1210 0
1079} 1211}
1080 1212
1081sub invoke_size_allocate { 1213sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1083 1215
1084 $self->update_slider; 1216 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1217 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1218}
1088 1219
1089############################################################################# 1220#############################################################################
1090 1221
1091package CFPlus::UI::Frame; 1222package DC::UI::Frame;
1092 1223
1093our @ISA = CFPlus::UI::Bin::; 1224our @ISA = DC::UI::Bin::;
1094 1225
1095use CFPlus::OpenGL; 1226use DC::OpenGL;
1096 1227
1097sub new { 1228sub new {
1098 my $class = shift; 1229 my $class = shift;
1099 1230
1100 $class->SUPER::new ( 1231 $class->SUPER::new (
… …
1110 my ($w, $h) = @$self{qw(w h)}; 1241 my ($w, $h) = @$self{qw(w h)};
1111 1242
1112 glEnable GL_BLEND; 1243 glEnable GL_BLEND;
1113 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1114 glColor_premultiply @{ $self->{bg} }; 1245 glColor_premultiply @{ $self->{bg} };
1115
1116 glBegin GL_QUADS;
1117 glVertex 0 , 0;
1118 glVertex 0 , $h;
1119 glVertex $w, $h; 1246 glRect 0, 0, $w, $h;
1120 glVertex $w, 0;
1121 glEnd;
1122
1123 glDisable GL_BLEND; 1247 glDisable GL_BLEND;
1124 } 1248 }
1125 1249
1126 $self->SUPER::_draw; 1250 $self->SUPER::_draw;
1127} 1251}
1128 1252
1129############################################################################# 1253#############################################################################
1130 1254
1131package CFPlus::UI::FancyFrame; 1255package DC::UI::FancyFrame;
1132 1256
1133our @ISA = CFPlus::UI::Bin::; 1257our @ISA = DC::UI::Bin::;
1134 1258
1135use CFPlus::OpenGL; 1259use DC::OpenGL;
1136 1260
1137sub new { 1261sub new {
1138 my ($class, %arg) = @_; 1262 my ($class, %arg) = @_;
1139 1263
1140 if ((exists $arg{label}) && !ref $arg{label}) { 1264 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label 1265 $arg{label} = new DC::UI::Label
1142 align => 1, 1266 align => 1,
1143 valign => 0, 1267 valign => 0.5,
1144 text => $arg{label}, 1268 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75; 1269 fontsize => ($arg{border} || 0.8) * 0.75;
1146 } 1270 }
1147 1271
1148 my $self = $class->SUPER::new ( 1272 my $self = $class->SUPER::new (
1149 # label => "", 1273 # label => "",
1150 fg => [0.6, 0.3, 0.1], 1274 fg => undef,
1151 border => 0.8, 1275 border => 0.8,
1152 style => 'single', 1276 style => 'single',
1153 %arg, 1277 %arg,
1154 ); 1278 );
1155 1279
… …
1158 1282
1159sub add { 1283sub add {
1160 my ($self, @widgets) = @_; 1284 my ($self, @widgets) = @_;
1161 1285
1162 $self->SUPER::add (@widgets); 1286 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1287 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1164} 1288}
1165 1289
1166sub border { 1290sub border {
1167 int $_[0]{border} * $::FONTSIZE 1291 int $_[0]{border} * $::FONTSIZE
1168} 1292}
… …
1208 my $border = $self->border; 1332 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h}); 1333 my ($w, $h) = ($self->{w}, $self->{h});
1210 1334
1211 $child->draw; 1335 $child->draw;
1212 1336
1213 glColor @{$self->{fg}}; 1337 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1214 glBegin GL_LINE_STRIP; 1338 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1339 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1342 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1226 } 1350 }
1227} 1351}
1228 1352
1229############################################################################# 1353#############################################################################
1230 1354
1231package CFPlus::UI::Toplevel; 1355package DC::UI::Toplevel;
1232 1356
1233our @ISA = CFPlus::UI::Bin::; 1357our @ISA = DC::UI::Bin::;
1234 1358
1235use CFPlus::OpenGL; 1359use DC::OpenGL;
1236 1360
1237my $bg = 1361my $bg =
1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1362 new_from_resource DC::Texture "d1_bg.png",
1239 mipmap => 1, wrap => 1; 1363 mipmap => 1, wrap => 1;
1240 1364
1241my @border = 1365my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1366 map { new_from_resource DC::Texture $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1367 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1368
1369my @icon =
1370 map { new_from_resource DC::Texture $_, mipmap => 1 }
1371 qw(x1_move.png x1_resize.png);
1244 1372
1245sub new { 1373sub new {
1246 my ($class, %arg) = @_; 1374 my ($class, %arg) = @_;
1247 1375
1248 my $self = $class->SUPER::new ( 1376 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1377 bg => [1, 1, 1, 1],
1250 border_bg => [1, 1, 1, 1], 1378 border_bg => [1, 1, 1, 1],
1251 border => 0.6, 1379 border => 0.8,
1252 can_events => 1, 1380 can_events => 1,
1253 min_w => 64, 1381 min_w => 64,
1254 min_h => 32, 1382 min_h => 32,
1255 %arg, 1383 %arg,
1256 ); 1384 );
1257 1385
1258 $self->{title_widget} = new CFPlus::UI::Label 1386 $self->{title_widget} = new DC::UI::Label
1259 align => 0, 1387 align => 0.5,
1260 valign => 1, 1388 valign => 1,
1261 text => $self->{title}, 1389 text => $self->{title},
1262 fontsize => $self->{border}, 1390 fontsize => $self->{border},
1263 if exists $self->{title}; 1391 if exists $self->{title};
1264 1392
1265 if ($self->{has_close_button}) { 1393 if ($self->{has_close_button}) {
1266 $self->{close_button} = 1394 $self->{close_button} =
1267 new CFPlus::UI::ImageButton 1395 new DC::UI::ImageButton
1268 path => 'x1_close.png', 1396 path => 'x1_close.png',
1269 on_activate => sub { $self->emit ("delete") }; 1397 on_activate => sub { $self->emit ("delete") };
1270 1398
1271 $self->CFPlus::UI::Container::add ($self->{close_button}); 1399 $self->DC::UI::Container::add ($self->{close_button});
1272 } 1400 }
1273 1401
1274 $self 1402 $self
1275} 1403}
1276 1404
1277sub add { 1405sub add {
1278 my ($self, @widgets) = @_; 1406 my ($self, @widgets) = @_;
1279 1407
1280 $self->SUPER::add (@widgets); 1408 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1409 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1282 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1410 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1283} 1411}
1284 1412
1285sub border { 1413sub border {
1286 int $_[0]{border} * $::FONTSIZE 1414 int $_[0]{border} * $::FONTSIZE
1415}
1416
1417sub get_max_wh {
1418 my ($self) = @_;
1419
1420 return ($self->{w}, $self->{h})
1421 if $self->{visible} && $self->{w};
1422
1423 $self->SUPER::get_max_wh
1287} 1424}
1288 1425
1289sub size_request { 1426sub size_request {
1290 my ($self) = @_; 1427 my ($self) = @_;
1291 1428
… …
1337 my ($self, $ev, $x, $y) = @_; 1474 my ($self, $ev, $x, $y) = @_;
1338 1475
1339 my ($w, $h) = @$self{qw(w h)}; 1476 my ($w, $h) = @$self{qw(w h)};
1340 my $border = $self->border; 1477 my $border = $self->border;
1341 1478
1342 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); 1479 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); # left-right
1343 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); 1480 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); # top-down
1344 1481
1345 if ($lr & $td) { 1482 if ($lr & $td) { # corners
1346 my ($wx, $wy) = ($self->{x}, $self->{y}); 1483 my ($wx, $wy) = ($self->{x}, $self->{y});
1347 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1484 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1348 my ($bw, $bh) = ($self->{w}, $self->{h}); 1485 my ($bw, $bh) = ($self->{w}, $self->{h});
1349 1486
1350 my $mx = $x < $border; 1487 my $mx = $x < $border;
… …
1354 my ($ev, $x, $y) = @_; 1491 my ($ev, $x, $y) = @_;
1355 1492
1356 my $dx = $ev->{x} - $ox; 1493 my $dx = $ev->{x} - $ox;
1357 my $dy = $ev->{y} - $oy; 1494 my $dy = $ev->{y} - $oy;
1358 1495
1496 $self->set_size (
1359 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1497 $bw + $dx * ($mx ? -1 : 1),
1360 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1498 $bh + $dy * ($my ? -1 : 1),
1499 );
1361 1500
1362 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my); 1501 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1363 $self->realloc; 1502 $self->realloc;
1364 }; 1503 };
1365 1504
1366 } elsif ($lr ^ $td) { 1505 } elsif ($lr ^ $td) { # edges
1367 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1506 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1368 my ($bx, $by) = ($self->{x}, $self->{y}); 1507 my ($bx, $by) = ($self->{x}, $self->{y});
1369 1508
1370 $self->{motion} = sub { 1509 $self->{motion} = sub {
1371 my ($ev, $x, $y) = @_; 1510 my ($ev, $x, $y) = @_;
… …
1416 glEnable GL_TEXTURE_2D; 1555 glEnable GL_TEXTURE_2D;
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1557
1419 my $border = $self->border; 1558 my $border = $self->border;
1420 1559
1560 if ($border) {
1421 glColor @{ $self->{border_bg} }; 1561 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1562 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1563 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1564 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1565 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1566
1567 # move
1568 my $w2 = ($w - $border) * .5;
1569 my $h2 = ($h - $border) * .5;
1570 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1571 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1572 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1573
1574 # resize
1575 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1576 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1577 unless $self->{has_close_button};
1578 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1579 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1580 }
1426 1581
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1582 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1583 glColor @{ $self->{bg} };
1429 1584
1430 # TODO: repeat texture not scale 1585 # TODO: repeat texture not scale
… …
1449 if $self->{close_button}; 1604 if $self->{close_button};
1450} 1605}
1451 1606
1452############################################################################# 1607#############################################################################
1453 1608
1454package CFPlus::UI::Table; 1609package DC::UI::Table;
1455 1610
1456our @ISA = CFPlus::UI::Base::; 1611our @ISA = DC::UI::Container::;
1457 1612
1458use List::Util qw(max sum); 1613use List::Util qw(max sum);
1459 1614
1460use CFPlus::OpenGL; 1615use DC::OpenGL;
1461 1616
1462sub new { 1617sub new {
1463 my $class = shift; 1618 my $class = shift;
1464 1619
1465 $class->SUPER::new ( 1620 $class->SUPER::new (
1466 col_expand => [], 1621 col_expand => [],
1622 row_expand => [],
1467 @_, 1623 @_,
1468 ) 1624 )
1469} 1625}
1470 1626
1471sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473}
1474
1475sub add { 1627sub add {
1628 my ($self, @widgets) = @_;
1629
1630 for my $child (@widgets) {
1631 $child->{c_rowspan} ||= 1;
1632 $child->{c_colspan} ||= 1;
1633 }
1634
1635 $self->SUPER::add (@widgets);
1636}
1637
1638sub add_at {
1476 my ($self) = shift; 1639 my $self = shift;
1640
1641 my @widgets;
1477 1642
1478 while (@_) { 1643 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1644 my ($col, $row, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child;
1482 }
1483 1645
1484 $self->{force_realloc} = 1; 1646 $child->{c_row} = $row;
1485 $self->{force_size_alloc} = 1; 1647 $child->{c_col} = $col;
1486 $self->realloc;
1487}
1488 1648
1489sub remove { 1649 push @widgets, $child;
1650 }
1651
1652 $self->add (@widgets);
1653}
1654
1655sub get_wh {
1490 my ($self, $child) = @_; 1656 my ($self) = @_;
1491 1657
1492 # TODO: not yet implemented 1658 my (@w, @h);
1493}
1494
1495# TODO: move to container class maybe? send children a signal on removal?
1496sub clear {
1497 my ($self) = @_;
1498 1659
1499 my @children = $self->children; 1660 my @children = $self->children;
1500 delete $self->{children}; 1661
1662 # first pass, columns
1663 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1664 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1665
1666 my $sw = sum @w[$c .. $c + $cs - 1];
1667
1668 if ($w > $sw) {
1669 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1670 }
1501 1671 }
1502 for (@children) {
1503 delete $_->{parent};
1504 $_->hide;
1505 }
1506 1672
1507 $self->realloc; 1673 # second pass, rows
1508} 1674 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1509
1510sub get_wh {
1511 my ($self) = @_;
1512
1513 my (@w, @h);
1514
1515 for my $y (0 .. $#{$self->{children}}) {
1516 my $row = $self->{children}[$y]
1517 or next;
1518
1519 for my $x (0 .. $#$row) {
1520 my $widget = $row->[$x]
1521 or next;
1522 my ($w, $h) = @$widget{qw(req_w req_h)}; 1675 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1523 1676
1524 $w[$x] = max $w[$x], $w; 1677 my $sh = sum @h[$r .. $r + $rs - 1];
1525 $h[$y] = max $h[$y], $h; 1678
1679 if ($h > $sh) {
1680 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526 } 1681 }
1527 } 1682 }
1528 1683
1529 (\@w, \@h) 1684 (\@w, \@h)
1530} 1685}
… …
1546 my ($ws, $hs) = $self->get_wh; 1701 my ($ws, $hs) = $self->get_wh;
1547 1702
1548 my $req_w = (sum @$ws) || 1; 1703 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1704 my $req_h = (sum @$hs) || 1;
1550 1705
1551 # TODO: nicer code && do row_expand 1706 # now linearly scale the rows/columns to the allocated size
1552 my @col_expand = @{$self->{col_expand}}; 1707 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1708 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1709 my $col_expand = (sum @col_expand) || 1;
1555 1710
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1711 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1712
1560 CFPlus::UI::harmonize $ws; 1713 DC::UI::harmonize $ws;
1714
1715 my @row_expand = @{$self->{row_expand}};
1716 @row_expand = (1) x @$ws unless @row_expand;
1717 my $row_expand = (sum @row_expand) || 1;
1718
1719 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1720
1561 CFPlus::UI::harmonize $hs; 1721 DC::UI::harmonize $hs;
1562 1722
1563 my $y; 1723 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1724 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564 1725
1565 for my $r (0 .. $#{$self->{children}}) { 1726 for my $widget ($self->children) {
1566 my $row = $self->{children}[$r] 1727 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1567 or next;
1568 1728
1569 my $x = 0; 1729 $widget->configure (
1570 my $row_h = $hs->[$r]; 1730 $x[$c], $y[$r],
1731 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571 1732 );
1572 for my $c (0 .. $#$row) { 1733 }
1573 my $col_w = $ws->[$c];
1574 1734
1575 if (my $widget = $row->[$c]) { 1735 1
1576 $widget->configure ($x, $y, $col_w, $row_h); 1736}
1577 }
1578 1737
1579 $x += $col_w; 1738#############################################################################
1739
1740package DC::UI::Fixed;
1741
1742use List::Util qw(min max);
1743
1744our @ISA = DC::UI::Container::;
1745
1746sub _scale($$$) {
1747 my ($rel, $val, $max) = @_;
1748
1749 $rel ? $val * $max : $val
1750}
1751
1752sub size_request {
1753 my ($self) = @_;
1754
1755 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1756
1757 # determine overall size by querying abs widgets
1758 for my $child ($self->visible_children) {
1759 unless ($child->{c_rel}) {
1760 my $x = $child->{c_x};
1761 my $y = $child->{c_y};
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1580 } 1765 }
1766 }
1581 1767
1582 $y += $row_h; 1768 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1;
1770
1771 # now layout remaining widgets
1772 for my $child ($self->visible_children) {
1773 if ($child->{c_rel}) {
1774 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1775 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1776
1777 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1778 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1779 }
1780 }
1781
1782 my $W = $x2 - $x1;
1783 my $H = $y2 - $y1;
1784
1785 ($W, $H)
1786}
1787
1788sub invoke_size_allocate {
1789 my ($self, $W, $H) = @_;
1790
1791 for my $child ($self->visible_children) {
1792 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1793 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1794
1795 $x += $child->{c_halign} * $child->{req_w};
1796 $y += $child->{c_valign} * $child->{req_h};
1797
1798 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1583 } 1799 }
1584 1800
1585 1 1801 1
1586} 1802}
1587 1803
1588sub find_widget {
1589 my ($self, $x, $y) = @_;
1590
1591 $x -= $self->{x};
1592 $y -= $self->{y};
1593
1594 my $res;
1595
1596 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1597 $res = $_->find_widget ($x, $y)
1598 and return $res;
1599 }
1600
1601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1602}
1603
1604sub _draw {
1605 my ($self) = @_;
1606
1607 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_;
1609 }
1610}
1611
1612############################################################################# 1804#############################################################################
1613 1805
1614package CFPlus::UI::Box; 1806package DC::UI::Box;
1615 1807
1616our @ISA = CFPlus::UI::Container::; 1808our @ISA = DC::UI::Container::;
1617 1809
1618sub size_request { 1810sub size_request {
1619 my ($self) = @_; 1811 my ($self) = @_;
1812
1813 my @children = $self->visible_children;
1620 1814
1621 $self->{vertical} 1815 $self->{vertical}
1622 ? ( 1816 ? (
1623 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1817 (List::Util::max map $_->{req_w}, @children),
1624 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_h}, @children),
1625 ) 1819 )
1626 : ( 1820 : (
1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1821 (List::Util::sum map $_->{req_w}, @children),
1628 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1822 (List::Util::max map $_->{req_h}, @children),
1629 ) 1823 )
1630} 1824}
1631 1825
1632sub invoke_size_allocate { 1826sub invoke_size_allocate {
1633 my ($self, $w, $h) = @_; 1827 my ($self, $w, $h) = @_;
… …
1654 $req[$_] += $space * $children[$_]{expand} 1848 $req[$_] += $space * $children[$_]{expand}
1655 for 0 .. $#children; 1849 for 0 .. $#children;
1656 } 1850 }
1657 } 1851 }
1658 1852
1659 CFPlus::UI::harmonize \@req; 1853 DC::UI::harmonize \@req;
1660 1854
1661 my $pos = 0; 1855 my $pos = 0;
1662 for (0 .. $#children) { 1856 for (0 .. $#children) {
1663 my $alloc = $req[$_]; 1857 my $alloc = $req[$_];
1664 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1858 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1669 1 1863 1
1670} 1864}
1671 1865
1672############################################################################# 1866#############################################################################
1673 1867
1674package CFPlus::UI::HBox; 1868package DC::UI::HBox;
1675 1869
1676our @ISA = CFPlus::UI::Box::; 1870our @ISA = DC::UI::Box::;
1677 1871
1678sub new { 1872sub new {
1679 my $class = shift; 1873 my $class = shift;
1680 1874
1681 $class->SUPER::new ( 1875 $class->SUPER::new (
… …
1684 ) 1878 )
1685} 1879}
1686 1880
1687############################################################################# 1881#############################################################################
1688 1882
1689package CFPlus::UI::VBox; 1883package DC::UI::VBox;
1690 1884
1691our @ISA = CFPlus::UI::Box::; 1885our @ISA = DC::UI::Box::;
1692 1886
1693sub new { 1887sub new {
1694 my $class = shift; 1888 my $class = shift;
1695 1889
1696 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1699 ) 1893 )
1700} 1894}
1701 1895
1702############################################################################# 1896#############################################################################
1703 1897
1704package CFPlus::UI::Label; 1898package DC::UI::Label;
1705 1899
1706our @ISA = CFPlus::UI::DrawBG::; 1900our @ISA = DC::UI::DrawBG::;
1707 1901
1708use CFPlus::OpenGL; 1902use DC::OpenGL;
1709 1903
1710sub new { 1904sub new {
1711 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1712 1906
1713 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
… …
1718 #text => initial text 1912 #text => initial text
1719 #markup => initial narkup 1913 #markup => initial narkup
1720 #max_w => maximum pixel width 1914 #max_w => maximum pixel width
1721 #style => 0, # render flags 1915 #style => 0, # render flags
1722 ellipsise => 3, # end 1916 ellipsise => 3, # end
1723 layout => (new CFPlus::Layout), 1917 layout => (new DC::Layout),
1724 fontsize => 1, 1918 fontsize => 1,
1725 align => -1, 1919 align => 0.5,
1726 valign => -1, 1920 valign => 0.5,
1727 padding_x => 2, 1921 padding_x => 4,
1728 padding_y => 2, 1922 padding_y => 2,
1729 can_events => 0, 1923 can_events => 0,
1730 %arg 1924 %arg
1731 ); 1925 );
1732 1926
1733 if (exists $self->{template}) { 1927 if (exists $self->{template}) {
1734 my $layout = new CFPlus::Layout; 1928 my $layout = new DC::Layout;
1735 $layout->set_text (delete $self->{template}); 1929 $layout->set_text (delete $self->{template});
1736 $self->{template} = $layout; 1930 $self->{template} = $layout;
1737 } 1931 }
1738 1932
1739 if (exists $self->{markup}) { 1933 if (exists $self->{markup}) {
… …
1757 1951
1758 delete $self->{ox}; 1952 delete $self->{ox};
1759 $self->SUPER::realloc; 1953 $self->SUPER::realloc;
1760} 1954}
1761 1955
1956sub clear {
1957 my ($self) = @_;
1958
1959 $self->set_text ("");
1960}
1961
1762sub set_text { 1962sub set_text {
1763 my ($self, $text) = @_; 1963 my ($self, $text) = @_;
1764 1964
1765 return if $self->{text} eq "T$text"; 1965 return if $self->{text} eq "T$text";
1766 $self->{text} = "T$text"; 1966 $self->{text} = "T$text";
… …
1789 1989
1790sub size_request { 1990sub size_request {
1791 my ($self) = @_; 1991 my ($self) = @_;
1792 1992
1793 $self->{size_req} ||= do { 1993 $self->{size_req} ||= do {
1994 my ($max_w, $max_h) = $self->get_max_wh;
1995
1794 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1996 $self->{layout}->set_font ($self->{font}) if $self->{font};
1795 $self->{layout}->set_width ($self->{max_w} || -1); 1997 $self->{layout}->set_width ($max_w);
1796 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1998 $self->{layout}->set_ellipsise ($self->{ellipsise});
1797 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1999 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1798 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2000 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1799 2001
1800 my ($w, $h) = $self->{layout}->size; 2002 my ($w, $h) = $self->{layout}->size;
1801 2003
1802 if (exists $self->{template}) { 2004 if (exists $self->{template}) {
1803 $self->{template}->set_font ($self->{font}) if $self->{font}; 2005 $self->{template}->set_font ($self->{font}) if $self->{font};
1804 $self->{template}->set_width ($self->{max_w} || -1); 2006 $self->{template}->set_width ($max_w);
1805 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2007 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1806 2008
1807 my ($w2, $h2) = $self->{template}->size; 2009 my ($w2, $h2) = $self->{template}->size;
1808 2010
1809 $w = List::Util::max $w, $w2; 2011 $w = List::Util::max $w, $w2;
… …
1865 2067
1866 [$self->{layout}->size] 2068 [$self->{layout}->size]
1867 }; 2069 };
1868 2070
1869 unless (exists $self->{ox}) { 2071 unless (exists $self->{ox}) {
1870 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2072 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1871 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2073 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1872 : ($self->{w} - $size->[0]) * 0.5);
1873 2074
1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2075 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1876 : ($self->{h} - $size->[1]) * 0.5);
1877 }; 2076 };
1878 2077
1879 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2078# unless ($self->{list}) {
1880 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2079# $self->{list} = DC::OpenGL::glGenList;
1881 2080# DC::OpenGL::glNewList $self->{list};
1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2081# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2082# DC::OpenGL::glEndList;
2083# }
2084#
2085# DC::OpenGL::glCallList $self->{list};
2086
2087 $self->{layout}->draw;
1883} 2088}
2089
2090#sub destroy {
2091# my ($self) = @_;
2092#
2093# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2094#
2095# $self->SUPER::destroy;
2096#}
1884 2097
1885############################################################################# 2098#############################################################################
1886 2099
1887package CFPlus::UI::EntryBase; 2100package DC::UI::EntryBase;
1888 2101
1889our @ISA = CFPlus::UI::Label::; 2102our @ISA = DC::UI::Label::;
1890 2103
1891use CFPlus::OpenGL; 2104use DC::OpenGL;
1892 2105
1893sub new { 2106sub new {
1894 my $class = shift; 2107 my $class = shift;
1895 2108
1896 $class->SUPER::new ( 2109 $class->SUPER::new (
1897 fg => [1, 1, 1], 2110 fg => [1, 1, 1],
1898 bg => [0, 0, 0, 0.2], 2111 bg => [0, 0, 0, 0.2],
2112 outline => undef,
1899 active_bg => [1, 1, 1, 0.5], 2113 active_bg => [0, 0, 1, .2],
1900 active_fg => [0, 0, 0], 2114 active_fg => [1, 1, 1],
2115 active_outline => [1, 1, 0],
1901 can_hover => 1, 2116 can_hover => 1,
1902 can_focus => 1, 2117 can_focus => 1,
2118 align => 0,
1903 valign => 0, 2119 valign => 0.5,
1904 can_events => 1, 2120 can_events => 1,
2121 ellipsise => 0,
2122 padding_x => 4,
2123 padding_y => 2,
1905 #text => ... 2124 #text => ...
1906 #hidden => "*", 2125 #hidden => "*",
1907 @_ 2126 @_
1908 ) 2127 )
1909} 2128}
… …
1954 my $sym = $ev->{sym}; 2173 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2174 my $uni = $ev->{unicode};
1956 2175
1957 my $text = $self->get_text; 2176 my $text = $self->get_text;
1958 2177
1959 if ($uni == 8) { 2178 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2179
2180 if ($sym == DC::SDLK_BACKSPACE) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2181 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2182 } elsif ($sym == DC::SDLK_DELETE) {
1962 substr $text, $self->{cursor}, 1, ""; 2183 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2184 } elsif ($sym == DC::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2185 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2186 } elsif ($sym == DC::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2187 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2188 } elsif ($sym == DC::SDLK_HOME) {
2189 # what a hack
1968 $self->{cursor} = 0; 2190 $self->{cursor} =
2191 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2192 ? length $1
2193 : 0;
1969 } elsif ($sym == CFPlus::SDLK_END) { 2194 } elsif ($sym == DC::SDLK_END) {
2195 # uh, again
2196 $self->{cursor} =
2197 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1970 $self->{cursor} = length $text; 2198 ? $self->{cursor} + length $1
2199 : length $self->{text};
1971 } elsif ($uni == 21) { # ctrl-u 2200 } elsif ($uni == 21) { # ctrl-u
1972 $text = ""; 2201 $text = "";
1973 $self->{cursor} = 0; 2202 $self->{cursor} = 0;
1974 } elsif ($uni == 27) { 2203 } elsif ($uni == 27) {
1975 $self->emit ('escape'); 2204 $self->emit ('escape');
1976 } elsif ($uni) { 2205 } elsif ($uni == 0x0d) {
2206 substr $text, $self->{cursor}++, 0, "\012";
2207 } elsif ($uni >= 0x20) {
1977 substr $text, $self->{cursor}++, 0, chr $uni; 2208 substr $text, $self->{cursor}++, 0, chr $uni;
1978 } else { 2209 } else {
1979 return 0; 2210 return 0;
1980 } 2211 }
1981 2212
1982 $self->_set_text ($text); 2213 $self->_set_text ($text);
1983 2214
1984 $self->realloc; 2215 $self->realloc;
2216 $self->update;
1985 2217
1986 1 2218 1
1987} 2219}
1988 2220
1989sub invoke_focus_in { 2221sub invoke_focus_in {
… …
2031 glColor_premultiply @{$self->{bg}}; 2263 glColor_premultiply @{$self->{bg}};
2032 } 2264 }
2033 2265
2034 glEnable GL_BLEND; 2266 glEnable GL_BLEND;
2035 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2267 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2036 glBegin GL_QUADS;
2037 glVertex 0 , 0;
2038 glVertex 0 , $self->{h};
2039 glVertex $self->{w}, $self->{h}; 2268 glRect 0, 0, $self->{w}, $self->{h};
2040 glVertex $self->{w}, 0;
2041 glEnd;
2042 glDisable GL_BLEND; 2269 glDisable GL_BLEND;
2043 2270
2044 $self->SUPER::_draw; 2271 $self->SUPER::_draw;
2045 2272
2046 #TODO: force update every cursor change :( 2273 #TODO: force update every cursor change :(
… …
2048 2275
2049 unless (exists $self->{cur_h}) { 2276 unless (exists $self->{cur_h}) {
2050 my $text = substr $self->{text}, 0, $self->{cursor}; 2277 my $text = substr $self->{text}, 0, $self->{cursor};
2051 utf8::encode $text; 2278 utf8::encode $text;
2052 2279
2053 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2280 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2054 } 2281 }
2055 2282
2283 glColor_premultiply @{$self->{active_fg}};
2056 glBegin GL_LINES; 2284 glBegin GL_LINES;
2057 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2285 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2286 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2059 glEnd; 2287 glEnd;
2060 }
2061}
2062 2288
2289 glLineWidth 3;
2290 glColor @{$self->{active_outline}};
2291 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2292 glLineWidth 1;
2293
2294 } else {
2295 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2296 glBegin GL_LINE_STRIP;
2297 glVertex .5, $self->{h} * .5;
2298 glVertex .5, $self->{h} - 2.5;
2299 glVertex $self->{w} - .5, $self->{h} - 2.5;
2300 glVertex $self->{w} - .5, $self->{h} * .5;
2301 glEnd;
2302 }
2303}
2304
2305#############################################################################
2306
2063package CFPlus::UI::Entry; 2307package DC::UI::Entry;
2064 2308
2065our @ISA = CFPlus::UI::EntryBase::; 2309our @ISA = DC::UI::EntryBase::;
2066 2310
2067use CFPlus::OpenGL; 2311use DC::OpenGL;
2312
2313sub new {
2314 my $class = shift;
2315
2316 $class->SUPER::new (
2317 history_pointer => -1,
2318 @_
2319 )
2320}
2321
2068 2322
2069sub invoke_key_down { 2323sub invoke_key_down {
2070 my ($self, $ev) = @_; 2324 my ($self, $ev) = @_;
2071 2325
2072 my $sym = $ev->{sym}; 2326 my $sym = $ev->{sym};
2073 2327
2074 if ($sym == 13) { 2328 if ($ev->{uni} == 0x0d || $sym == 13) {
2075 unshift @{$self->{history}}, 2329 unshift @{$self->{history}},
2076 my $txt = $self->get_text; 2330 my $txt = $self->get_text;
2077 2331
2078 $self->{history_pointer} = -1; 2332 $self->{history_pointer} = -1;
2079 $self->{history_saveback} = ''; 2333 $self->{history_saveback} = '';
2080 $self->emit (activate => $txt); 2334 $self->emit (activate => $txt);
2081 $self->update; 2335 $self->update;
2082 2336
2083 } elsif ($sym == CFPlus::SDLK_UP) { 2337 } elsif ($sym == DC::SDLK_UP) {
2084 if ($self->{history_pointer} < 0) { 2338 if ($self->{history_pointer} < 0) {
2085 $self->{history_saveback} = $self->get_text; 2339 $self->{history_saveback} = $self->get_text;
2086 } 2340 }
2087 if (@{$self->{history} || []} > 0) { 2341 if (@{$self->{history} || []} > 0) {
2088 $self->{history_pointer}++; 2342 $self->{history_pointer}++;
… …
2090 $self->{history_pointer} = @{$self->{history} || []} - 1; 2344 $self->{history_pointer} = @{$self->{history} || []} - 1;
2091 } 2345 }
2092 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2346 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2093 } 2347 }
2094 2348
2095 } elsif ($sym == CFPlus::SDLK_DOWN) { 2349 } elsif ($sym == DC::SDLK_DOWN) {
2096 $self->{history_pointer}--; 2350 $self->{history_pointer}--;
2097 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2351 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2098 2352
2099 if ($self->{history_pointer} >= 0) { 2353 if ($self->{history_pointer} >= 0) {
2100 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2354 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2101 } else { 2355 } else {
2356 if (defined $self->{history_saveback}) {
2102 $self->set_text ($self->{history_saveback}); 2357 $self->set_text ($self->{history_saveback});
2358 $self->{history_saveback} = undef;
2359 }
2103 } 2360 }
2104 2361
2105 } else { 2362 } else {
2106 return $self->SUPER::invoke_key_down ($ev) 2363 return $self->SUPER::invoke_key_down ($ev)
2107 } 2364 }
… …
2109 1 2366 1
2110} 2367}
2111 2368
2112############################################################################# 2369#############################################################################
2113 2370
2114package CFPlus::UI::Button; 2371package DC::UI::TextEdit;
2115 2372
2116our @ISA = CFPlus::UI::Label::; 2373our @ISA = DC::UI::EntryBase::;
2117 2374
2118use CFPlus::OpenGL; 2375use DC::OpenGL;
2119
2120my @tex =
2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2122 qw(b1_button_active.png);
2123 2376
2124sub new { 2377sub new {
2125 my $class = shift; 2378 my $class = shift;
2126 2379
2127 $class->SUPER::new ( 2380 $class->SUPER::new (
2128 padding_x => 4,
2129 padding_y => 4, 2381 padding_y => 4,
2130 fg => [1, 1, 1], 2382
2131 active_fg => [0, 0, 1], 2383 @_
2384 )
2385}
2386
2387sub move_cursor_ver {
2388 my ($self, $dy) = @_;
2389
2390 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2391
2392 $line += $dy;
2393
2394 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2395 $self->{cursor} = $index;
2396 delete $self->{cur_h};
2397 $self->update;
2398 return;
2399 }
2400}
2401
2402sub invoke_key_down {
2403 my ($self, $ev) = @_;
2404
2405 my $sym = $ev->{sym};
2406
2407 if ($sym == DC::SDLK_UP) {
2408 $self->move_cursor_ver (-1);
2409 } elsif ($sym == DC::SDLK_DOWN) {
2410 $self->move_cursor_ver (+1);
2411 } else {
2412 return $self->SUPER::invoke_key_down ($ev)
2413 }
2414
2415 1
2416}
2417
2418#############################################################################
2419
2420package DC::UI::ButtonBin;
2421
2422our @ISA = DC::UI::Bin::;
2423
2424use DC::OpenGL;
2425
2426my @tex =
2427 map { new_from_resource DC::Texture $_, mipmap => 1 }
2428 qw(b1_button_inactive.png b1_button_active.png);
2429
2430sub new {
2431 my $class = shift;
2432
2433 $class->SUPER::new (
2132 can_hover => 1, 2434 can_hover => 1,
2133 align => 0, 2435 align => 0.5,
2134 valign => 0, 2436 valign => 0.5,
2135 can_events => 1, 2437 can_events => 1,
2136 @_ 2438 @_
2137 ) 2439 )
2138} 2440}
2139 2441
… …
2148} 2450}
2149 2451
2150sub _draw { 2452sub _draw {
2151 my ($self) = @_; 2453 my ($self) = @_;
2152 2454
2153 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2154
2155 glEnable GL_TEXTURE_2D; 2455 glEnable GL_TEXTURE_2D;
2156 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157 glColor 0, 0, 0, 1; 2457 glColor 0, 0, 0, 1;
2158 2458
2459 my $tex = $tex[$GRAB == $self];
2159 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2160 2461
2161 glDisable GL_TEXTURE_2D; 2462 glDisable GL_TEXTURE_2D;
2162 2463
2163 $self->SUPER::_draw; 2464 $self->SUPER::_draw;
2164} 2465}
2165 2466
2166############################################################################# 2467#############################################################################
2167 2468
2168package CFPlus::UI::CheckBox; 2469package DC::UI::Button;
2169 2470
2170our @ISA = CFPlus::UI::DrawBG::; 2471our @ISA = DC::UI::Label::;
2472
2473use DC::OpenGL;
2171 2474
2172my @tex = 2475my @tex =
2173 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2476 map { new_from_resource DC::Texture $_, mipmap => 1 }
2174 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2477 qw(b1_button_inactive.png b1_button_active.png);
2175
2176use CFPlus::OpenGL;
2177 2478
2178sub new { 2479sub new {
2179 my $class = shift; 2480 my $class = shift;
2180 2481
2181 $class->SUPER::new ( 2482 $class->SUPER::new (
2483 padding_x => 8,
2484 padding_y => 4,
2485 fg => [1.0, 1.0, 1.0],
2486 active_fg => [0.8, 0.8, 0.8],
2487 can_hover => 1,
2488 align => 0.5,
2489 valign => 0.5,
2490 can_events => 1,
2491 @_
2492 )
2493}
2494
2495sub invoke_button_up {
2496 my ($self, $ev, $x, $y) = @_;
2497
2498 $self->emit ("activate")
2499 if $x >= 0 && $x < $self->{w}
2500 && $y >= 0 && $y < $self->{h};
2501
2502 1
2503}
2504
2505sub _draw {
2506 my ($self) = @_;
2507
2508 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2509
2510 glEnable GL_TEXTURE_2D;
2511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2512 glColor 0, 0, 0, 1;
2513
2514 my $tex = $tex[$GRAB == $self];
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516
2517 glDisable GL_TEXTURE_2D;
2518
2519 $self->SUPER::_draw;
2520}
2521
2522#############################################################################
2523
2524package DC::UI::CheckBox;
2525
2526our @ISA = DC::UI::DrawBG::;
2527
2528my @tex =
2529 map { new_from_resource DC::Texture $_, mipmap => 1 }
2530 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2531
2532use DC::OpenGL;
2533
2534sub new {
2535 my $class = shift;
2536
2537 $class->SUPER::new (
2538 fontsize => 1,
2182 padding_x => 2, 2539 padding_x => 2,
2183 padding_y => 2, 2540 padding_y => 2,
2184 fg => [1, 1, 1], 2541 fg => [1, 1, 1],
2185 active_fg => [1, 1, 0], 2542 active_fg => [1, 1, 0],
2186 bg => [0, 0, 0, 0.2], 2543 bg => [0, 0, 0, 0.2],
… …
2192} 2549}
2193 2550
2194sub size_request { 2551sub size_request {
2195 my ($self) = @_; 2552 my ($self) = @_;
2196 2553
2197 (6) x 2 2554 ($self->{fontsize} * $::FONTSIZE) x 2
2198} 2555}
2199 2556
2200sub toggle { 2557sub toggle {
2201 my ($self) = @_; 2558 my ($self) = @_;
2202 2559
… …
2221sub _draw { 2578sub _draw {
2222 my ($self) = @_; 2579 my ($self) = @_;
2223 2580
2224 $self->SUPER::_draw; 2581 $self->SUPER::_draw;
2225 2582
2226 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2583 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2227 2584
2228 my ($w, $h) = @$self{qw(w h)}; 2585 my ($w, $h) = @$self{qw(w h)};
2229 2586
2230 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2587 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2231 2588
… …
2238 glDisable GL_TEXTURE_2D; 2595 glDisable GL_TEXTURE_2D;
2239} 2596}
2240 2597
2241############################################################################# 2598#############################################################################
2242 2599
2243package CFPlus::UI::Image; 2600package DC::UI::Image;
2244 2601
2245our @ISA = CFPlus::UI::Base::; 2602our @ISA = DC::UI::DrawBG::;
2246 2603
2247use CFPlus::OpenGL; 2604use DC::OpenGL;
2248 2605
2249our %texture_cache; 2606our %texture_cache;
2250 2607
2251sub new { 2608sub new {
2252 my $class = shift; 2609 my $class = shift;
2253 2610
2254 my $self = $class->SUPER::new ( 2611 my $self = $class->SUPER::new (
2255 can_events => 0, 2612 can_events => 0,
2613 scale => 1,
2256 @_, 2614 @_,
2257 ); 2615 );
2258 2616
2259 $self->{path} || $self->{tex} 2617 $self->{path} || $self->{tex}
2260 or Carp::croak "'path' or 'tex' attributes required"; 2618 or Carp::croak "'path' or 'tex' attributes required";
2261 2619
2262 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2620 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2621 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2264 2622
2265 Scalar::Util::weaken $texture_cache{$self->{path}}; 2623 DC::weaken $texture_cache{$self->{path}};
2266 2624
2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2625 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268 2626
2269 $self 2627 $self
2270} 2628}
2271 2629
2272sub STORABLE_freeze { 2630sub STORABLE_freeze {
2273 my ($self, $cloning) = @_; 2631 my ($self, $cloning) = @_;
2274 2632
2275 $self->{path} 2633 $self->{path}
2276 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2634 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2277 2635
2278 $self->{path} 2636 $self->{path}
2279} 2637}
2280 2638
2281sub STORABLE_attach { 2639sub STORABLE_attach {
2282 my ($self, $cloning, $path) = @_; 2640 my ($self, $cloning, $path) = @_;
2283 2641
2284 $self->new (path => $path) 2642 $self->new (path => $path)
2285} 2643}
2286 2644
2645sub set_texture {
2646 my ($self, $tex) = @_;
2647
2648 $self->{tex} = $tex;
2649 $self->update;
2650}
2651
2287sub size_request { 2652sub size_request {
2288 my ($self) = @_; 2653 my ($self) = @_;
2289 2654
2290 ($self->{tex}{w}, $self->{tex}{h}) 2655 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2291} 2656}
2292 2657
2293sub _draw { 2658sub _draw {
2294 my ($self) = @_; 2659 my ($self) = @_;
2660
2661 $self->SUPER::_draw;
2295 2662
2296 my $tex = $self->{tex}; 2663 my $tex = $self->{tex};
2297 2664
2298 my ($w, $h) = ($self->{w}, $self->{h}); 2665 my ($w, $h) = ($self->{w}, $self->{h});
2299 2666
… …
2305 } 2672 }
2306 2673
2307 glEnable GL_TEXTURE_2D; 2674 glEnable GL_TEXTURE_2D;
2308 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2309 2676
2310 $tex->draw_quad (0, 0, $w, $h); 2677 $tex->draw_quad_alpha (0, 0, $w, $h);
2311 2678
2312 glDisable GL_TEXTURE_2D; 2679 glDisable GL_TEXTURE_2D;
2313} 2680}
2314 2681
2315############################################################################# 2682#############################################################################
2316 2683
2317package CFPlus::UI::ImageButton; 2684package DC::UI::ImageButton;
2318 2685
2319our @ISA = CFPlus::UI::Image::; 2686our @ISA = DC::UI::Image::;
2320 2687
2321use CFPlus::OpenGL; 2688use DC::OpenGL;
2322
2323my %textures;
2324 2689
2325sub new { 2690sub new {
2326 my $class = shift; 2691 my $class = shift;
2327 2692
2328 my $self = $class->SUPER::new ( 2693 my $self = $class->SUPER::new (
2329 padding_x => 4, 2694 padding_x => 4,
2330 padding_y => 4, 2695 padding_y => 4,
2331 fg => [1, 1, 1], 2696 fg => [1, 1, 1],
2332 active_fg => [0, 0, 1], 2697 active_fg => [0, 0, 1],
2333 can_hover => 1, 2698 can_hover => 1,
2334 align => 0, 2699 align => 0.5,
2335 valign => 0, 2700 valign => 0.5,
2336 can_events => 1, 2701 can_events => 1,
2337 @_ 2702 @_
2338 ); 2703 );
2339} 2704}
2340 2705
2706sub invoke_button_down {
2707 my ($self, $ev, $x, $y) = @_;
2708
2709 1
2710}
2711
2341sub invoke_button_up { 2712sub invoke_button_up {
2342 my ($self, $ev, $x, $y) = @_; 2713 my ($self, $ev, $x, $y) = @_;
2343 2714
2344 $self->emit ("activate") 2715 $self->emit ("activate")
2345 if $x >= 0 && $x < $self->{w} 2716 if $x >= 0 && $x < $self->{w}
… …
2348 1 2719 1
2349} 2720}
2350 2721
2351############################################################################# 2722#############################################################################
2352 2723
2353package CFPlus::UI::VGauge; 2724package DC::UI::VGauge;
2354 2725
2355our @ISA = CFPlus::UI::Base::; 2726our @ISA = DC::UI::Base::;
2356 2727
2357use List::Util qw(min max); 2728use List::Util qw(min max);
2358 2729
2359use CFPlus::OpenGL; 2730use DC::OpenGL;
2360 2731
2361my %tex = ( 2732my %tex = (
2362 food => [ 2733 food => [
2363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2734 map { new_from_resource DC::Texture $_, mipmap => 1 }
2364 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2735 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2365 ], 2736 ],
2366 grace => [ 2737 grace => [
2367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2738 map { new_from_resource DC::Texture $_, mipmap => 1 }
2368 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2739 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2369 ], 2740 ],
2370 hp => [ 2741 hp => [
2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2742 map { new_from_resource DC::Texture $_, mipmap => 1 }
2372 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2743 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2373 ], 2744 ],
2374 mana => [ 2745 mana => [
2375 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2746 map { new_from_resource DC::Texture $_, mipmap => 1 }
2376 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2747 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2377 ], 2748 ],
2378); 2749);
2379 2750
2380# eg. VGauge->new (gauge => 'food'), default gauge: food 2751# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2483 glDisable GL_TEXTURE_2D; 2854 glDisable GL_TEXTURE_2D;
2484} 2855}
2485 2856
2486############################################################################# 2857#############################################################################
2487 2858
2859package DC::UI::Progress;
2860
2861our @ISA = DC::UI::Label::;
2862
2863use DC::OpenGL;
2864
2865sub new {
2866 my ($class, %arg) = @_;
2867
2868 my $self = $class->SUPER::new (
2869 padding_x => 2,
2870 padding_y => 2,
2871 fg => [1, 1, 1],
2872 bg => [0, 0, 1, 0.2],
2873 bar => [0.7, 0.5, 0.1, 0.8],
2874 outline => [0.4, 0.3, 0],
2875 fontsize => 0.9,
2876 valign => 0.5,
2877 align => 0.5,
2878 can_events => 1,
2879 ellipsise => 1,
2880 label => "%d%%",
2881 %arg,
2882 );
2883
2884 $self->set_value ($arg{value} || -1);
2885
2886 $self
2887}
2888
2889sub set_label {
2890 my ($self, $label) = @_;
2891
2892 return if $self->{label} eq $label;
2893 $self->{label} = $label;
2894
2895 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2896}
2897
2898sub set_value {
2899 my ($self, $value) = @_;
2900
2901 if ($self->{value} ne $value) {
2902 $self->{value} = $value;
2903
2904 if ($value < 0) {
2905 $self->set_text ("-");
2906 } else {
2907 $self->set_text (sprintf $self->{label}, $value * 100);
2908 }
2909
2910 $self->update;
2911 }
2912}
2913
2914sub _draw {
2915 my ($self) = @_;
2916
2917 glEnable GL_BLEND;
2918 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2919
2920 my $px = $self->{padding_x};
2921 my $py = $self->{padding_y};
2922
2923 if ($self->{value} >= 0) {
2924 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2925
2926 glColor_premultiply @{$self->{bar}};
2927 glRect $px, $py, $s, $self->{h} - $py;
2928 glColor_premultiply @{$self->{bg}};
2929 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2930 }
2931
2932 glColor_premultiply @{$self->{outline}};
2933
2934 $px -= .5;
2935 $py -= .5;
2936
2937 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2938
2939 glDisable GL_BLEND;
2940
2941 {
2942 local $self->{bg}; # do not draw background
2943 $self->SUPER::_draw;
2944 }
2945}
2946
2947#############################################################################
2948
2949package DC::UI::ExperienceProgress;
2950
2951our @ISA = DC::UI::Progress::;
2952
2953sub new {
2954 my ($class, %arg) = @_;
2955
2956 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2957
2958 my $self = $class->SUPER::new (
2959 %arg,
2960 tooltip => sub {
2961 my ($self) = @_;
2962
2963 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2964 $tt,
2965 $self->{lvl},
2966 ::formsep ($self->{exp}),
2967 ::formsep ($self->{nxt}),
2968 ::formsep ($self->{nxt} - $self->{exp}),
2969 $self->_percent * 100,
2970 },
2971 );
2972
2973 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2974 if $::CONN;
2975
2976 $self
2977}
2978
2979sub DESTROY {
2980 my ($self) = @_;
2981
2982 delete $::CONN->{on_exp_update}{$self+0}
2983 if $::CONN;
2984
2985 $self->SUPER::DESTROY;
2986}
2987
2988sub _percent {
2989 my ($self) = @_;
2990
2991 my $table = $::CONN && $::CONN->{exp_table}
2992 or return -1;
2993
2994 my $l0 = $table->[$self->{lvl} - 1];
2995 my $l1 = $table->[$self->{lvl}];
2996
2997 $self->{nxt} = $l1;
2998
2999 ($self->{exp} - $l0) / ($l1 - $l0)
3000}
3001
3002sub set_value {
3003 my ($self, $lvl, $exp) = @_;
3004
3005 $self->{lvl} = $lvl;
3006 $self->{exp} = $exp;
3007
3008 $self->SUPER::set_value ($self->_percent);
3009}
3010
3011#############################################################################
3012
2488package CFPlus::UI::Gauge; 3013package DC::UI::Gauge;
2489 3014
2490our @ISA = CFPlus::UI::VBox::; 3015our @ISA = DC::UI::VBox::;
2491 3016
2492sub new { 3017sub new {
2493 my ($class, %arg) = @_; 3018 my ($class, %arg) = @_;
2494 3019
2495 my $self = $class->SUPER::new ( 3020 my $self = $class->SUPER::new (
… …
2497 can_hover => 1, 3022 can_hover => 1,
2498 can_events => 1, 3023 can_events => 1,
2499 %arg, 3024 %arg,
2500 ); 3025 );
2501 3026
2502 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3027 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2503 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3028 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2504 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3029 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2505 3030
2506 $self 3031 $self
2507} 3032}
2508 3033
2509sub set_fontsize { 3034sub set_fontsize {
… …
2530 $self->{value}->set_text ($val); 3055 $self->{value}->set_text ($val);
2531} 3056}
2532 3057
2533############################################################################# 3058#############################################################################
2534 3059
2535package CFPlus::UI::Slider; 3060package DC::UI::Slider;
2536 3061
2537use strict; 3062use common::sense;
2538 3063
2539use CFPlus::OpenGL; 3064use DC::OpenGL;
2540 3065
2541our @ISA = CFPlus::UI::DrawBG::; 3066our @ISA = DC::UI::DrawBG::;
2542 3067
2543my @tex = 3068my @tex =
2544 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3069 map { new_from_resource DC::Texture $_ }
2545 qw(s1_slider.png s1_slider_bg.png); 3070 qw(s1_slider.png s1_slider_bg.png);
2546 3071
2547sub new { 3072sub new {
2548 my $class = shift; 3073 my $class = shift;
2549 3074
… …
2586sub set_value { 3111sub set_value {
2587 my ($self, $value) = @_; 3112 my ($self, $value) = @_;
2588 3113
2589 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3114 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2590 3115
2591 $hi = $lo + 1 if $hi <= $lo; 3116 $hi = $lo if $hi < $lo;
2592 3117
2593 $page = $hi - $lo if $page > $hi - $lo; 3118 $value = $hi - $page if $value > $hi - $page;
2594
2595 $value = $lo if $value < $lo; 3119 $value = $lo if $value < $lo;
2596 $value = $hi - $page if $value > $hi - $page;
2597 3120
2598 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3121 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2599 if $unit; 3122 if $unit;
2600 3123
2601 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3124 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2617 3140
2618 $self->SUPER::invoke_button_down ($ev, $x, $y); 3141 $self->SUPER::invoke_button_down ($ev, $x, $y);
2619 3142
2620 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3143 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2621 3144
2622 $self->invoke_mouse_motion ($ev, $x, $y) 3145 $self->invoke_mouse_motion ($ev, $x, $y);
3146
3147 1
2623} 3148}
2624 3149
2625sub invoke_mouse_motion { 3150sub invoke_mouse_motion {
2626 my ($self, $ev, $x, $y) = @_; 3151 my ($self, $ev, $x, $y) = @_;
2627 3152
2628 if ($GRAB == $self) { 3153 if ($GRAB == $self) {
2629 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3154 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2630 3155
2631 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3156 my (undef, $lo, $hi, $page) = @{$self->{range}};
2632 3157
2633 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3158 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2634 3159
2635 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3160 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2636 } else { 3161 } else {
2637 return 0; 3162 return 0;
2638 } 3163 }
… …
2643sub invoke_mouse_wheel { 3168sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_; 3169 my ($self, $ev) = @_;
2645 3170
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3171 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647 3172
3173 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3174
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3175 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649 3176
2650 ! ! $delta 3177 1
2651} 3178}
2652 3179
2653sub update { 3180sub update {
2654 my ($self) = @_; 3181 my ($self) = @_;
2655 3182
… …
2661 my ($self) = @_; 3188 my ($self) = @_;
2662 3189
2663 unless ($self->{knob_w}) { 3190 unless ($self->{knob_w}) {
2664 $self->set_value ($self->{range}[0]); 3191 $self->set_value ($self->{range}[0]);
2665 3192
2666 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3193 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2667 my $range = ($hi - $page - $lo) || 1e-100; 3194 my $range = ($hi - $page - $lo) || 1e-10;
2668 3195
2669 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3196 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2670 3197
2671 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3198 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2672 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3199 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2673 3200
2674 $value = ($value - $lo) / $range; 3201 $value = ($value - $lo) / $range;
… …
2704 glDisable GL_TEXTURE_2D; 3231 glDisable GL_TEXTURE_2D;
2705} 3232}
2706 3233
2707############################################################################# 3234#############################################################################
2708 3235
2709package CFPlus::UI::ValSlider; 3236package DC::UI::ValSlider;
2710 3237
2711our @ISA = CFPlus::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
2712 3239
2713sub new { 3240sub new {
2714 my ($class, %arg) = @_; 3241 my ($class, %arg) = @_;
2715 3242
2716 my $range = delete $arg{range}; 3243 my $range = delete $arg{range};
2717 3244
2718 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
2719 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3246 slider => (new DC::UI::Slider expand => 1, range => $range),
2720 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3247 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2721 to_value => sub { shift }, 3248 to_value => sub { shift },
2722 from_value => sub { shift }, 3249 from_value => sub { shift },
2723 %arg, 3250 %arg,
2724 ); 3251 );
2725 3252
… …
2745sub set_range { shift->{slider}->set_range (@_) } 3272sub set_range { shift->{slider}->set_range (@_) }
2746sub set_value { shift->{slider}->set_value (@_) } 3273sub set_value { shift->{slider}->set_value (@_) }
2747 3274
2748############################################################################# 3275#############################################################################
2749 3276
2750package CFPlus::UI::TextScroller; 3277package DC::UI::TextScroller;
2751 3278
2752our @ISA = CFPlus::UI::HBox::; 3279our @ISA = DC::UI::HBox::;
2753 3280
2754use CFPlus::OpenGL; 3281use DC::OpenGL;
2755 3282
2756sub new { 3283sub new {
2757 my $class = shift; 3284 my $class = shift;
2758 3285
2759 my $self = $class->SUPER::new ( 3286 my $self = $class->SUPER::new (
… …
2761 can_events => 1, 3288 can_events => 1,
2762 indent => 0, 3289 indent => 0,
2763 #font => default_font 3290 #font => default_font
2764 @_, 3291 @_,
2765 3292
2766 layout => (new CFPlus::Layout), 3293 layout => (new DC::Layout),
2767 par => [], 3294 max_par => 0,
2768 height => 0, 3295 height => 0,
2769 children => [ 3296 children => [
2770 (new CFPlus::UI::Empty expand => 1), 3297 (new DC::UI::Empty expand => 1),
2771 (new CFPlus::UI::Slider vertical => 1), 3298 (new DC::UI::Slider vertical => 1),
2772 ], 3299 ],
2773 ); 3300 );
2774 3301
2775 $self->{children}[1]->connect (changed => sub { $self->update }); 3302 $self->{children}[1]->connect (changed => sub { $self->update });
2776 3303
3304 $self->add_paragraph (@{ delete $self->{par} }) if @{ $self->{par} };
3305
2777 $self 3306 $self
2778} 3307}
2779 3308
2780sub set_fontsize { 3309sub set_fontsize {
2781 my ($self, $fontsize) = @_; 3310 my ($self, $fontsize) = @_;
… …
2785} 3314}
2786 3315
2787sub size_request { 3316sub size_request {
2788 my ($self) = @_; 3317 my ($self) = @_;
2789 3318
2790 my ($empty, $slider) = @{ $self->{children} }; 3319 my ($empty, $slider) = $self->visible_children;
2791 3320
2792 local $self->{children} = [$empty, $slider]; 3321 local $self->{children} = [$empty, $slider];
2793 $self->SUPER::size_request 3322 $self->SUPER::size_request
2794} 3323}
2795 3324
… …
2832 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3361 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2833 $layout->set_markup ($para->{markup}); 3362 $layout->set_markup ($para->{markup});
2834 3363
2835 $layout->set_shapes ( 3364 $layout->set_shapes (
2836 map 3365 map
2837 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3366 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2838 @{$para->{widget}} 3367 @{$para->{widget}}
2839 ); 3368 );
2840 3369
2841 $layout 3370 $layout
2842} 3371}
… …
2897 3426
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3427 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para; 3428 push @{$self->{par}}, $para;
2900 } 3429 }
2901 3430
3431 if (my $max = $self->{max_par}) {
3432 shift @{$self->{par}} while @{$self->{par}} > $max;
3433 }
3434
2902 $self->{need_reflow}++; 3435 $self->{need_reflow}++;
2903 $self->update; 3436 $self->update;
2904} 3437}
2905 3438
2906sub scroll_to_bottom { 3439sub scroll_to_bottom {
… …
2955 $ROOT->on_post_alloc ($self => sub { 3488 $ROOT->on_post_alloc ($self => sub {
2956 $self->force_uptodate; 3489 $self->force_uptodate;
2957 3490
2958 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3491 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2959 3492
2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3493 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2961 glClearColor 0, 0, 0, 0; 3494 glClearColor 0, 0, 0, 0;
2962 glClear GL_COLOR_BUFFER_BIT; 3495 glClear GL_COLOR_BUFFER_BIT;
2963 3496
2964 package CFPlus::UI::Base; 3497 package DC::UI::Base;
2965 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3498 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2966 (0, 0, $self->{w}, $self->{h}); 3499 (0, 0, $self->{w}, $self->{h});
2967 3500
2968 my $top = int $self->{children}[1]{range}[0]; 3501 my $top = int $self->{children}[1]{range}[0];
2969 3502
… …
2980 3513
2981 if ($y0 < $y + $h && $y < $y1) { 3514 if ($y0 < $y + $h && $y < $y1) {
2982 my $layout = $self->get_layout ($para); 3515 my $layout = $self->get_layout ($para);
2983 3516
2984 $layout->render ($para->{indent}, $y - $y0); 3517 $layout->render ($para->{indent}, $y - $y0);
3518 $layout->draw;
2985 3519
2986 if (my @w = @{ $para->{widget} }) { 3520 if (my @w = @{ $para->{widget} }) {
2987 my @s = $layout->get_shapes; 3521 my @s = $layout->get_shapes;
2988 3522
2989 for (@w) { 3523 for (@w) {
… …
3027 $self->{children}[1]->draw; 3561 $self->{children}[1]->draw;
3028} 3562}
3029 3563
3030############################################################################# 3564#############################################################################
3031 3565
3032package CFPlus::UI::Animator; 3566package DC::UI::Animator;
3033 3567
3034use CFPlus::OpenGL; 3568use DC::OpenGL;
3035 3569
3036our @ISA = CFPlus::UI::Bin::; 3570our @ISA = DC::UI::Bin::;
3037 3571
3038sub moveto { 3572sub moveto {
3039 my ($self, $x, $y) = @_; 3573 my ($self, $x, $y) = @_;
3040 3574
3041 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3575 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3069 glPopMatrix; 3603 glPopMatrix;
3070} 3604}
3071 3605
3072############################################################################# 3606#############################################################################
3073 3607
3074package CFPlus::UI::Flopper; 3608package DC::UI::Flopper;
3075 3609
3076our @ISA = CFPlus::UI::Button::; 3610our @ISA = DC::UI::Button::;
3077 3611
3078sub new { 3612sub new {
3079 my $class = shift; 3613 my $class = shift;
3080 3614
3081 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
… …
3093 $self->{other}->toggle_visibility; 3627 $self->{other}->toggle_visibility;
3094} 3628}
3095 3629
3096############################################################################# 3630#############################################################################
3097 3631
3098package CFPlus::UI::Tooltip; 3632package DC::UI::Tooltip;
3099 3633
3100our @ISA = CFPlus::UI::Bin::; 3634our @ISA = DC::UI::Bin::;
3101 3635
3102use CFPlus::OpenGL; 3636use DC::OpenGL;
3103 3637
3104sub new { 3638sub new {
3105 my $class = shift; 3639 my $class = shift;
3106 3640
3107 $class->SUPER::new ( 3641 $class->SUPER::new (
3108 @_, 3642 @_,
3109 can_events => 0, 3643 can_events => 0,
3110 ) 3644 )
3111} 3645}
3112 3646
3647# expand, as good as possible
3648sub _expand_doclets {
3649 my ($tip) = @_;
3650
3651 $tip =~ s{#\(([^)]+)\)}{
3652 if ($::CONN) {
3653 exists $::CONN->{doclet}{$1}
3654 ? $::CONN->{doclet}{$1}
3655 : "(waiting for server to show full text)"
3656 } else {
3657 "(unable to show full text without server connection)"
3658 }
3659 }ge;
3660
3661 $tip =~ s/^\n+//;
3662 $tip =~ s/\n+$//;
3663
3664 $tip
3665}
3666
3667# expands a tooltip, potentially multiple times remotely
3668# and returns a guard. clals the clalback each time the text changes.
3669sub expand_tooltip {
3670 my ($tip, $cb) = @_;
3671
3672 # first expand #name tooltips from local pod
3673 $tip = DC::Pod::section_label tooltip => $1
3674 if $tip =~ /^#([^(].*)$/;
3675
3676 my $active; # true if any remote requests outstanding
3677
3678 if ($::CONN && $::CONN->{addme_success}) {
3679 # now find all doclet references
3680 for my $doclet ($tip =~ /#\(([^)]+)\)/g) {
3681 unless (exists $::CONN->{doclet}{$doclet}) {
3682 # need to ask the server
3683 # we don't try to avoid duplicate requests
3684
3685 $active = 1;
3686 $::CONN->send_exti_req (doclet => (split /\//, $doclet, 2), sub {
3687 $::CONN->{doclet}{$doclet} = DC::sanitise_cfxml $_[0];
3688 $cb->(_expand_doclets $tip) if $active;
3689 });
3690 }
3691 }
3692 }
3693
3694 $cb->(_expand_doclets $tip);
3695
3696 $active and Guard::guard { undef $active }
3697}
3698
3113sub set_tooltip_from { 3699sub set_tooltip_from {
3114 my ($self, $widget) = @_; 3700 my ($self, $widget) = @_;
3115 3701
3116 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3117 if $widget->{tooltip} =~ /^#(.*)$/;
3118
3119 my $tooltip = $widget->{tooltip}; 3702 my $tip = $widget->{tooltip};
3703 $tip = $tip->($widget) if "CODE" eq ref $tip;
3120 3704
3121 if ($ENV{CFPLUS_DEBUG} & 2) {
3122 $tooltip .= "\n\n" . (ref $widget) . "\n"
3123 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3124 . "req $widget->{req_w} $widget->{req_h}\n"
3125 . "visible $widget->{visible}";
3126 }
3127
3128 $tooltip =~ s/^\n+//;
3129 $tooltip =~ s/\n+$//;
3130
3131 $self->add (new CFPlus::UI::Label 3705 $self->add (new DC::UI::Label
3132 markup => $tooltip, 3706 fg => $DC::THEME{tooltip_fg},
3133 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3707 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3708 align => 0,
3134 fontsize => 0.8, 3709 fontsize => 0.8,
3135 style => 1, # FLAG_INVERSE 3710 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3136 ellipsise => 0, 3711 ellipsise => 0,
3137 font => ($widget->{tooltip_font} || $::FONT_PROP), 3712 font => ($widget->{tooltip_font} || $::FONT_PROP),
3138 ); 3713 );
3714
3715 $self->{tooltip_expand} = expand_tooltip $tip, sub {
3716 my ($tip) = @_;
3717
3718 if ($ENV{CFPLUS_DEBUG} & 2) {
3719 $tip .= "\n\n" . (ref $widget) . "\n"
3720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3721 . "req $widget->{req_w} $widget->{req_h}\n"
3722 . "visible $widget->{visible}";
3723 }
3724
3725 $self->{children}[0]->set_markup ($tip);
3726 };
3139} 3727}
3140 3728
3141sub size_request { 3729sub size_request {
3142 my ($self) = @_; 3730 my ($self) = @_;
3143 3731
… …
3175} 3763}
3176 3764
3177sub _draw { 3765sub _draw {
3178 my ($self) = @_; 3766 my ($self) = @_;
3179 3767
3180 glTranslate 0.375, 0.375;
3181
3182 my ($w, $h) = @$self{qw(w h)}; 3768 my ($w, $h) = @$self{qw(w h)};
3183 3769
3184 glColor 1, 0.8, 0.4; 3770 glColor @{ $DC::THEME{tooltip_bg} };
3185 glBegin GL_QUADS; 3771 glRect 0, 0, $w, $h;
3186 glVertex 0 , 0;
3187 glVertex 0 , $h;
3188 glVertex $w, $h;
3189 glVertex $w, 0;
3190 glEnd;
3191 3772
3192 glColor 0, 0, 0; 3773 glColor @{ $DC::THEME{tooltip_border} };
3193 glBegin GL_LINE_LOOP; 3774 glRect_lineloop .5, .5, $w + .5, $h + .5;
3194 glVertex 0 , 0;
3195 glVertex 0 , $h;
3196 glVertex $w, $h;
3197 glVertex $w, 0;
3198 glEnd;
3199 3775
3200 glTranslate 2 - 0.375, 2 - 0.375; 3776 glTranslate 2, 2;
3201 3777
3202 $self->SUPER::_draw; 3778 $self->SUPER::_draw;
3203} 3779}
3204 3780
3205############################################################################# 3781#############################################################################
3206 3782
3207package CFPlus::UI::Face; 3783package DC::UI::Face;
3208 3784
3209our @ISA = CFPlus::UI::DrawBG::; 3785our @ISA = DC::UI::DrawBG::;
3210 3786
3211use CFPlus::OpenGL; 3787use DC::OpenGL;
3212 3788
3213sub new { 3789sub new {
3214 my $class = shift; 3790 my $class = shift;
3215 3791
3216 my $self = $class->SUPER::new ( 3792 my $self = $class->SUPER::new (
3793 size_w => 32,
3794 size_h => 8,
3217 aspect => 1, 3795 aspect => 1,
3218 can_events => 0, 3796 can_events => 0,
3219 @_, 3797 @_,
3220 ); 3798 );
3221 3799
3222 if ($self->{anim} && $self->{animspeed}) { 3800 $self->update_anim;
3223 Scalar::Util::weaken (my $widget = $self);
3224
3225 $self->{timer} = Event->timer (
3226 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3227 hard => 1,
3228 interval => $self->{animspeed},
3229 cb => sub {
3230 ++$widget->{frame};
3231 $widget->update;
3232 },
3233 );
3234 }
3235 3801
3236 $self 3802 $self
3237} 3803}
3238 3804
3805sub update_timer {
3806 my ($self) = @_;
3807
3808 return unless $self->{timer};
3809
3810 if ($self->{visible}) {
3811 $self->{timer}->start;
3812 } else {
3813 $self->{timer}->stop;
3814 }
3815}
3816
3817sub update_face {
3818 my ($self) = @_;
3819
3820 if ($::CONN) {
3821 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3822 if ($anim && @$anim) {
3823 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3824 delete $self->{face_change_cb};
3825
3826 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3827 unless ($tex->{name} || $tex->{loading}) {
3828 $tex->upload (sub { $self->reconfigure });
3829 }
3830 }
3831 }
3832 }
3833 }
3834}
3835
3836sub update_anim {
3837 my ($self) = @_;
3838
3839 if ($self->{anim} && $self->{animspeed}) {
3840 DC::weaken (my $widget = $self);
3841
3842 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3843 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3844 return unless $::CONN;
3845
3846 my $w = $widget
3847 or return;
3848
3849 ++$w->{frame};
3850 $w->update_face;
3851
3852 # somehow, $widget can go away
3853 $w->update;
3854 $w->update_timer;
3855 };
3856
3857 $self->update_face;
3858 $self->update_timer;
3859 } else {
3860 delete $self->{timer};
3861 }
3862}
3863
3239sub size_request { 3864sub size_request {
3240 (32, 8) 3865 my ($self) = @_;
3866
3867 if ($::CONN) {
3868 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3869 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3870 if ($tex->{name}) {
3871 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3872 } elsif (!$tex->{loading}) {
3873 $tex->upload (sub { $self->reconfigure });
3874 }
3875 }
3876
3877 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3878 }
3879 }
3880
3881 ($self->{size_w} || 8, $self->{size_h} || 8)
3241} 3882}
3242 3883
3243sub update { 3884sub update {
3244 my ($self) = @_; 3885 my ($self) = @_;
3245 3886
3246 return unless $self->{visible}; 3887 return unless $self->{visible};
3247 3888
3248 $self->SUPER::update; 3889 $self->SUPER::update;
3249} 3890}
3250 3891
3892sub set_face {
3893 my ($self, $face) = @_;
3894
3895 $self->{face} = $face;
3896 $self->reconfigure;
3897}
3898
3899sub set_anim {
3900 my ($self, $anim) = @_;
3901
3902 $self->{anim} = $anim;
3903 $self->update_anim;
3904}
3905
3906sub set_animspeed {
3907 my ($self, $animspeed) = @_;
3908
3909 $self->{animspeed} = $animspeed;
3910 $self->update_anim;
3911}
3912
3913sub invoke_visibility_change {
3914 my ($self) = @_;
3915
3916 $self->update_timer;
3917
3918 0
3919}
3920
3251sub _draw { 3921sub _draw {
3252 my ($self) = @_; 3922 my ($self) = @_;
3253 3923
3254 return unless $::CONN;
3255
3256 $self->SUPER::_draw; 3924 $self->SUPER::_draw;
3257 3925
3258 my $face; 3926 if (my $tex = $self->{tex}) {
3259
3260 if ($self->{frame}) {
3261 my $anim = $::CONN->{anim}[$self->{anim}];
3262
3263 $face = $anim->[ $self->{frame} % @$anim ]
3264 if $anim && @$anim;
3265 }
3266
3267 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3268
3269 if ($tex) {
3270 glEnable GL_TEXTURE_2D; 3927 glEnable GL_TEXTURE_2D;
3271 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3928 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3272 glColor 0, 0, 0, 1; 3929 glColor 0, 0, 0, 1;
3273 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3930 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3274 glDisable GL_TEXTURE_2D; 3931 glDisable GL_TEXTURE_2D;
… …
3276} 3933}
3277 3934
3278sub destroy { 3935sub destroy {
3279 my ($self) = @_; 3936 my ($self) = @_;
3280 3937
3281 $self->{timer}->cancel 3938 (delete $self->{timer})->cancel
3282 if $self->{timer}; 3939 if $self->{timer};
3283 3940
3284 $self->SUPER::destroy; 3941 $self->SUPER::destroy;
3285} 3942}
3286 3943
3287############################################################################# 3944#############################################################################
3288 3945
3289package CFPlus::UI::Buttonbar; 3946package DC::UI::Buttonbar;
3290 3947
3291our @ISA = CFPlus::UI::HBox::; 3948our @ISA = DC::UI::HBox::;
3292 3949
3293# TODO: should actually wrap buttons and other goodies. 3950# TODO: should actually wrap buttons and other goodies.
3294 3951
3295############################################################################# 3952#############################################################################
3296 3953
3297package CFPlus::UI::Menu; 3954package DC::UI::Menu;
3298 3955
3299our @ISA = CFPlus::UI::Toplevel::; 3956our @ISA = DC::UI::Toplevel::;
3300 3957
3301use CFPlus::OpenGL; 3958use DC::OpenGL;
3302 3959
3303sub new { 3960sub new {
3304 my $class = shift; 3961 my $class = shift;
3305 3962
3306 my $self = $class->SUPER::new ( 3963 my $self = $class->SUPER::new (
3307 items => [], 3964 items => [],
3308 z => 100, 3965 z => 100,
3309 @_, 3966 @_,
3310 ); 3967 );
3311 3968
3312 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3969 $self->add ($self->{vbox} = new DC::UI::VBox);
3313 3970
3314 for my $item (@{ $self->{items} }) { 3971 for my $item (@{ $self->{items} }) {
3315 my ($widget, $cb, $tooltip) = @$item; 3972 my ($widget, $cb, $tooltip) = @$item;
3316 3973
3317 # handle various types of items, only text for now 3974 # handle various types of items, only text for now
3318 if (!ref $widget) { 3975 if (!ref $widget) {
3319 if ($widget =~ /\t/) { 3976 if ($widget =~ /\t/) {
3320 my ($left, $right) = split /\t/, $widget, 2; 3977 my ($left, $right) = split /\t/, $widget, 2;
3321 3978
3322 $widget = new CFPlus::UI::HBox 3979 $widget = new DC::UI::HBox
3323 can_hover => 1, 3980 can_hover => 1,
3324 can_events => 1, 3981 can_events => 1,
3325 tooltip => $tooltip, 3982 tooltip => $tooltip,
3326 children => [ 3983 children => [
3327 (new CFPlus::UI::Label markup => $left, expand => 1), 3984 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3328 (new CFPlus::UI::Label markup => $right, align => +1), 3985 (new DC::UI::Label markup => $right, align => 1),
3329 ], 3986 ],
3330 ; 3987 ;
3331 3988
3332 } else { 3989 } else {
3333 $widget = new CFPlus::UI::Label 3990 $widget = new DC::UI::Label
3334 can_hover => 1, 3991 can_hover => 1,
3335 can_events => 1, 3992 can_events => 1,
3993 align => 0,
3336 markup => $widget, 3994 markup => $widget,
3337 tooltip => $tooltip; 3995 tooltip => $tooltip;
3338 } 3996 }
3339 } 3997 }
3340 3998
… …
3355 # maybe save $GRAB? must be careful about events... 4013 # maybe save $GRAB? must be careful about events...
3356 $GRAB = $self; 4014 $GRAB = $self;
3357 $self->{button} = $ev->{button}; 4015 $self->{button} = $ev->{button};
3358 4016
3359 $self->show; 4017 $self->show;
3360 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 4018
4019 my $x = $ev->{x};
4020 my $y = $ev->{y};
4021
4022 $self->{root}->on_post_alloc ($self => sub {
4023 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
4024 });
4025
4026 1 # so it can be used inside event handlers
3361} 4027}
3362 4028
3363sub invoke_mouse_motion { 4029sub invoke_mouse_motion {
3364 my ($self, $ev, $x, $y) = @_; 4030 my ($self, $ev, $x, $y) = @_;
3365 4031
… …
3386 1 4052 1
3387} 4053}
3388 4054
3389############################################################################# 4055#############################################################################
3390 4056
3391package CFPlus::UI::Multiplexer; 4057package DC::UI::Multiplexer;
3392 4058
3393our @ISA = CFPlus::UI::Container::; 4059our @ISA = DC::UI::Container::;
3394 4060
3395sub new { 4061sub new {
3396 my $class = shift; 4062 my $class = shift;
3397 4063
3398 my $self = $class->SUPER::new ( 4064 my $self = $class->SUPER::new (
3399 @_, 4065 @_,
3400 ); 4066 );
3401 4067
3402 $self->{current} = $self->{children}[0] 4068 $self->set_current_page (0);
3403 if @{ $self->{children} };
3404 4069
3405 $self 4070 $self
3406} 4071}
3407 4072
3408sub add { 4073sub add {
3409 my ($self, @widgets) = @_; 4074 my ($self, @widgets) = @_;
3410 4075
3411 $self->SUPER::add (@widgets); 4076 $self->SUPER::add (@widgets);
3412 4077
3413 $self->{current} = $self->{children}[0] 4078 $self->set_current_page (0)
3414 if @{ $self->{children} }; 4079 if @widgets == @{ $self->{children} };
3415} 4080}
3416 4081
3417sub get_current_page { 4082sub get_current_page {
3418 my ($self) = @_; 4083 my ($self) = @_;
3419 4084
… …
3425 4090
3426 my $widget = ref $page_or_widget 4091 my $widget = ref $page_or_widget
3427 ? $page_or_widget 4092 ? $page_or_widget
3428 : $self->{children}[$page_or_widget]; 4093 : $self->{children}[$page_or_widget];
3429 4094
4095 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4096
3430 $self->{current} = $widget; 4097 if (($self->{current} = $widget)) {
4098 $self->{current}->set_visible if $self->{current} && $self->{visible};
3431 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4099 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3432 4100
3433 $self->emit (page_changed => $self->{current}); 4101 $self->emit (page_changed => $self->{current});
4102 }
3434 4103
3435 $self->realloc; 4104 $self->realloc;
3436} 4105}
3437 4106
3438sub visible_children { 4107sub visible_children {
3439 $_[0]{current} 4108 $_[0]{current} || ()
3440} 4109}
3441 4110
3442sub size_request { 4111sub size_request {
3443 my ($self) = @_; 4112 my ($self) = @_;
3444 4113
4114 $self->{current}
3445 $self->{current}->size_request 4115 ? $self->{current}->size_request
4116 : (0, 0)
3446} 4117}
3447 4118
3448sub invoke_size_allocate { 4119sub invoke_size_allocate {
3449 my ($self, $w, $h) = @_; 4120 my ($self, $w, $h) = @_;
3450 4121
3451 $self->{current}->configure (0, 0, $w, $h); 4122 $self->{current}->configure (0, 0, $w, $h)
4123 if $self->{current};
3452 4124
3453 1 4125 1
3454} 4126}
3455 4127
3456sub _draw { 4128sub _draw {
3457 my ($self) = @_; 4129 my ($self) = @_;
3458 4130
3459 $self->{current}->draw; 4131 $self->{current}->draw
4132 if $self->{current};
3460} 4133}
3461 4134
3462############################################################################# 4135#############################################################################
3463 4136
3464package CFPlus::UI::Notebook; 4137package DC::UI::Notebook;
3465 4138
4139use DC::OpenGL;
4140
3466our @ISA = CFPlus::UI::VBox::; 4141our @ISA = DC::UI::VBox::;
3467 4142
3468sub new { 4143sub new {
3469 my $class = shift; 4144 my $class = shift;
3470 4145
3471 my $self = $class->SUPER::new ( 4146 my $self = $class->SUPER::new (
3472 buttonbar => (new CFPlus::UI::Buttonbar), 4147 buttonbar => (new DC::UI::Buttonbar),
3473 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4148 multiplexer => (new DC::UI::Multiplexer expand => 1),
4149 active_outline => [.7, .7, 0.2],
3474 # filter => # will be put between multiplexer and $self 4150 # filter => # will be put between multiplexer and $self
3475 @_, 4151 @_,
3476 ); 4152 );
3477 4153
3478 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4154 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3479 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4155 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3480 4156
4157 {
4158 Scalar::Util::weaken (my $wself = $self);
4159
4160 $self->{multiplexer}->connect (c_add => sub {
4161 my ($mplex, $widgets) = @_;
4162
4163 for my $child (@$widgets) {
4164 Scalar::Util::weaken $child;
4165 $child->{c_tab_} ||= do {
4166 my $tab =
4167 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4168 ? $child->{c_tab}
4169 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4170
4171 $tab->connect (activate => sub {
4172 $wself->set_current_page ($child);
4173 });
4174
4175 $tab
4176 };
4177
4178 $self->{buttonbar}->add ($child->{c_tab_});
4179 }
4180 });
4181
4182 $self->{multiplexer}->connect (c_remove => sub {
4183 my ($mplex, $widgets) = @_;
4184
4185 for my $child (@$widgets) {
4186 $wself->{buttonbar}->remove ($child->{c_tab_});
4187 }
4188 });
4189 }
4190
3481 $self 4191 $self
3482} 4192}
3483 4193
3484sub add { 4194sub add {
4195 my ($self, @widgets) = @_;
4196
4197 $self->{multiplexer}->add (@widgets)
4198}
4199
4200sub remove {
4201 my ($self, @widgets) = @_;
4202
4203 $self->{multiplexer}->remove (@widgets)
4204}
4205
4206sub pages {
4207 my ($self) = @_;
4208 $self->{multiplexer}->children
4209}
4210
4211sub page_index {
4212 my ($self, $widget) = @_;
4213
4214 my $i = 0;
4215 for ($self->pages) {
4216 if ($_ eq $widget) { return $i };
4217 $i++;
4218 }
4219
4220 undef
4221}
4222
4223sub add_tab {
3485 my ($self, $title, $widget, $tooltip) = @_; 4224 my ($self, $title, $widget, $tooltip) = @_;
3486 4225
3487 Scalar::Util::weaken $self; 4226 $title = [$title, $tooltip] unless ref $title;
4227 $widget->{c_tab} = $title;
3488 4228
3489 $self->{buttonbar}->add (new CFPlus::UI::Button
3490 markup => $title,
3491 tooltip => $tooltip,
3492 on_activate => sub { $self->set_current_page ($widget) },
3493 );
3494
3495 $self->{multiplexer}->add ($widget); 4229 $self->add ($widget);
3496} 4230}
3497 4231
3498sub get_current_page { 4232sub get_current_page {
3499 my ($self) = @_; 4233 my ($self) = @_;
3500 4234
… …
3506 4240
3507 $self->{multiplexer}->set_current_page ($page); 4241 $self->{multiplexer}->set_current_page ($page);
3508 $self->emit (page_changed => $self->{multiplexer}{current}); 4242 $self->emit (page_changed => $self->{multiplexer}{current});
3509} 4243}
3510 4244
4245sub _draw {
4246 my ($self) = @_;
4247
4248 $self->SUPER::_draw ();
4249
4250 if (my $cur = $self->{multiplexer}{current}) {
4251 if ($cur = $cur->{c_tab_}) {
4252 glTranslate $self->{buttonbar}{x} + $cur->{x},
4253 $self->{buttonbar}{y} + $cur->{y};
4254 glLineWidth 3;
4255 #glEnable GL_BLEND;
4256 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4257 glColor @{$self->{active_outline}};
4258 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4259 glLineWidth 1;
4260 #glDisable GL_BLEND;
4261 }
4262 }
4263}
4264
3511############################################################################# 4265#############################################################################
3512 4266
3513package CFPlus::UI::Selector; 4267package DC::UI::Selector;
3514 4268
3515use utf8; 4269use utf8;
3516 4270
3517our @ISA = CFPlus::UI::Button::; 4271our @ISA = DC::UI::Button::;
3518 4272
3519sub new { 4273sub new {
3520 my $class = shift; 4274 my $class = shift;
3521 4275
3522 my $self = $class->SUPER::new ( 4276 my $self = $class->SUPER::new (
… …
3539 my ($value, $title, $tooltip) = @$_; 4293 my ($value, $title, $tooltip) = @$_;
3540 4294
3541 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4295 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3542 } 4296 }
3543 4297
3544 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4298 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3545} 4299}
3546 4300
3547sub _set_value { 4301sub _set_value {
3548 my ($self, $value) = @_; 4302 my ($self, $value) = @_;
3549 4303
3550 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4304 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4305 $item ||= $self->{options}[0]
3551 or return; 4306 or return;
3552 4307
3553 $self->{value} = $item->[0]; 4308 $self->{value} = $item->[0];
3554 $self->set_markup ("$item->[1] ⇓"); 4309 $self->set_markup ("$item->[1] ⇓");
3555 $self->set_tooltip ($item->[2]); 4310# $self->set_tooltip ($item->[2]);
3556} 4311}
3557 4312
3558sub set_value { 4313sub set_value {
3559 my ($self, $value) = @_; 4314 my ($self, $value) = @_;
3560 4315
… …
3562 4317
3563 $self->_set_value ($value); 4318 $self->_set_value ($value);
3564 $self->emit (changed => $value); 4319 $self->emit (changed => $value);
3565} 4320}
3566 4321
4322sub set_options {
4323 my ($self, $options) = @_;
4324
4325 $self->{options} = $options;
4326 $self->_set_value ($self->{value});
4327}
4328
3567############################################################################# 4329#############################################################################
3568 4330
3569package CFPlus::UI::Statusbox; 4331package DC::UI::Statusbox;
3570 4332
3571our @ISA = CFPlus::UI::VBox::; 4333our @ISA = DC::UI::VBox::;
3572 4334
3573sub new { 4335sub new {
3574 my $class = shift; 4336 my $class = shift;
3575 4337
3576 my $self = $class->SUPER::new ( 4338 my $self = $class->SUPER::new (
3577 fontsize => 0.8, 4339 fontsize => 0.8,
3578 @_, 4340 @_,
3579 ); 4341 );
3580 4342
3581 Scalar::Util::weaken (my $this = $self); 4343 DC::weaken (my $this = $self);
3582 4344
3583 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4345 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3584 4346
3585 $self 4347 $self
3586} 4348}
3587 4349
3588sub reorder { 4350sub reorder {
3589 my ($self) = @_; 4351 my ($self) = @_;
3590 my $NOW = Time::HiRes::time; 4352 my $NOW = AE::time;
3591 4353
3592 # freeze display when hovering over any label 4354 # freeze display when hovering over any label
3593 return if $CFPlus::UI::TOOLTIP->{owner} 4355 return if $DC::UI::TOOLTIP->{owner}
3594 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4356 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3595 values %{ $self->{item} }; 4357 values %{ $self->{item} };
3596 4358
3597 while (my ($k, $v) = each %{ $self->{item} }) { 4359 while (my ($k, $v) = each %{ $self->{item} }) {
3598 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4360 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3599 } 4361 }
4362
4363 $self->{timer}->set (1, 1);
3600 4364
3601 my @widgets; 4365 my @widgets;
3602 4366
3603 my @items = sort { 4367 my @items = sort {
3604 $a->{pri} <=> $b->{pri} 4368 $a->{pri} <=> $b->{pri}
3605 or $b->{id} <=> $a->{id} 4369 or $b->{id} <=> $a->{id}
3606 } values %{ $self->{item} }; 4370 } values %{ $self->{item} };
3607
3608 $self->{timer}->interval (1);
3609 4371
3610 my $count = 10 + 1; 4372 my $count = 10 + 1;
3611 for my $item (@items) { 4373 for my $item (@items) {
3612 last unless --$count; 4374 last unless --$count;
3613 4375
… …
3620 for ($short) { 4382 for ($short) {
3621 s/^\s+//; 4383 s/^\s+//;
3622 s/\s+/ /g; 4384 s/\s+/ /g;
3623 } 4385 }
3624 4386
3625 new CFPlus::UI::Label 4387 new DC::UI::Label
3626 markup => $short, 4388 markup => $short,
3627 tooltip => $item->{tooltip}, 4389 tooltip => $item->{tooltip},
3628 tooltip_font => $::FONT_PROP, 4390 tooltip_font => $::FONT_PROP,
3629 tooltip_width => 0.67, 4391 tooltip_width => 0.67,
3630 fontsize => $item->{fontsize} || $self->{fontsize}, 4392 fontsize => $item->{fontsize} || $self->{fontsize},
3631 max_w => $::WIDTH * 0.44, 4393 max_w => $::WIDTH * 0.44,
4394 align => 0,
3632 fg => [@{ $item->{fg} }], 4395 fg => [@{ $item->{fg} }],
3633 can_events => 1, 4396 can_events => 1,
3634 can_hover => 1 4397 can_hover => 1
3635 }; 4398 };
3636 4399
3637 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4400 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3638 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4401 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3639 $label->update; 4402 $label->update;
3640 $label->set_max_size (undef, $label->{req_h} * $diff) 4403 $label->set_max_size (undef, $label->{req_h} * $diff)
3641 if $diff < 1; 4404 if $diff < 1;
3642 $self->{timer}->interval (1/30); 4405 $self->{timer}->set (1/30, 1/30);
3643 } else { 4406 } else {
3644 $label->{fg}[3] = $item->{fg}[3] || 1; 4407 $label->{fg}[3] = $item->{fg}[3] || 1;
3645 } 4408 }
3646 4409
3647 push @widgets, $label; 4410 push @widgets, $label;
3648 } 4411 }
4412
4413 my $hash = join ",", @widgets;
4414 return if $hash eq $self->{last_widget_hash};
4415 $self->{last_widget_hash} = $hash;
3649 4416
3650 $self->clear; 4417 $self->clear;
3651 $self->SUPER::add (reverse @widgets); 4418 $self->SUPER::add (reverse @widgets);
3652} 4419}
3653 4420
… …
3689 $ROOT->on_refresh (reorder => sub { 4456 $ROOT->on_refresh (reorder => sub {
3690 $self->reorder; 4457 $self->reorder;
3691 }); 4458 });
3692} 4459}
3693 4460
4461sub clr_group {
4462 my ($self, $group) = @_;
4463
4464 if (delete $self->{item}{$group}) {
4465 $ROOT->on_refresh (reorder => sub {
4466 $self->reorder;
4467 });
4468 }
4469}
4470
3694sub reconfigure { 4471sub reconfigure {
3695 my ($self) = @_; 4472 my ($self) = @_;
3696 4473
3697 delete $_->{label} 4474 delete $_->{label}
3698 for values %{ $self->{item} || {} }; 4475 for values %{ $self->{item} || {} };
… …
3709 $self->SUPER::destroy; 4486 $self->SUPER::destroy;
3710} 4487}
3711 4488
3712############################################################################# 4489#############################################################################
3713 4490
3714package CFPlus::UI::Inventory;
3715
3716our @ISA = CFPlus::UI::Table::;
3717
3718sub new {
3719 my $class = shift;
3720
3721 my $self = $class->SUPER::new (
3722 col_expand => [0, 1, 0],
3723 items => [],
3724 @_,
3725 );
3726
3727 $self->set_sort_order (undef);
3728
3729 $self
3730}
3731
3732sub update_items {
3733 my ($self) = @_;
3734
3735 $self->clear;
3736
3737 my @item = $self->{sort}->(@{ $self->{items} });
3738
3739 my @adds;
3740 my $row = 0;
3741 for my $item ($self->{sort}->(@{ $self->{items} })) {
3742 CFPlus::Item::update_widgets $item;
3743
3744 push @adds, 0, $row, $item->{face_widget};
3745 push @adds, 1, $row, $item->{desc_widget};
3746 push @adds, 2, $row, $item->{weight_widget};
3747
3748 $row++;
3749 }
3750
3751 $self->add (@adds);
3752}
3753
3754sub set_sort_order {
3755 my ($self, $order) = @_;
3756
3757 $self->{sort} = $order ||= sub {
3758 sort {
3759 $a->{type} <=> $b->{type}
3760 or $a->{name} cmp $b->{name}
3761 } @_
3762 };
3763
3764 $self->update_items;
3765}
3766
3767sub set_items {
3768 my ($self, $items) = @_;
3769
3770 $self->{items} = [$items ? values %$items : ()];
3771 $self->update_items;
3772}
3773
3774#############################################################################
3775
3776package CFPlus::UI::SpellList;
3777
3778our @ISA = CFPlus::UI::Table::;
3779
3780sub new {
3781 my $class = shift;
3782
3783 my $self = $class->SUPER::new (
3784 binding => [],
3785 commands => [],
3786 @_,
3787 )
3788}
3789
3790my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3791
3792my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3793 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3794my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3795 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3796my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3797 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3798my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3799 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3800my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3801 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3802
3803sub rebuild_spell_list {
3804 my ($self) = @_;
3805
3806 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3807 $self->clear;
3808
3809 return unless $::CONN;
3810
3811 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3812 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3813 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3814 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3815 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3816
3817 my $row = 0;
3818
3819 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3820 my $spell = $self->{spell}{$_};
3821
3822 $row++;
3823
3824 my $spell_cb = sub {
3825 my ($widget, $ev) = @_;
3826
3827 if ($ev->{button} == 1) {
3828 $::CONN->user_send ("cast $spell->{name}");
3829 } elsif ($ev->{button} == 2) {
3830 $::CONN->user_send ("invoke $spell->{name}");
3831 } elsif ($ev->{button} == 3) {
3832 my $shortname = CFPlus::shorten $spell->{name}, 14;
3833 (new CFPlus::UI::Menu
3834 items => [
3835 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3836 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3837 ],
3838 )->popup ($ev);
3839 } else {
3840 return 0;
3841 }
3842
3843 1
3844 };
3845
3846 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3847
3848 #TODO: add path info to tooltip
3849 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3850
3851 $self->add (0, $row, new CFPlus::UI::Face
3852 face => $spell->{face},
3853 can_hover => 1,
3854 can_events => 1,
3855 tooltip => $tooltip,
3856 on_button_down => $spell_cb,
3857 );
3858
3859 $self->add (1, $row, new CFPlus::UI::Label
3860 expand => 1,
3861 text => $spell->{name},
3862 can_hover => 1,
3863 can_events => 1,
3864 tooltip => $tooltip,
3865 on_button_down => $spell_cb,
3866 );
3867
3868 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3869 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3870 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3871 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3872 }
3873 });
3874}
3875
3876sub add_spell {
3877 my ($self, $spell) = @_;
3878
3879 $self->{spell}->{$spell->{name}} = $spell;
3880 $self->rebuild_spell_list;
3881}
3882
3883sub remove_spell {
3884 my ($self, $spell) = @_;
3885
3886 delete $self->{spell}->{$spell->{name}};
3887 $self->rebuild_spell_list;
3888}
3889
3890sub clear_spells {
3891 my ($self) = @_;
3892
3893 $self->{spell} = {};
3894 $self->rebuild_spell_list;
3895}
3896
3897#############################################################################
3898
3899package CFPlus::UI::Root; 4491package DC::UI::Root;
3900 4492
3901our @ISA = CFPlus::UI::Container::; 4493our @ISA = DC::UI::Container::;
3902 4494
3903use List::Util qw(min max); 4495use List::Util qw(min max);
3904 4496
3905use CFPlus::OpenGL; 4497use DC::OpenGL;
3906 4498
3907sub new { 4499sub new {
3908 my $class = shift; 4500 my $class = shift;
3909 4501
3910 my $self = $class->SUPER::new ( 4502 my $self = $class->SUPER::new (
3911 visible => 1, 4503 visible => 1,
3912 @_, 4504 @_,
3913 ); 4505 );
3914 4506
3915 Scalar::Util::weaken ($self->{root} = $self); 4507 DC::weaken ($self->{root} = $self);
3916 4508
3917 $self 4509 $self
3918} 4510}
3919 4511
3920sub size_request { 4512sub size_request {
… …
3968} 4560}
3969 4561
3970sub update { 4562sub update {
3971 my ($self) = @_; 4563 my ($self) = @_;
3972 4564
3973 $::WANT_REFRESH++; 4565 $::WANT_REFRESH = 1;
3974} 4566}
3975 4567
3976sub add { 4568sub add {
3977 my ($self, @children) = @_; 4569 my ($self, @children) = @_;
3978 4570
… …
4015 while ($self->{refresh_hook}) { 4607 while ($self->{refresh_hook}) {
4016 $_->() 4608 $_->()
4017 for values %{delete $self->{refresh_hook}}; 4609 for values %{delete $self->{refresh_hook}};
4018 } 4610 }
4019 4611
4020 if ($self->{realloc}) { 4612 while ($self->{realloc}) {
4021 my %queue; 4613 my %queue;
4022 my @queue; 4614 my @queue;
4023 my $widget; 4615 my $widget;
4024 4616
4025 outer: 4617 outer:
… …
4045 4637
4046 delete $queue{$widget+0}; 4638 delete $queue{$widget+0};
4047 4639
4048 my ($w, $h) = $widget->size_request; 4640 my ($w, $h) = $widget->size_request;
4049 4641
4050 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4642 $w += $widget->{padding_x} * 2;
4051 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4643 $h += $widget->{padding_y} * 2;
4644
4645 $w = max $widget->{min_w}, $w;
4646 $h = max $widget->{min_h}, $h;
4052 4647
4053 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4648 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4054 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4649 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4055 4650
4056 $w = $widget->{force_w} if exists $widget->{force_w}; 4651 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4072 } 4667 }
4073 } 4668 }
4074 4669
4075 delete $self->{realloc}{$widget+0}; 4670 delete $self->{realloc}{$widget+0};
4076 } 4671 }
4077 }
4078 4672
4079 while (my $size_alloc = delete $self->{size_alloc}) { 4673 while (my $size_alloc = delete $self->{size_alloc}) {
4080 my @queue = sort { $b->{visible} <=> $a->{visible} } 4674 my @queue = sort { $a->{visible} <=> $b->{visible} }
4081 values %$size_alloc; 4675 values %$size_alloc;
4082 4676
4083 while () { 4677 while () {
4084 my $widget = pop @queue || last; 4678 my $widget = pop @queue || last;
4085 4679
4086 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4680 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4087 4681
4088 $w = 0 if $w < 0;
4089 $h = 0 if $h < 0;
4090
4091 $w = max $widget->{min_w}, $w; 4682 $w = max $widget->{min_w}, $w;
4092 $h = max $widget->{min_h}, $h; 4683 $h = max $widget->{min_h}, $h;
4093 4684
4094# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4685# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4095# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4686# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4096 4687
4097 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4688 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4098 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4689 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4099 4690
4100 $w = int $w + 0.5; 4691 $w = int $w + 0.5;
4101 $h = int $h + 0.5; 4692 $h = int $h + 0.5;
4102 4693
4103 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4694 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4104 $widget->{old_w} = $widget->{w}; 4695 $widget->{old_w} = $widget->{w};
4105 $widget->{old_h} = $widget->{h}; 4696 $widget->{old_h} = $widget->{h};
4106 4697
4107 $widget->{w} = $w; 4698 $widget->{w} = $w;
4108 $widget->{h} = $h; 4699 $widget->{h} = $h;
4109 4700
4110 $widget->emit (size_allocate => $w, $h); 4701 $widget->emit (size_allocate => $w, $h);
4702 }
4111 } 4703 }
4112 } 4704 }
4113 } 4705 }
4114 4706
4115 while ($self->{post_alloc_hook}) { 4707 while ($self->{post_alloc_hook}) {
4116 $_->() 4708 $_->()
4117 for values %{delete $self->{post_alloc_hook}}; 4709 for values %{delete $self->{post_alloc_hook}};
4118 } 4710 }
4119
4120 4711
4121 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4712 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4122 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4713 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4123 glClear GL_COLOR_BUFFER_BIT; 4714 glClear GL_COLOR_BUFFER_BIT;
4124 4715
… …
4127 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4718 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4128 glMatrixMode GL_MODELVIEW; 4719 glMatrixMode GL_MODELVIEW;
4129 glLoadIdentity; 4720 glLoadIdentity;
4130 4721
4131 { 4722 {
4132 package CFPlus::UI::Base; 4723 package DC::UI::Base;
4133 4724
4134 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4725 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4135 (0, 0, $self->{w}, $self->{h}); 4726 (0, 0, $self->{w}, $self->{h});
4136 4727
4137 $self->_draw; 4728 $self->_draw;
4138 } 4729 }
4139} 4730}
4140 4731
4141############################################################################# 4732#############################################################################
4142 4733
4143package CFPlus::UI; 4734package DC::UI;
4144 4735
4145$ROOT = new CFPlus::UI::Root; 4736$ROOT = new DC::UI::Root;
4146$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4737$TOOLTIP = new DC::UI::Tooltip z => 900;
4147 4738
41481 47391
4149

Diff Legend

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