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.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.478 by root, Tue Dec 22 00:35:44 2009 UTC

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

Diff Legend

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