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.334 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.477 by root, Sun Jan 11 23:50:27 2009 UTC

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

Diff Legend

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