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.331 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.481 by root, Tue Oct 12 05:11:38 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines