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

1package CFClient::UI; 1package DC::UI;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
6use Scalar::Util ();
7use List::Util (); 5use List::Util ();
8use Event;
9 6
10use CFClient; 7use Guard ();
8
9use DC;
10use DC::Pod;
11use CFClient::Texture; 11use DC::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
17our $TOOLTIP; 17our $TOOLTIP;
18our $BUTTON_STATE; 18our $BUTTON_STATE;
19 19
20our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21 21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
23 $_[0]->stop;
24
23 if (!$GRAB) { 25 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 26 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 27 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 28 if ($TOOLTIP->{owner} != $widget) {
29 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 30 $TOOLTIP->hide;
28 31
29 $TOOLTIP->{owner} = $widget; 32 $TOOLTIP->{owner} = $widget;
33 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 34
31 return if $ENV{CFPLUS_DEBUG} & 8; 35 return if $ENV{CFPLUS_DEBUG} & 8;
32 36
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show; 38 $TOOLTIP->show;
39 } 39 }
40 40
41 return; 41 return;
42 } 42 }
43 } 43 }
44 } 44 }
45 45
46 $TOOLTIP->hide; 46 $TOOLTIP->hide;
47 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 48 delete $TOOLTIP->{owner};
48}); 49};
49 50
50sub get_layout { 51sub get_layout {
51 my $layout; 52 my $layout;
52 53
53 for (grep { $_->{name} } values %WIDGET) { 54 for (grep { $_->{name} } values %WIDGET) {
… …
88 my $hover = $HOVER; $HOVER = $widget; 89 my $hover = $HOVER; $HOVER = $widget;
89 90
90 $hover->update if $hover && $hover->{can_hover}; 91 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover}; 92 $HOVER->update if $HOVER && $HOVER->{can_hover};
92 93
93 $TOOLTIP_WATCHER->start; 94 $TOOLTIP_WATCHER->again;
94 } 95 }
95} 96}
96 97
97sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
98 my ($ev) = @_; 99 my ($ev) = @_;
99 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
100 101
101 unless ($BUTTON_STATE) { 102 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
103
104 unless ($GRAB) {
102 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
103 106
104 $GRAB = $widget; 107 $GRAB = $widget;
105 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
106 109
107 $TOOLTIP_WATCHER->cb->(); 110 $TOOLTIP_WATCHER->invoke;
108 } 111 }
109
110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
111 112
112 if ($GRAB) { 113 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 114 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 115 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9; 116 my $delta = $ev->{button} * 2 - 9;
117 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
118
119 $ev->{dx} = $shift ? $delta : 0;
120 $ev->{dy} = $shift ? 0 : $delta;
121
117 $GRAB->emit (mouse_wheel => $ev); 122 $GRAB->emit (mouse_wheel => $ev);
118 } else { 123 } else {
119 $GRAB->emit (button_down => $ev) 124 $GRAB->emit (button_down => $ev)
120 } 125 }
121 } 126 }
… …
135 my $grab = $GRAB; undef $GRAB; 140 my $grab = $GRAB; undef $GRAB;
136 $grab->update if $grab; 141 $grab->update if $grab;
137 $GRAB->update if $GRAB; 142 $GRAB->update if $GRAB;
138 143
139 check_hover $widget; 144 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->(); 145 $TOOLTIP_WATCHER->invoke;
141 } 146 }
142} 147}
143 148
144sub feed_sdl_motion_event { 149sub feed_sdl_motion_event {
145 my ($ev) = @_; 150 my ($ev) = @_;
… …
185# call when resolution changes etc. 190# call when resolution changes etc.
186sub rescale_widgets { 191sub rescale_widgets {
187 my ($sx, $sy) = @_; 192 my ($sx, $sy) = @_;
188 193
189 for my $widget (values %WIDGET) { 194 for my $widget (values %WIDGET) {
190 if ($widget->{is_toplevel}) { 195 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
191 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 196 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
192 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 197 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
193 198
194 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 199 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
195 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 200 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
207 reconfigure_widgets; 212 reconfigure_widgets;
208} 213}
209 214
210############################################################################# 215#############################################################################
211 216
212package CFClient::UI::Event; 217package DC::UI::Event;
213 218
214sub xy { 219sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 220 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 221}
217 222
218############################################################################# 223#############################################################################
219 224
220package CFClient::UI::Base; 225package DC::UI::Base;
221 226
222use strict; 227use common::sense;
223 228
224use CFClient::OpenGL; 229use DC::OpenGL;
225 230
226sub new { 231sub new {
227 my $class = shift; 232 my $class = shift;
228 233
229 my $self = bless { 234 my $self = bless {
… …
234 h => undef, 239 h => undef,
235 can_events => 1, 240 can_events => 1,
236 @_ 241 @_
237 }, $class; 242 }, $class;
238 243
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 244 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
240 245
241 for (keys %$self) { 246 for (keys %$self) {
242 if (/^on_(.*)$/) { 247 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 248 $self->connect ($1 => delete $self->{$_});
244 } 249 }
245 } 250 }
246 251
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 252 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 253 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 254 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 255 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 256 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
252 257
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 258 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 259 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 260
256 $self->show if $layout->{show}; 261 $self->show if $layout->{show};
… …
261 266
262sub destroy { 267sub destroy {
263 my ($self) = @_; 268 my ($self) = @_;
264 269
265 $self->hide; 270 $self->hide;
271 $self->emit ("destroy");
266 %$self = (); 272 %$self = ();
267} 273}
268 274
275sub TO_JSON {
276 { "\fw" => $_[0]{s_id} }
277}
278
269sub show { 279sub show {
270 my ($self) = @_; 280 my ($self) = @_;
271 281
272 return if $self->{parent}; 282 return if $self->{parent};
273 283
274 $CFClient::UI::ROOT->add ($self); 284 $DC::UI::ROOT->add ($self);
275} 285}
276 286
277sub set_visible { 287sub set_visible {
278 my ($self) = @_; 288 my ($self) = @_;
279 289
280 return if $self->{visible}; 290 return if $self->{visible};
291
292 $self->{parent} && $self->{parent}{root}#d#
293 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
281 294
282 $self->{root} = $self->{parent}{root}; 295 $self->{root} = $self->{parent}{root};
283 $self->{visible} = $self->{parent}{visible} + 1; 296 $self->{visible} = $self->{parent}{visible} + 1;
284 297
285 $self->emit (visibility_change => 1); 298 $self->emit (visibility_change => 1);
286 299
287 $self->realloc if !exists $self->{req_w}; 300 $self->realloc if !exists $self->{req_w};
288 301
289 $_->set_visible for $self->children; 302 $_->set_visible for $self->visible_children;
290} 303}
291 304
292sub set_invisible { 305sub set_invisible {
293 my ($self) = @_; 306 my ($self) = @_;
294 307
… …
300 delete $self->{root}; 313 delete $self->{root};
301 314
302 undef $GRAB if $GRAB == $self; 315 undef $GRAB if $GRAB == $self;
303 undef $HOVER if $HOVER == $self; 316 undef $HOVER if $HOVER == $self;
304 317
305 $CFClient::UI::TOOLTIP_WATCHER->cb->() 318 $DC::UI::TOOLTIP_WATCHER->invoke
306 if $TOOLTIP->{owner} == $self; 319 if $TOOLTIP->{owner} == $self;
307 320
308 $self->emit ("focus_out"); 321 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0); 322 $self->emit (visibility_change => 0);
310} 323}
… …
312sub set_visibility { 325sub set_visibility {
313 my ($self, $visible) = @_; 326 my ($self, $visible) = @_;
314 327
315 return if $self->{visible} == $visible; 328 return if $self->{visible} == $visible;
316 329
317 $visible ? $self->hide 330 $visible ? $self->show
318 : $self->show; 331 : $self->hide;
319} 332}
320 333
321sub toggle_visibility { 334sub toggle_visibility {
322 my ($self) = @_; 335 my ($self) = @_;
323 336
… …
329sub hide { 342sub hide {
330 my ($self) = @_; 343 my ($self) = @_;
331 344
332 $self->set_invisible; 345 $self->set_invisible;
333 346
347 # extra $parent copy for 5.8.8+ bug workaround
348 # (otherwise $_[0] in remove gets freed
349 if (my $parent = $self->{parent}) {
334 $self->{parent}->remove ($self) 350 $parent->remove ($self);
335 if $self->{parent}; 351 }
336} 352}
337 353
338sub move_abs { 354sub move_abs {
339 my ($self, $x, $y, $z) = @_; 355 my ($self, $x, $y, $z) = @_;
340 356
… …
352 $self->{force_h} = $h; 368 $self->{force_h} = $h;
353 369
354 $self->realloc; 370 $self->realloc;
355} 371}
356 372
373# traverse the widget chain up to find the maximum "physical" size constraints
374sub get_max_wh {
375 my ($self) = @_;
376
377 my ($w, $h) = @$self{qw(max_w max_h)};
378
379 if ($w <= 0 || $h <= 0) {
380 my ($mw, $mh) = $self->{parent}
381 ? $self->{parent}->get_max_wh
382 : ($::WIDTH, $::HEIGHT);
383
384 $w = $mw if $w <= 0;
385 $h = $mh if $h <= 0;
386 }
387
388 ($w, $h)
389}
390
357sub size_request { 391sub size_request {
358 require Carp; 392 require Carp;
359 Carp::confess "size_request is abstract"; 393 Carp::confess "size_request is abstract";
360} 394}
361 395
… …
367 my ($self, $x, $y, $w, $h) = @_; 401 my ($self, $x, $y, $w, $h) = @_;
368 402
369 if ($self->{aspect}) { 403 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 404 my ($ow, $oh) = ($w, $h);
371 405
372 $w = List::Util::min $w, int $h * $self->{aspect}; 406 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, int $w / $self->{aspect}; 407 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
374 408
375 # use alignment to adjust x, y 409 # use alignment to adjust x, y
376 410
377 $x += int 0.5 * ($ow - $w); 411 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 412 $y += int 0.5 * ($oh - $h);
… …
419 453
420 return if $self->{tooltip} eq $tooltip; 454 return if $self->{tooltip} eq $tooltip;
421 455
422 $self->{tooltip} = $tooltip; 456 $self->{tooltip} = $tooltip;
423 457
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 458 if ($DC::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner}; 459 delete $DC::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 460 $DC::UI::TOOLTIP_WATCHER->invoke;
427 } 461 }
428} 462}
429 463
430# translate global coordinates to local coordinate system 464# translate global coordinates to local coordinate system
431sub coord2local { 465sub coord2local {
432 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
433 467
434 Carp::confess unless $self->{parent};#d# 468 return (undef, undef) unless $self->{parent};
435 469
436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 470 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
437} 471}
438 472
439# translate local coordinates to global coordinate system 473# translate local coordinates to global coordinate system
440sub coord2global { 474sub coord2global {
441 my ($self, $x, $y) = @_; 475 my ($self, $x, $y) = @_;
442 476
443 Carp::confess unless $self->{parent};#d# 477 return (undef, undef) unless $self->{parent};
444 478
445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 479 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
446} 480}
447 481
448sub invoke_focus_in { 482sub invoke_focus_in {
… …
497sub connect { 531sub connect {
498 my ($self, $signal, $cb) = @_; 532 my ($self, $signal, $cb) = @_;
499 533
500 push @{ $self->{signal_cb}{$signal} }, $cb; 534 push @{ $self->{signal_cb}{$signal} }, $cb;
501 535
502 defined wantarray and CFClient::guard { 536 defined wantarray and Guard::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 537 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 538 @{ $self->{signal_cb}{$signal} };
505 } 539 }
540}
541
542sub disconnect_all {
543 my ($self, $signal) = @_;
544
545 delete $self->{signal_cb}{$signal};
506} 546}
507 547
508my %has_coords = ( 548my %has_coords = (
509 button_down => 1, 549 button_down => 1,
510 button_up => 1, 550 button_up => 1,
… …
513); 553);
514 554
515sub emit { 555sub emit {
516 my ($self, $signal, @args) = @_; 556 my ($self, $signal, @args) = @_;
517 557
518 # I do not really like this solution, but I dislike duplication 558 # I do not really like this solution, but I do not like duplication
519 # and needlessly verbose code, too. 559 # and needlessly verbose code, either.
520 my @append 560 my @append
521 = $has_coords{$signal} 561 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 562 ? $args[0]->xy ($self)
523 : (); 563 : ();
524 564
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 565 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526 566
527 #d##TODO# stop propagating at first true, do not use sum 567 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 568 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 569 ($self->can ("invoke_$signal") || sub { 1 }), # closure
570 ) {
571 return $cb->($self, @args, @append) || next;
572 }
573
574 # parent
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 575 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 576}
532 577
533sub find_widget { 578#sub find_widget {
534 my ($self, $x, $y) = @_; 579# 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 580
545sub set_parent { 581sub set_parent {
546 my ($self, $parent) = @_; 582 my ($self, $parent) = @_;
547 583
548 Scalar::Util::weaken ($self->{parent} = $parent); 584 DC::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 585 $self->set_visible if $parent->{visible};
550} 586}
551 587
552sub realloc { 588sub realloc {
553 my ($self) = @_; 589 my ($self) = @_;
… …
579 615
580# using global variables seems a bit hacky, but passing through all drawing 616# using global variables seems a bit hacky, but passing through all drawing
581# functions seems pointless. 617# functions seems pointless.
582our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 618our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583 619
584sub draw { 620#sub draw {
585 my ($self) = @_; 621#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 622
631sub _draw { 623sub _draw {
632 my ($self) = @_; 624 my ($self) = @_;
633 625
634 warn "no draw defined for $self\n"; 626 warn "no draw defined for $self\n";
635} 627}
636 628
637sub DESTROY { 629sub DESTROY {
638 my ($self) = @_; 630 my ($self) = @_;
639 631
640 return if CFClient::in_destruct; 632 return if DC::in_destruct;
641 633
642 delete $WIDGET{$self+0}; 634 local $@;
643
644 eval { $self->destroy }; 635 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
637
638 delete $WIDGET{$self+0};
646} 639}
647 640
648############################################################################# 641#############################################################################
649 642
650package CFClient::UI::DrawBG; 643package DC::UI::DrawBG;
651 644
652our @ISA = CFClient::UI::Base::; 645our @ISA = DC::UI::Base::;
653 646
654use strict; 647use common::sense;
648
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}) {
… …
1635 } 1934 }
1636 1935
1637 $self 1936 $self
1638} 1937}
1639 1938
1640sub escape($) {
1641 local $_ = $_[0];
1642
1643 s/&/&amp;/g;
1644 s/>/&gt;/g;
1645 s/</&lt;/g;
1646
1647 $_
1648}
1649
1650sub update { 1939sub update {
1651 my ($self) = @_; 1940 my ($self) = @_;
1652 1941
1653 delete $self->{texture}; 1942 delete $self->{texture};
1654 $self->SUPER::update; 1943 $self->SUPER::update;
… …
1657sub realloc { 1946sub realloc {
1658 my ($self) = @_; 1947 my ($self) = @_;
1659 1948
1660 delete $self->{ox}; 1949 delete $self->{ox};
1661 $self->SUPER::realloc; 1950 $self->SUPER::realloc;
1951}
1952
1953sub clear {
1954 my ($self) = @_;
1955
1956 $self->set_text ("");
1662} 1957}
1663 1958
1664sub set_text { 1959sub set_text {
1665 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1666 1961
… …
1691 1986
1692sub size_request { 1987sub size_request {
1693 my ($self) = @_; 1988 my ($self) = @_;
1694 1989
1695 $self->{size_req} ||= do { 1990 $self->{size_req} ||= do {
1991 my ($max_w, $max_h) = $self->get_max_wh;
1992
1696 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
1697 $self->{layout}->set_width ($self->{max_w} || -1); 1994 $self->{layout}->set_width ($max_w);
1698 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
1699 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1700 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1701 1998
1702 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
1703 2000
1704 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
1705 $self->{template}->set_font ($self->{font}) if $self->{font}; 2002 $self->{template}->set_font ($self->{font}) if $self->{font};
1706 $self->{template}->set_width ($self->{max_w} || -1); 2003 $self->{template}->set_width ($max_w);
1707 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1708 2005
1709 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
1710 2007
1711 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
… …
1767 2064
1768 [$self->{layout}->size] 2065 [$self->{layout}->size]
1769 }; 2066 };
1770 2067
1771 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
1772 $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);
1773 : $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);
1774 : ($self->{w} - $size->[0]) * 0.5);
1775 2071
1776 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1777 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1778 : ($self->{h} - $size->[1]) * 0.5);
1779 }; 2073 };
1780 2074
1781 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2075# unless ($self->{list}) {
1782 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2076# $self->{list} = DC::OpenGL::glGenList;
1783 2077# DC::OpenGL::glNewList $self->{list};
1784 $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;
1785} 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#}
1786 2094
1787############################################################################# 2095#############################################################################
1788 2096
1789package CFClient::UI::EntryBase; 2097package DC::UI::EntryBase;
1790 2098
1791our @ISA = CFClient::UI::Label::; 2099our @ISA = DC::UI::Label::;
1792 2100
1793use CFClient::OpenGL; 2101use DC::OpenGL;
1794 2102
1795sub new { 2103sub new {
1796 my $class = shift; 2104 my $class = shift;
1797 2105
1798 $class->SUPER::new ( 2106 $class->SUPER::new (
1799 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
1800 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2109 outline => undef,
1801 active_bg => [1, 1, 1, 0.5], 2110 active_bg => [0, 0, 1, .2],
1802 active_fg => [0, 0, 0], 2111 active_fg => [1, 1, 1],
2112 active_outline => [1, 1, 0],
1803 can_hover => 1, 2113 can_hover => 1,
1804 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
1805 valign => 0, 2116 valign => 0.5,
1806 can_events => 1, 2117 can_events => 1,
2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
1807 #text => ... 2121 #text => ...
1808 #hidden => "*", 2122 #hidden => "*",
1809 @_ 2123 @_
1810 ) 2124 )
1811} 2125}
… …
1856 my $sym = $ev->{sym}; 2170 my $sym = $ev->{sym};
1857 my $uni = $ev->{unicode}; 2171 my $uni = $ev->{unicode};
1858 2172
1859 my $text = $self->get_text; 2173 my $text = $self->get_text;
1860 2174
1861 if ($uni == 8) { 2175 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2176
2177 if ($sym == DC::SDLK_BACKSPACE) {
1862 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
1864 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
1865 } elsif ($sym == CFClient::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
1866 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
1867 } elsif ($sym == CFClient::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
1868 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1869 } 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 = "";
1870 $self->{cursor} = 0; 2199 $self->{cursor} = 0;
1871 } elsif ($sym == CFClient::SDLK_END) {
1872 $self->{cursor} = length $text;
1873 } elsif ($uni == 27) { 2200 } elsif ($uni == 27) {
1874 $self->emit ('escape'); 2201 $self->emit ('escape');
1875 } elsif ($uni) { 2202 } elsif ($uni == 0x0d) {
2203 substr $text, $self->{cursor}++, 0, "\012";
2204 } elsif ($uni >= 0x20) {
1876 substr $text, $self->{cursor}++, 0, chr $uni; 2205 substr $text, $self->{cursor}++, 0, chr $uni;
1877 } else { 2206 } else {
1878 return 0; 2207 return 0;
1879 } 2208 }
1880 2209
1881 $self->_set_text ($text); 2210 $self->_set_text ($text);
1882 2211
1883 $self->realloc; 2212 $self->realloc;
2213 $self->update;
1884 2214
1885 1 2215 1
1886} 2216}
1887 2217
1888sub invoke_focus_in { 2218sub invoke_focus_in {
… …
1930 glColor_premultiply @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
1931 } 2261 }
1932 2262
1933 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
1934 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1935 glBegin GL_QUADS;
1936 glVertex 0 , 0;
1937 glVertex 0 , $self->{h};
1938 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
1939 glVertex $self->{w}, 0;
1940 glEnd;
1941 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
1942 2267
1943 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
1944 2269
1945 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
… …
1947 2272
1948 unless (exists $self->{cur_h}) { 2273 unless (exists $self->{cur_h}) {
1949 my $text = substr $self->{text}, 0, $self->{cursor}; 2274 my $text = substr $self->{text}, 0, $self->{cursor};
1950 utf8::encode $text; 2275 utf8::encode $text;
1951 2276
1952 @$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);
1953 } 2278 }
1954 2279
1955 glColor @{$self->{fg}}; 2280 glColor_premultiply @{$self->{active_fg}};
1956 glBegin GL_LINES; 2281 glBegin GL_LINES;
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2282 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1958 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};
1959 glEnd; 2284 glEnd;
1960 }
1961}
1962 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
1963package CFClient::UI::Entry; 2304package DC::UI::Entry;
1964 2305
1965our @ISA = CFClient::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
1966 2307
1967use 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
1968 2319
1969sub invoke_key_down { 2320sub invoke_key_down {
1970 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1971 2322
1972 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1973 2324
1974 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1975 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1976 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
1977 2328
1978 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1979 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
1980 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
1981 $self->update; 2332 $self->update;
1982 2333
1983 } elsif ($sym == CFClient::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
1984 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
1985 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
1986 } 2337 }
1987 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
1988 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
1990 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
1991 } 2342 }
1992 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1993 } 2344 }
1994 2345
1995 } elsif ($sym == CFClient::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
1996 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
1997 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1998 2349
1999 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
2000 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2001 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
2002 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
2003 } 2357 }
2004 2358
2005 } else { 2359 } else {
2006 return $self->SUPER::invoke_key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
2007 } 2361 }
… …
2009 1 2363 1
2010} 2364}
2011 2365
2012############################################################################# 2366#############################################################################
2013 2367
2014package CFClient::UI::Button; 2368package DC::UI::TextEdit;
2015 2369
2016our @ISA = CFClient::UI::Label::; 2370our @ISA = DC::UI::EntryBase::;
2017 2371
2018use CFClient::OpenGL; 2372use DC::OpenGL;
2019
2020my @tex =
2021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2022 qw(b1_button_active.png);
2023 2373
2024sub new { 2374sub new {
2025 my $class = shift; 2375 my $class = shift;
2026 2376
2027 $class->SUPER::new ( 2377 $class->SUPER::new (
2028 padding_x => 4,
2029 padding_y => 4, 2378 padding_y => 4,
2030 fg => [1, 1, 1], 2379
2031 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 (
2032 can_hover => 1, 2431 can_hover => 1,
2033 align => 0, 2432 align => 0.5,
2034 valign => 0, 2433 valign => 0.5,
2035 can_events => 1, 2434 can_events => 1,
2036 @_ 2435 @_
2037 ) 2436 )
2038} 2437}
2039 2438
… …
2048} 2447}
2049 2448
2050sub _draw { 2449sub _draw {
2051 my ($self) = @_; 2450 my ($self) = @_;
2052 2451
2053 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2054
2055 glEnable GL_TEXTURE_2D; 2452 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 glColor 0, 0, 0, 1; 2454 glColor 0, 0, 0, 1;
2058 2455
2456 my $tex = $tex[$GRAB == $self];
2059 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2060 2458
2061 glDisable GL_TEXTURE_2D; 2459 glDisable GL_TEXTURE_2D;
2062 2460
2063 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
2064} 2462}
2065 2463
2066############################################################################# 2464#############################################################################
2067 2465
2068package CFClient::UI::ImageButton; 2466package DC::UI::Button;
2069 2467
2070our @ISA = CFClient::UI::Image::; 2468our @ISA = DC::UI::Label::;
2071 2469
2072use CFClient::OpenGL; 2470use DC::OpenGL;
2073 2471
2074my %textures; 2472my @tex =
2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
2474 qw(b1_button_inactive.png b1_button_active.png);
2075 2475
2076sub new { 2476sub new {
2077 my $class = shift; 2477 my $class = shift;
2078 2478
2079 my $self = $class->SUPER::new ( 2479 $class->SUPER::new (
2080 padding_x => 4, 2480 padding_x => 8,
2081 padding_y => 4, 2481 padding_y => 4,
2082 fg => [1, 1, 1], 2482 fg => [1.0, 1.0, 1.0],
2083 active_fg => [0, 0, 1], 2483 active_fg => [0.8, 0.8, 0.8],
2084 can_hover => 1, 2484 can_hover => 1,
2085 align => 0, 2485 align => 0.5,
2086 valign => 0, 2486 valign => 0.5,
2087 can_events => 1, 2487 can_events => 1,
2088 @_ 2488 @_
2089 ); 2489 )
2090} 2490}
2091 2491
2092sub invoke_button_up { 2492sub invoke_button_up {
2093 my ($self, $ev, $x, $y) = @_; 2493 my ($self, $ev, $x, $y) = @_;
2094 2494
… …
2097 && $y >= 0 && $y < $self->{h}; 2497 && $y >= 0 && $y < $self->{h};
2098 2498
2099 1 2499 1
2100} 2500}
2101 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
2102############################################################################# 2519#############################################################################
2103 2520
2104package CFClient::UI::CheckBox; 2521package DC::UI::CheckBox;
2105 2522
2106our @ISA = CFClient::UI::DrawBG::; 2523our @ISA = DC::UI::DrawBG::;
2107 2524
2108my @tex = 2525my @tex =
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2110 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2111 2528
2112use CFClient::OpenGL; 2529use DC::OpenGL;
2113 2530
2114sub new { 2531sub new {
2115 my $class = shift; 2532 my $class = shift;
2116 2533
2117 $class->SUPER::new ( 2534 $class->SUPER::new (
2535 fontsize => 1,
2118 padding_x => 2, 2536 padding_x => 2,
2119 padding_y => 2, 2537 padding_y => 2,
2120 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2121 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2122 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2128} 2546}
2129 2547
2130sub size_request { 2548sub size_request {
2131 my ($self) = @_; 2549 my ($self) = @_;
2132 2550
2133 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2134} 2552}
2135 2553
2136sub toggle { 2554sub toggle {
2137 my ($self) = @_; 2555 my ($self) = @_;
2138 2556
… …
2157sub _draw { 2575sub _draw {
2158 my ($self) = @_; 2576 my ($self) = @_;
2159 2577
2160 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
2161 2579
2162 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2163 2581
2164 my ($w, $h) = @$self{qw(w h)}; 2582 my ($w, $h) = @$self{qw(w h)};
2165 2583
2166 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;
2167 2585
… …
2174 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2175} 2593}
2176 2594
2177############################################################################# 2595#############################################################################
2178 2596
2179package CFClient::UI::Image; 2597package DC::UI::Image;
2180 2598
2181our @ISA = CFClient::UI::Base::; 2599our @ISA = DC::UI::DrawBG::;
2182 2600
2183use CFClient::OpenGL; 2601use DC::OpenGL;
2184 2602
2185our %texture_cache; 2603our %texture_cache;
2186 2604
2187sub new { 2605sub new {
2188 my $class = shift; 2606 my $class = shift;
2189 2607
2190 my $self = $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2191 can_events => 0, 2609 can_events => 0,
2610 scale => 1,
2192 @_, 2611 @_,
2193 ); 2612 );
2194 2613
2195 $self->{path} || $self->{tex} 2614 $self->{path} || $self->{tex}
2196 or Carp::croak "'path' or 'tex' attributes required"; 2615 or Carp::croak "'path' or 'tex' attributes required";
2197 2616
2198 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2199 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2200 2619
2201 Scalar::Util::weaken $texture_cache{$self->{path}}; 2620 DC::weaken $texture_cache{$self->{path}};
2202 2621
2203 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2204 2623
2205 $self 2624 $self
2206} 2625}
2207 2626
2627sub STORABLE_freeze {
2628 my ($self, $cloning) = @_;
2629
2630 $self->{path}
2631 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2632
2633 $self->{path}
2634}
2635
2636sub STORABLE_attach {
2637 my ($self, $cloning, $path) = @_;
2638
2639 $self->new (path => $path)
2640}
2641
2642sub set_texture {
2643 my ($self, $tex) = @_;
2644
2645 $self->{tex} = $tex;
2646 $self->update;
2647}
2648
2208sub size_request { 2649sub size_request {
2209 my ($self) = @_; 2650 my ($self) = @_;
2210 2651
2211 ($self->{tex}{w}, $self->{tex}{h}) 2652 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2212} 2653}
2213 2654
2214sub _draw { 2655sub _draw {
2215 my ($self) = @_; 2656 my ($self) = @_;
2657
2658 $self->SUPER::_draw;
2216 2659
2217 my $tex = $self->{tex}; 2660 my $tex = $self->{tex};
2218 2661
2219 my ($w, $h) = ($self->{w}, $self->{h}); 2662 my ($w, $h) = ($self->{w}, $self->{h});
2220 2663
… …
2233 glDisable GL_TEXTURE_2D; 2676 glDisable GL_TEXTURE_2D;
2234} 2677}
2235 2678
2236############################################################################# 2679#############################################################################
2237 2680
2681package DC::UI::ImageButton;
2682
2683our @ISA = DC::UI::Image::;
2684
2685use DC::OpenGL;
2686
2687sub new {
2688 my $class = shift;
2689
2690 my $self = $class->SUPER::new (
2691 padding_x => 4,
2692 padding_y => 4,
2693 fg => [1, 1, 1],
2694 active_fg => [0, 0, 1],
2695 can_hover => 1,
2696 align => 0.5,
2697 valign => 0.5,
2698 can_events => 1,
2699 @_
2700 );
2701}
2702
2703sub invoke_button_down {
2704 my ($self, $ev, $x, $y) = @_;
2705
2706 1
2707}
2708
2709sub invoke_button_up {
2710 my ($self, $ev, $x, $y) = @_;
2711
2712 $self->emit ("activate")
2713 if $x >= 0 && $x < $self->{w}
2714 && $y >= 0 && $y < $self->{h};
2715
2716 1
2717}
2718
2719#############################################################################
2720
2238package CFClient::UI::VGauge; 2721package DC::UI::VGauge;
2239 2722
2240our @ISA = CFClient::UI::Base::; 2723our @ISA = DC::UI::Base::;
2241 2724
2242use List::Util qw(min max); 2725use List::Util qw(min max);
2243 2726
2244use CFClient::OpenGL; 2727use DC::OpenGL;
2245 2728
2246my %tex = ( 2729my %tex = (
2247 food => [ 2730 food => [
2248 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2731 map { new_from_resource DC::Texture $_, mipmap => 1 }
2249 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2732 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2250 ], 2733 ],
2251 grace => [ 2734 grace => [
2252 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2735 map { new_from_resource DC::Texture $_, mipmap => 1 }
2253 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/
2254 ], 2737 ],
2255 hp => [ 2738 hp => [
2256 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2739 map { new_from_resource DC::Texture $_, mipmap => 1 }
2257 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2740 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2258 ], 2741 ],
2259 mana => [ 2742 mana => [
2260 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2743 map { new_from_resource DC::Texture $_, mipmap => 1 }
2261 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/
2262 ], 2745 ],
2263); 2746);
2264 2747
2265# eg. VGauge->new (gauge => 'food'), default gauge: food 2748# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2368 glDisable GL_TEXTURE_2D; 2851 glDisable GL_TEXTURE_2D;
2369} 2852}
2370 2853
2371############################################################################# 2854#############################################################################
2372 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
2373package CFClient::UI::Gauge; 3010package DC::UI::Gauge;
2374 3011
2375our @ISA = CFClient::UI::VBox::; 3012our @ISA = DC::UI::VBox::;
2376 3013
2377sub new { 3014sub new {
2378 my ($class, %arg) = @_; 3015 my ($class, %arg) = @_;
2379 3016
2380 my $self = $class->SUPER::new ( 3017 my $self = $class->SUPER::new (
… …
2382 can_hover => 1, 3019 can_hover => 1,
2383 can_events => 1, 3020 can_events => 1,
2384 %arg, 3021 %arg,
2385 ); 3022 );
2386 3023
2387 $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");
2388 $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);
2389 $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");
2390 3027
2391 $self 3028 $self
2392} 3029}
2393 3030
2394sub set_fontsize { 3031sub set_fontsize {
… …
2415 $self->{value}->set_text ($val); 3052 $self->{value}->set_text ($val);
2416} 3053}
2417 3054
2418############################################################################# 3055#############################################################################
2419 3056
2420package CFClient::UI::Slider; 3057package DC::UI::Slider;
2421 3058
2422use strict; 3059use common::sense;
2423 3060
2424use CFClient::OpenGL; 3061use DC::OpenGL;
2425 3062
2426our @ISA = CFClient::UI::DrawBG::; 3063our @ISA = DC::UI::DrawBG::;
2427 3064
2428my @tex = 3065my @tex =
2429 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3066 map { new_from_resource DC::Texture $_ }
2430 qw(s1_slider.png s1_slider_bg.png); 3067 qw(s1_slider.png s1_slider_bg.png);
2431 3068
2432sub new { 3069sub new {
2433 my $class = shift; 3070 my $class = shift;
2434 3071
… …
2471sub set_value { 3108sub set_value {
2472 my ($self, $value) = @_; 3109 my ($self, $value) = @_;
2473 3110
2474 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3111 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2475 3112
2476 $hi = $lo + 1 if $hi <= $lo; 3113 $hi = $lo if $hi < $lo;
2477 3114
2478 $page = $hi - $lo if $page > $hi - $lo; 3115 $value = $hi - $page if $value > $hi - $page;
2479
2480 $value = $lo if $value < $lo; 3116 $value = $lo if $value < $lo;
2481 $value = $hi - $page if $value > $hi - $page;
2482 3117
2483 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3118 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2484 if $unit; 3119 if $unit;
2485 3120
2486 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3121 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2502 3137
2503 $self->SUPER::invoke_button_down ($ev, $x, $y); 3138 $self->SUPER::invoke_button_down ($ev, $x, $y);
2504 3139
2505 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3140 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2506 3141
2507 $self->invoke_mouse_motion ($ev, $x, $y) 3142 $self->invoke_mouse_motion ($ev, $x, $y);
3143
3144 1
2508} 3145}
2509 3146
2510sub invoke_mouse_motion { 3147sub invoke_mouse_motion {
2511 my ($self, $ev, $x, $y) = @_; 3148 my ($self, $ev, $x, $y) = @_;
2512 3149
2513 if ($GRAB == $self) { 3150 if ($GRAB == $self) {
2514 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3151 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2515 3152
2516 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3153 my (undef, $lo, $hi, $page) = @{$self->{range}};
2517 3154
2518 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3155 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2519 3156
2520 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3157 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2521 } else { 3158 } else {
2522 return 0; 3159 return 0;
2523 } 3160 }
… …
2528sub invoke_mouse_wheel { 3165sub invoke_mouse_wheel {
2529 my ($self, $ev) = @_; 3166 my ($self, $ev) = @_;
2530 3167
2531 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3168 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532 3169
3170 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3171
2533 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3172 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2534 3173
2535 ! ! $delta 3174 1
2536} 3175}
2537 3176
2538sub update { 3177sub update {
2539 my ($self) = @_; 3178 my ($self) = @_;
2540 3179
… …
2546 my ($self) = @_; 3185 my ($self) = @_;
2547 3186
2548 unless ($self->{knob_w}) { 3187 unless ($self->{knob_w}) {
2549 $self->set_value ($self->{range}[0]); 3188 $self->set_value ($self->{range}[0]);
2550 3189
2551 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3190 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2552 my $range = ($hi - $page - $lo) || 1e-100; 3191 my $range = ($hi - $page - $lo) || 1e-10;
2553 3192
2554 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};
2555 3194
2556 $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;
2557 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3196 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2558 3197
2559 $value = ($value - $lo) / $range; 3198 $value = ($value - $lo) / $range;
… …
2589 glDisable GL_TEXTURE_2D; 3228 glDisable GL_TEXTURE_2D;
2590} 3229}
2591 3230
2592############################################################################# 3231#############################################################################
2593 3232
2594package CFClient::UI::ValSlider; 3233package DC::UI::ValSlider;
2595 3234
2596our @ISA = CFClient::UI::HBox::; 3235our @ISA = DC::UI::HBox::;
2597 3236
2598sub new { 3237sub new {
2599 my ($class, %arg) = @_; 3238 my ($class, %arg) = @_;
2600 3239
2601 my $range = delete $arg{range}; 3240 my $range = delete $arg{range};
2602 3241
2603 my $self = $class->SUPER::new ( 3242 my $self = $class->SUPER::new (
2604 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3243 slider => (new DC::UI::Slider expand => 1, range => $range),
2605 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3244 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2606 to_value => sub { shift }, 3245 to_value => sub { shift },
2607 from_value => sub { shift }, 3246 from_value => sub { shift },
2608 %arg, 3247 %arg,
2609 ); 3248 );
2610 3249
… …
2630sub set_range { shift->{slider}->set_range (@_) } 3269sub set_range { shift->{slider}->set_range (@_) }
2631sub set_value { shift->{slider}->set_value (@_) } 3270sub set_value { shift->{slider}->set_value (@_) }
2632 3271
2633############################################################################# 3272#############################################################################
2634 3273
2635package CFClient::UI::TextScroller; 3274package DC::UI::TextScroller;
2636 3275
2637our @ISA = CFClient::UI::HBox::; 3276our @ISA = DC::UI::HBox::;
2638 3277
2639use CFClient::OpenGL; 3278use DC::OpenGL;
2640 3279
2641sub new { 3280sub new {
2642 my $class = shift; 3281 my $class = shift;
2643 3282
2644 my $self = $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
… …
2646 can_events => 1, 3285 can_events => 1,
2647 indent => 0, 3286 indent => 0,
2648 #font => default_font 3287 #font => default_font
2649 @_, 3288 @_,
2650 3289
2651 layout => (new CFClient::Layout), 3290 layout => (new DC::Layout),
2652 par => [], 3291 par => [],
3292 max_par => 0,
2653 height => 0, 3293 height => 0,
2654 children => [ 3294 children => [
2655 (new CFClient::UI::Empty expand => 1), 3295 (new DC::UI::Empty expand => 1),
2656 (new CFClient::UI::Slider vertical => 1), 3296 (new DC::UI::Slider vertical => 1),
2657 ], 3297 ],
2658 ); 3298 );
2659 3299
2660 $self->{children}[1]->connect (changed => sub { $self->update }); 3300 $self->{children}[1]->connect (changed => sub { $self->update });
2661 3301
… …
2670} 3310}
2671 3311
2672sub size_request { 3312sub size_request {
2673 my ($self) = @_; 3313 my ($self) = @_;
2674 3314
2675 my ($empty, $slider) = @{ $self->{children} }; 3315 my ($empty, $slider) = $self->visible_children;
2676 3316
2677 local $self->{children} = [$empty, $slider]; 3317 local $self->{children} = [$empty, $slider];
2678 $self->SUPER::size_request 3318 $self->SUPER::size_request
2679} 3319}
2680 3320
… …
2717 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3357 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2718 $layout->set_markup ($para->{markup}); 3358 $layout->set_markup ($para->{markup});
2719 3359
2720 $layout->set_shapes ( 3360 $layout->set_shapes (
2721 map 3361 map
2722 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3362 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2723 @{$para->{widget}} 3363 @{$para->{widget}}
2724 ); 3364 );
2725 3365
2726 $layout 3366 $layout
2727} 3367}
… …
2736sub set_offset { 3376sub set_offset {
2737 my ($self, $offset) = @_; 3377 my ($self, $offset) = @_;
2738 3378
2739 # todo: base offset on lines or so, not on pixels 3379 # todo: base offset on lines or so, not on pixels
2740 $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;
2741} 3396}
2742 3397
2743sub clear { 3398sub clear {
2744 my ($self) = @_; 3399 my ($self) = @_;
2745 3400
… …
2750 $self->{height} = 0; 3405 $self->{height} = 0;
2751 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3406 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2752} 3407}
2753 3408
2754sub add_paragraph { 3409sub add_paragraph {
2755 my ($self, $color, $para, $indent) = @_; 3410 my $self = shift;
2756 3411
2757 my ($text, @w) = ref $para ? @$para : $para; 3412 for my $para (@_) {
2758
2759 $para = { 3413 $para = {
3414 fg => [1, 1, 1, 1],
3415 indent => 0,
3416 markup => "",
3417 widget => [],
3418 ref $para ? %$para : (markup => $para),
2760 w => 1e10, 3419 w => 1e10,
2761 wrapped => 1, 3420 wrapped => 1,
2762 fg => $color,
2763 indent => $indent,
2764 markup => $text,
2765 widget => \@w,
2766 }; 3421 };
2767 3422
2768 $self->add (@w) if @w; 3423 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2769 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 }
2770 3430
2771 $self->{need_reflow}++; 3431 $self->{need_reflow}++;
2772 $self->update; 3432 $self->update;
2773} 3433}
2774 3434
2775sub scroll_to_bottom { 3435sub scroll_to_bottom {
2776 my ($self) = @_; 3436 my ($self) = @_;
2777 3437
2778 $self->{scroll_to_bottom} = 1; 3438 $self->{scroll_to} = $#{$self->{par}};
2779 $self->update; 3439 $self->update;
2780} 3440}
2781 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
2782sub update { 3475sub update {
2783 my ($self) = @_; 3476 my ($self) = @_;
2784 3477
2785 $self->SUPER::update; 3478 $self->SUPER::update;
2786 3479
2787 return unless $self->{h} > 0; 3480 return unless $self->{h} > 0;
2788 3481
2789 delete $self->{texture}; 3482 delete $self->{texture};
2790 3483
2791 $ROOT->on_post_alloc ($self => sub { 3484 $ROOT->on_post_alloc ($self => sub {
3485 $self->force_uptodate;
3486
2792 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3487 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2793 3488
2794 if (delete $self->{need_reflow}) {
2795 my $height = 0;
2796
2797 for my $para (@{$self->{par}}) {
2798 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2799 my $layout = $self->get_layout ($para);
2800 my ($w, $h) = $layout->size;
2801
2802 $para->{w} = $w + $para->{indent};
2803 $para->{h} = $h;
2804 $para->{wrapped} = $layout->has_wrapped;
2805 }
2806
2807 $height += $para->{h};
2808 }
2809
2810 $self->{height} = $height;
2811
2812 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2813
2814 delete $self->{texture};
2815 }
2816
2817 if (delete $self->{scroll_to_bottom}) {
2818 $self->{children}[1]->set_value (1e10);
2819 }
2820
2821 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3489 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2822 glClearColor 0, 0, 0, 0; 3490 glClearColor 0, 0, 0, 0;
2823 glClear GL_COLOR_BUFFER_BIT; 3491 glClear GL_COLOR_BUFFER_BIT;
2824 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;
2825 my $top = int $self->{children}[1]{range}[0]; 3501 my $top = int $self->{children}[1]{range}[0];
2826 3502
2827 my $y0 = $top; 3503 my $y0 = $top;
2828 my $y1 = $top + $H; 3504 my $y1 = $top + $H;
2829 3505
2830 my $y = 0;
2831
2832 for my $para (@{$self->{par}}) { 3506 for my $para (@{$self->{par}}) {
2833 my $h = $para->{h}; 3507 my $h = $para->{h};
3508 my $y = $para->{y};
2834 3509
2835 if ($y0 < $y + $h && $y < $y1) { 3510 if ($y0 < $y + $h && $y < $y1) {
2836
2837 my $layout = $self->get_layout ($para); 3511 my $layout = $self->get_layout ($para);
2838 3512
2839 $layout->render ($para->{indent}, $y - $y0); 3513 $layout->render ($para->{indent}, $y - $y0);
3514 $layout->draw;
2840 3515
2841 if (my @w = @{ $para->{widget} }) { 3516 if (my @w = @{ $para->{widget} }) {
2842 my @s = $layout->get_shapes; 3517 my @s = $layout->get_shapes;
2843 3518
2844 for (@w) { 3519 for (@w) {
… …
2850 $_->draw; 3525 $_->draw;
2851 } 3526 }
2852 } 3527 }
2853 } 3528 }
2854 3529
2855 $y += $h; 3530 $paridx++;
3531 $top_paragraph ||= $paridx if $y >= $top;
2856 } 3532 }
3533
3534 $self->{top_paragraph} = $top_paragraph;
2857 }; 3535 };
2858 }); 3536 });
2859} 3537}
2860 3538
2861sub reconfigure { 3539sub reconfigure {
… …
2879 $self->{children}[1]->draw; 3557 $self->{children}[1]->draw;
2880} 3558}
2881 3559
2882############################################################################# 3560#############################################################################
2883 3561
2884package CFClient::UI::Animator; 3562package DC::UI::Animator;
2885 3563
2886use CFClient::OpenGL; 3564use DC::OpenGL;
2887 3565
2888our @ISA = CFClient::UI::Bin::; 3566our @ISA = DC::UI::Bin::;
2889 3567
2890sub moveto { 3568sub moveto {
2891 my ($self, $x, $y) = @_; 3569 my ($self, $x, $y) = @_;
2892 3570
2893 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3571 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2921 glPopMatrix; 3599 glPopMatrix;
2922} 3600}
2923 3601
2924############################################################################# 3602#############################################################################
2925 3603
2926package CFClient::UI::Flopper; 3604package DC::UI::Flopper;
2927 3605
2928our @ISA = CFClient::UI::Button::; 3606our @ISA = DC::UI::Button::;
2929 3607
2930sub new { 3608sub new {
2931 my $class = shift; 3609 my $class = shift;
2932 3610
2933 my $self = $class->SUPER::new ( 3611 my $self = $class->SUPER::new (
… …
2945 $self->{other}->toggle_visibility; 3623 $self->{other}->toggle_visibility;
2946} 3624}
2947 3625
2948############################################################################# 3626#############################################################################
2949 3627
2950package CFClient::UI::Tooltip; 3628package DC::UI::Tooltip;
2951 3629
2952our @ISA = CFClient::UI::Bin::; 3630our @ISA = DC::UI::Bin::;
2953 3631
2954use CFClient::OpenGL; 3632use DC::OpenGL;
2955 3633
2956sub new { 3634sub new {
2957 my $class = shift; 3635 my $class = shift;
2958 3636
2959 $class->SUPER::new ( 3637 $class->SUPER::new (
… …
2963} 3641}
2964 3642
2965sub set_tooltip_from { 3643sub set_tooltip_from {
2966 my ($self, $widget) = @_; 3644 my ($self, $widget) = @_;
2967 3645
2968 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 =~ /^#(.*)$/;
2969 3651
2970 if ($ENV{CFPLUS_DEBUG} & 2) { 3652 if ($ENV{CFPLUS_DEBUG} & 2) {
2971 $tooltip .= "\n\n" . (ref $widget) . "\n" 3653 $tip .= "\n\n" . (ref $widget) . "\n"
2972 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3654 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2973 . "req $widget->{req_w} $widget->{req_h}\n" 3655 . "req $widget->{req_w} $widget->{req_h}\n"
2974 . "visible $widget->{visible}"; 3656 . "visible $widget->{visible}";
2975 } 3657 }
2976 3658
2977 $tooltip =~ s/^\n+//; 3659 $tip =~ s/^\n+//;
2978 $tooltip =~ s/\n+$//; 3660 $tip =~ s/\n+$//;
2979 3661
2980 $self->add (new CFClient::UI::Label 3662 $self->add (new DC::UI::Label
3663 fg => $DC::THEME{tooltip_fg},
2981 markup => $tooltip, 3664 markup => $tip,
2982 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3665 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3666 align => 0,
2983 fontsize => 0.8, 3667 fontsize => 0.8,
2984 fg => [0, 0, 0, 1], 3668 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
2985 ellipsise => 0, 3669 ellipsise => 0,
2986 font => ($widget->{tooltip_font} || $::FONT_PROP), 3670 font => ($widget->{tooltip_font} || $::FONT_PROP),
2987 ); 3671 );
2988} 3672}
2989 3673
… …
3024} 3708}
3025 3709
3026sub _draw { 3710sub _draw {
3027 my ($self) = @_; 3711 my ($self) = @_;
3028 3712
3029 glTranslate 0.375, 0.375;
3030
3031 my ($w, $h) = @$self{qw(w h)}; 3713 my ($w, $h) = @$self{qw(w h)};
3032 3714
3033 glColor 1, 0.8, 0.4; 3715 glColor @{ $DC::THEME{tooltip_bg} };
3034 glBegin GL_QUADS; 3716 glRect 0, 0, $w, $h;
3035 glVertex 0 , 0;
3036 glVertex 0 , $h;
3037 glVertex $w, $h;
3038 glVertex $w, 0;
3039 glEnd;
3040 3717
3041 glColor 0, 0, 0; 3718 glColor @{ $DC::THEME{tooltip_border} };
3042 glBegin GL_LINE_LOOP; 3719 glRect_lineloop .5, .5, $w + .5, $h + .5;
3043 glVertex 0 , 0;
3044 glVertex 0 , $h;
3045 glVertex $w, $h;
3046 glVertex $w, 0;
3047 glEnd;
3048 3720
3049 glTranslate 2 - 0.375, 2 - 0.375; 3721 glTranslate 2, 2;
3050 3722
3051 $self->SUPER::_draw; 3723 $self->SUPER::_draw;
3052} 3724}
3053 3725
3054############################################################################# 3726#############################################################################
3055 3727
3056package CFClient::UI::Face; 3728package DC::UI::Face;
3057 3729
3058our @ISA = CFClient::UI::Base::; 3730our @ISA = DC::UI::DrawBG::;
3059 3731
3060use CFClient::OpenGL; 3732use DC::OpenGL;
3061 3733
3062sub new { 3734sub new {
3063 my $class = shift; 3735 my $class = shift;
3064 3736
3065 my $self = $class->SUPER::new ( 3737 my $self = $class->SUPER::new (
3738 size_w => 32,
3739 size_h => 8,
3066 aspect => 1, 3740 aspect => 1,
3067 can_events => 0, 3741 can_events => 0,
3068 @_, 3742 @_,
3069 ); 3743 );
3070 3744
3071 if ($self->{anim} && $self->{animspeed}) { 3745 $self->update_anim;
3072 Scalar::Util::weaken (my $widget = $self);
3073
3074 $self->{timer} = Event->timer (
3075 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3076 hard => 1,
3077 interval => $self->{animspeed},
3078 cb => sub {
3079 ++$widget->{frame};
3080 $widget->update;
3081 },
3082 );
3083 }
3084 3746
3085 $self 3747 $self
3086} 3748}
3087 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
3088sub size_request { 3809sub size_request {
3089 (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)
3090} 3827}
3091 3828
3092sub update { 3829sub update {
3093 my ($self) = @_; 3830 my ($self) = @_;
3094 3831
3095 return unless $self->{visible}; 3832 return unless $self->{visible};
3096 3833
3097 $self->SUPER::update; 3834 $self->SUPER::update;
3098} 3835}
3099 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
3100sub _draw { 3866sub _draw {
3101 my ($self) = @_; 3867 my ($self) = @_;
3102 3868
3103 return unless $::CONN; 3869 $self->SUPER::_draw;
3104 3870
3105 my $face; 3871 if (my $tex = $self->{tex}) {
3106
3107 if ($self->{frame}) {
3108 my $anim = $::CONN->{anim}[$self->{anim}];
3109
3110 $face = $anim->[ $self->{frame} % @$anim ]
3111 if $anim && @$anim;
3112 }
3113
3114 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3115
3116 if ($tex) {
3117 glEnable GL_TEXTURE_2D; 3872 glEnable GL_TEXTURE_2D;
3118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3119 glColor 0, 0, 0, 1; 3874 glColor 0, 0, 0, 1;
3120 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3121 glDisable GL_TEXTURE_2D; 3876 glDisable GL_TEXTURE_2D;
… …
3123} 3878}
3124 3879
3125sub destroy { 3880sub destroy {
3126 my ($self) = @_; 3881 my ($self) = @_;
3127 3882
3128 $self->{timer}->cancel 3883 (delete $self->{timer})->cancel
3129 if $self->{timer}; 3884 if $self->{timer};
3130 3885
3131 $self->SUPER::destroy; 3886 $self->SUPER::destroy;
3132} 3887}
3133 3888
3134############################################################################# 3889#############################################################################
3135 3890
3136package CFClient::UI::Buttonbar; 3891package DC::UI::Buttonbar;
3137 3892
3138our @ISA = CFClient::UI::HBox::; 3893our @ISA = DC::UI::HBox::;
3139 3894
3140# TODO: should actualyl wrap buttons and other goodies. 3895# TODO: should actually wrap buttons and other goodies.
3141 3896
3142############################################################################# 3897#############################################################################
3143 3898
3144package CFClient::UI::Menu; 3899package DC::UI::Menu;
3145 3900
3146our @ISA = CFClient::UI::FancyFrame::; 3901our @ISA = DC::UI::Toplevel::;
3147 3902
3148use CFClient::OpenGL; 3903use DC::OpenGL;
3149 3904
3150sub new { 3905sub new {
3151 my $class = shift; 3906 my $class = shift;
3152 3907
3153 my $self = $class->SUPER::new ( 3908 my $self = $class->SUPER::new (
3154 items => [], 3909 items => [],
3155 z => 100, 3910 z => 100,
3156 @_, 3911 @_,
3157 ); 3912 );
3158 3913
3159 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3914 $self->add ($self->{vbox} = new DC::UI::VBox);
3160 3915
3161 for my $item (@{ $self->{items} }) { 3916 for my $item (@{ $self->{items} }) {
3162 my ($widget, $cb, $tooltip) = @$item; 3917 my ($widget, $cb, $tooltip) = @$item;
3163 3918
3164 # handle various types of items, only text for now 3919 # handle various types of items, only text for now
3165 if (!ref $widget) { 3920 if (!ref $widget) {
3166 if ($widget =~ /\t/) { 3921 if ($widget =~ /\t/) {
3167 my ($left, $right) = split /\t/, $widget, 2; 3922 my ($left, $right) = split /\t/, $widget, 2;
3168 3923
3169 $widget = new CFClient::UI::HBox 3924 $widget = new DC::UI::HBox
3170 can_hover => 1, 3925 can_hover => 1,
3171 can_events => 1, 3926 can_events => 1,
3172 tooltip => $tooltip, 3927 tooltip => $tooltip,
3173 children => [ 3928 children => [
3174 (new CFClient::UI::Label markup => $left, expand => 1), 3929 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3175 (new CFClient::UI::Label markup => $right, align => +1), 3930 (new DC::UI::Label markup => $right, align => 1),
3176 ], 3931 ],
3177 ; 3932 ;
3178 3933
3179 } else { 3934 } else {
3180 $widget = new CFClient::UI::Label 3935 $widget = new DC::UI::Label
3181 can_hover => 1, 3936 can_hover => 1,
3182 can_events => 1, 3937 can_events => 1,
3938 align => 0,
3183 markup => $widget, 3939 markup => $widget,
3184 tooltip => $tooltip; 3940 tooltip => $tooltip;
3185 } 3941 }
3186 } 3942 }
3187 3943
… …
3202 # maybe save $GRAB? must be careful about events... 3958 # maybe save $GRAB? must be careful about events...
3203 $GRAB = $self; 3959 $GRAB = $self;
3204 $self->{button} = $ev->{button}; 3960 $self->{button} = $ev->{button};
3205 3961
3206 $self->show; 3962 $self->show;
3207 $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
3208} 3972}
3209 3973
3210sub invoke_mouse_motion { 3974sub invoke_mouse_motion {
3211 my ($self, $ev, $x, $y) = @_; 3975 my ($self, $ev, $x, $y) = @_;
3212 3976
… …
3233 1 3997 1
3234} 3998}
3235 3999
3236############################################################################# 4000#############################################################################
3237 4001
3238package CFClient::UI::Multiplexer; 4002package DC::UI::Multiplexer;
3239 4003
3240our @ISA = CFClient::UI::Container::; 4004our @ISA = DC::UI::Container::;
3241 4005
3242sub new { 4006sub new {
3243 my $class = shift; 4007 my $class = shift;
3244 4008
3245 my $self = $class->SUPER::new ( 4009 my $self = $class->SUPER::new (
3246 @_, 4010 @_,
3247 ); 4011 );
3248 4012
3249 $self->{current} = $self->{children}[0] 4013 $self->set_current_page (0);
3250 if @{ $self->{children} };
3251 4014
3252 $self 4015 $self
3253} 4016}
3254 4017
3255sub add { 4018sub add {
3256 my ($self, @widgets) = @_; 4019 my ($self, @widgets) = @_;
3257 4020
3258 $self->SUPER::add (@widgets); 4021 $self->SUPER::add (@widgets);
3259 4022
3260 $self->{current} = $self->{children}[0] 4023 $self->set_current_page (0)
3261 if @{ $self->{children} }; 4024 if @widgets == @{ $self->{children} };
3262} 4025}
3263 4026
3264sub get_current_page { 4027sub get_current_page {
3265 my ($self) = @_; 4028 my ($self) = @_;
3266 4029
… …
3272 4035
3273 my $widget = ref $page_or_widget 4036 my $widget = ref $page_or_widget
3274 ? $page_or_widget 4037 ? $page_or_widget
3275 : $self->{children}[$page_or_widget]; 4038 : $self->{children}[$page_or_widget];
3276 4039
4040 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4041
3277 $self->{current} = $widget; 4042 if (($self->{current} = $widget)) {
4043 $self->{current}->set_visible if $self->{current} && $self->{visible};
3278 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4044 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3279 4045
3280 $self->emit (page_changed => $self->{current}); 4046 $self->emit (page_changed => $self->{current});
4047 }
3281 4048
3282 $self->realloc; 4049 $self->realloc;
3283} 4050}
3284 4051
3285sub visible_children { 4052sub visible_children {
3286 $_[0]{current} 4053 $_[0]{current} || ()
3287} 4054}
3288 4055
3289sub size_request { 4056sub size_request {
3290 my ($self) = @_; 4057 my ($self) = @_;
3291 4058
4059 $self->{current}
3292 $self->{current}->size_request 4060 ? $self->{current}->size_request
4061 : (0, 0)
3293} 4062}
3294 4063
3295sub invoke_size_allocate { 4064sub invoke_size_allocate {
3296 my ($self, $w, $h) = @_; 4065 my ($self, $w, $h) = @_;
3297 4066
3298 $self->{current}->configure (0, 0, $w, $h); 4067 $self->{current}->configure (0, 0, $w, $h)
4068 if $self->{current};
3299 4069
3300 1 4070 1
3301} 4071}
3302 4072
3303sub _draw { 4073sub _draw {
3304 my ($self) = @_; 4074 my ($self) = @_;
3305 4075
3306 $self->{current}->draw; 4076 $self->{current}->draw
4077 if $self->{current};
3307} 4078}
3308 4079
3309############################################################################# 4080#############################################################################
3310 4081
3311package CFClient::UI::Notebook; 4082package DC::UI::Notebook;
3312 4083
4084use DC::OpenGL;
4085
3313our @ISA = CFClient::UI::VBox::; 4086our @ISA = DC::UI::VBox::;
3314 4087
3315sub new { 4088sub new {
3316 my $class = shift; 4089 my $class = shift;
3317 4090
3318 my $self = $class->SUPER::new ( 4091 my $self = $class->SUPER::new (
3319 buttonbar => (new CFClient::UI::Buttonbar), 4092 buttonbar => (new DC::UI::Buttonbar),
3320 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 4093 multiplexer => (new DC::UI::Multiplexer expand => 1),
4094 active_outline => [.7, .7, 0.2],
3321 # filter => # will be put between multiplexer and $self 4095 # filter => # will be put between multiplexer and $self
3322 @_, 4096 @_,
3323 ); 4097 );
3324 4098
3325 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4099 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3326 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4100 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3327 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
3328 $self 4136 $self
3329} 4137}
3330 4138
3331sub 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 {
3332 my ($self, $title, $widget, $tooltip) = @_; 4169 my ($self, $title, $widget, $tooltip) = @_;
3333 4170
3334 Scalar::Util::weaken $self; 4171 $title = [$title, $tooltip] unless ref $title;
4172 $widget->{c_tab} = $title;
3335 4173
3336 $self->{buttonbar}->add (new CFClient::UI::Button
3337 markup => $title,
3338 tooltip => $tooltip,
3339 on_activate => sub { $self->set_current_page ($widget) },
3340 );
3341
3342 $self->{multiplexer}->add ($widget); 4174 $self->add ($widget);
3343} 4175}
3344 4176
3345sub get_current_page { 4177sub get_current_page {
3346 my ($self) = @_; 4178 my ($self) = @_;
3347 4179
… …
3353 4185
3354 $self->{multiplexer}->set_current_page ($page); 4186 $self->{multiplexer}->set_current_page ($page);
3355 $self->emit (page_changed => $self->{multiplexer}{current}); 4187 $self->emit (page_changed => $self->{multiplexer}{current});
3356} 4188}
3357 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
3358############################################################################# 4210#############################################################################
3359 4211
3360package CFClient::UI::Combobox; 4212package DC::UI::Selector;
3361 4213
3362use utf8; 4214use utf8;
3363 4215
3364our @ISA = CFClient::UI::Button::; 4216our @ISA = DC::UI::Button::;
3365 4217
3366sub new { 4218sub new {
3367 my $class = shift; 4219 my $class = shift;
3368 4220
3369 my $self = $class->SUPER::new ( 4221 my $self = $class->SUPER::new (
… …
3386 my ($value, $title, $tooltip) = @$_; 4238 my ($value, $title, $tooltip) = @$_;
3387 4239
3388 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4240 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3389 } 4241 }
3390 4242
3391 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4243 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3392} 4244}
3393 4245
3394sub _set_value { 4246sub _set_value {
3395 my ($self, $value) = @_; 4247 my ($self, $value) = @_;
3396 4248
3397 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4249 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4250 $item ||= $self->{options}[0]
3398 or return; 4251 or return;
3399 4252
3400 $self->{value} = $item->[0]; 4253 $self->{value} = $item->[0];
3401 $self->set_markup ("$item->[1] ⇓"); 4254 $self->set_markup ("$item->[1] ⇓");
3402 $self->set_tooltip ($item->[2]); 4255# $self->set_tooltip ($item->[2]);
3403} 4256}
3404 4257
3405sub set_value { 4258sub set_value {
3406 my ($self, $value) = @_; 4259 my ($self, $value) = @_;
3407 4260
… …
3409 4262
3410 $self->_set_value ($value); 4263 $self->_set_value ($value);
3411 $self->emit (changed => $value); 4264 $self->emit (changed => $value);
3412} 4265}
3413 4266
4267sub set_options {
4268 my ($self, $options) = @_;
4269
4270 $self->{options} = $options;
4271 $self->_set_value ($self->{value});
4272}
4273
3414############################################################################# 4274#############################################################################
3415 4275
3416package CFClient::UI::Statusbox; 4276package DC::UI::Statusbox;
3417 4277
3418our @ISA = CFClient::UI::VBox::; 4278our @ISA = DC::UI::VBox::;
3419 4279
3420sub new { 4280sub new {
3421 my $class = shift; 4281 my $class = shift;
3422 4282
3423 my $self = $class->SUPER::new ( 4283 my $self = $class->SUPER::new (
3424 fontsize => 0.8, 4284 fontsize => 0.8,
3425 @_, 4285 @_,
3426 ); 4286 );
3427 4287
3428 Scalar::Util::weaken (my $this = $self); 4288 DC::weaken (my $this = $self);
3429 4289
3430 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4290 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3431 4291
3432 $self 4292 $self
3433} 4293}
3434 4294
3435sub reorder { 4295sub reorder {
3436 my ($self) = @_; 4296 my ($self) = @_;
3437 my $NOW = Time::HiRes::time; 4297 my $NOW = EV::time;
3438 4298
3439 # freeze display when hovering over any label 4299 # freeze display when hovering over any label
3440 return if $CFClient::UI::TOOLTIP->{owner} 4300 return if $DC::UI::TOOLTIP->{owner}
3441 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4301 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3442 values %{ $self->{item} }; 4302 values %{ $self->{item} };
3443 4303
3444 while (my ($k, $v) = each %{ $self->{item} }) { 4304 while (my ($k, $v) = each %{ $self->{item} }) {
3445 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4305 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3446 } 4306 }
4307
4308 $self->{timer}->set (1, 1);
3447 4309
3448 my @widgets; 4310 my @widgets;
3449 4311
3450 my @items = sort { 4312 my @items = sort {
3451 $a->{pri} <=> $b->{pri} 4313 $a->{pri} <=> $b->{pri}
3452 or $b->{id} <=> $a->{id} 4314 or $b->{id} <=> $a->{id}
3453 } values %{ $self->{item} }; 4315 } values %{ $self->{item} };
3454
3455 $self->{timer}->interval (1);
3456 4316
3457 my $count = 10 + 1; 4317 my $count = 10 + 1;
3458 for my $item (@items) { 4318 for my $item (@items) {
3459 last unless --$count; 4319 last unless --$count;
3460 4320
… …
3467 for ($short) { 4327 for ($short) {
3468 s/^\s+//; 4328 s/^\s+//;
3469 s/\s+/ /g; 4329 s/\s+/ /g;
3470 } 4330 }
3471 4331
3472 new CFClient::UI::Label 4332 new DC::UI::Label
3473 markup => $short, 4333 markup => $short,
3474 tooltip => $item->{tooltip}, 4334 tooltip => $item->{tooltip},
3475 tooltip_font => $::FONT_PROP, 4335 tooltip_font => $::FONT_PROP,
3476 tooltip_width => 0.67, 4336 tooltip_width => 0.67,
3477 fontsize => $item->{fontsize} || $self->{fontsize}, 4337 fontsize => $item->{fontsize} || $self->{fontsize},
3478 max_w => $::WIDTH * 0.44, 4338 max_w => $::WIDTH * 0.44,
4339 align => 0,
3479 fg => [@{ $item->{fg} }], 4340 fg => [@{ $item->{fg} }],
3480 can_events => 1, 4341 can_events => 1,
3481 can_hover => 1 4342 can_hover => 1
3482 }; 4343 };
3483 4344
3484 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4345 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3485 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4346 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3486 $label->update; 4347 $label->update;
3487 $label->set_max_size (undef, $label->{req_h} * $diff) 4348 $label->set_max_size (undef, $label->{req_h} * $diff)
3488 if $diff < 1; 4349 if $diff < 1;
3489 $self->{timer}->interval (1/30); 4350 $self->{timer}->set (1/30, 1/30);
3490 } else { 4351 } else {
3491 $label->{fg}[3] = $item->{fg}[3] || 1; 4352 $label->{fg}[3] = $item->{fg}[3] || 1;
3492 } 4353 }
3493 4354
3494 push @widgets, $label; 4355 push @widgets, $label;
3495 } 4356 }
4357
4358 my $hash = join ",", @widgets;
4359 return if $hash eq $self->{last_widget_hash};
4360 $self->{last_widget_hash} = $hash;
3496 4361
3497 $self->clear; 4362 $self->clear;
3498 $self->SUPER::add (reverse @widgets); 4363 $self->SUPER::add (reverse @widgets);
3499} 4364}
3500 4365
… …
3556 $self->SUPER::destroy; 4421 $self->SUPER::destroy;
3557} 4422}
3558 4423
3559############################################################################# 4424#############################################################################
3560 4425
3561package CFClient::UI::Inventory;
3562
3563our @ISA = CFClient::UI::Table::;
3564
3565sub new {
3566 my $class = shift;
3567
3568 my $self = $class->SUPER::new (
3569 col_expand => [0, 1, 0],
3570 items => [],
3571 @_,
3572 );
3573
3574 $self->set_sort_order (undef);
3575
3576 $self
3577}
3578
3579sub update_items {
3580 my ($self) = @_;
3581
3582 $self->clear;
3583
3584 my @item = $self->{sort}->(@{ $self->{items} });
3585
3586 my @adds;
3587 my $row = 0;
3588 for my $item ($self->{sort}->(@{ $self->{items} })) {
3589 CFClient::Item::update_widgets $item;
3590
3591 push @adds, 0, $row, $item->{face_widget};
3592 push @adds, 1, $row, $item->{desc_widget};
3593 push @adds, 2, $row, $item->{weight_widget};
3594
3595 $row++;
3596 }
3597
3598 $self->add (@adds);
3599}
3600
3601sub set_sort_order {
3602 my ($self, $order) = @_;
3603
3604 $self->{sort} = $order ||= sub {
3605 sort {
3606 $a->{type} <=> $b->{type}
3607 or $a->{name} cmp $b->{name}
3608 } @_
3609 };
3610
3611 $self->update_items;
3612}
3613
3614sub set_items {
3615 my ($self, $items) = @_;
3616
3617 $self->{items} = [$items ? values %$items : ()];
3618 $self->update_items;
3619}
3620
3621#############################################################################
3622
3623package CFClient::UI::SpellList;
3624
3625our @ISA = CFClient::UI::Table::;
3626
3627sub new {
3628 my $class = shift;
3629
3630 my $self = $class->SUPER::new (
3631 binding => [],
3632 commands => [],
3633 @_,
3634 )
3635}
3636
3637my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3638
3639my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3640 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3641my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3642 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3643my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3644 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3645my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3646 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3647my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3648 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3649
3650sub rebuild_spell_list {
3651 my ($self) = @_;
3652
3653 $CFClient::UI::ROOT->on_refresh ($self => sub {
3654 $self->clear;
3655
3656 return unless $::CONN;
3657
3658 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3659 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3660 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3661 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3662 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3663
3664 my $row = 0;
3665
3666 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3667 my $spell = $self->{spell}{$_};
3668
3669 $row++;
3670
3671 my $spell_cb = sub {
3672 my ($widget, $ev) = @_;
3673
3674 if ($ev->{button} == 1) {
3675 $::CONN->user_send ("cast $spell->{name}");
3676 } elsif ($ev->{button} == 2) {
3677 $::CONN->user_send ("invoke $spell->{name}");
3678 } elsif ($ev->{button} == 3) {
3679 (new CFClient::UI::Menu
3680 items => [
3681 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3682 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3683 ],
3684 )->popup ($ev);
3685 } else {
3686 return 0;
3687 }
3688
3689 1
3690 };
3691
3692 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3693
3694 #TODO: add path info to tooltip
3695 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3696
3697 $self->add (0, $row, new CFClient::UI::Face
3698 face => $spell->{face},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (1, $row, new CFClient::UI::Label
3706 expand => 1,
3707 text => $spell->{name},
3708 can_hover => 1,
3709 can_events => 1,
3710 tooltip => $tooltip,
3711 on_button_down => $spell_cb,
3712 );
3713
3714 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3715 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3716 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3717 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3718 }
3719 });
3720}
3721
3722sub add_spell {
3723 my ($self, $spell) = @_;
3724
3725 $self->{spell}->{$spell->{name}} = $spell;
3726 $self->rebuild_spell_list;
3727}
3728
3729sub remove_spell {
3730 my ($self, $spell) = @_;
3731
3732 delete $self->{spell}->{$spell->{name}};
3733 $self->rebuild_spell_list;
3734}
3735
3736sub clear_spells {
3737 my ($self) = @_;
3738
3739 $self->{spell} = {};
3740 $self->rebuild_spell_list;
3741}
3742
3743#############################################################################
3744
3745package CFClient::UI::Root; 4426package DC::UI::Root;
3746 4427
3747our @ISA = CFClient::UI::Container::; 4428our @ISA = DC::UI::Container::;
3748 4429
3749use List::Util qw(min max); 4430use List::Util qw(min max);
3750 4431
3751use CFClient::OpenGL; 4432use DC::OpenGL;
3752 4433
3753sub new { 4434sub new {
3754 my $class = shift; 4435 my $class = shift;
3755 4436
3756 my $self = $class->SUPER::new ( 4437 my $self = $class->SUPER::new (
3757 visible => 1, 4438 visible => 1,
3758 @_, 4439 @_,
3759 ); 4440 );
3760 4441
3761 Scalar::Util::weaken ($self->{root} = $self); 4442 DC::weaken ($self->{root} = $self);
3762 4443
3763 $self 4444 $self
3764} 4445}
3765 4446
3766sub size_request { 4447sub size_request {
… …
3814} 4495}
3815 4496
3816sub update { 4497sub update {
3817 my ($self) = @_; 4498 my ($self) = @_;
3818 4499
3819 $::WANT_REFRESH++; 4500 $::WANT_REFRESH = 1;
3820} 4501}
3821 4502
3822sub add { 4503sub add {
3823 my ($self, @children) = @_; 4504 my ($self, @children) = @_;
3824 4505
… …
3861 while ($self->{refresh_hook}) { 4542 while ($self->{refresh_hook}) {
3862 $_->() 4543 $_->()
3863 for values %{delete $self->{refresh_hook}}; 4544 for values %{delete $self->{refresh_hook}};
3864 } 4545 }
3865 4546
3866 if ($self->{realloc}) { 4547 while ($self->{realloc}) {
3867 my %queue; 4548 my %queue;
3868 my @queue; 4549 my @queue;
3869 my $widget; 4550 my $widget;
3870 4551
3871 outer: 4552 outer:
… …
3891 4572
3892 delete $queue{$widget+0}; 4573 delete $queue{$widget+0};
3893 4574
3894 my ($w, $h) = $widget->size_request; 4575 my ($w, $h) = $widget->size_request;
3895 4576
3896 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4577 $w += $widget->{padding_x} * 2;
3897 $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;
3898 4582
3899 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4583 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3900 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4584 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3901 4585
3902 $w = $widget->{force_w} if exists $widget->{force_w}; 4586 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3918 } 4602 }
3919 } 4603 }
3920 4604
3921 delete $self->{realloc}{$widget+0}; 4605 delete $self->{realloc}{$widget+0};
3922 } 4606 }
3923 }
3924 4607
3925 while (my $size_alloc = delete $self->{size_alloc}) { 4608 while (my $size_alloc = delete $self->{size_alloc}) {
3926 my @queue = sort { $b->{visible} <=> $a->{visible} } 4609 my @queue = sort { $a->{visible} <=> $b->{visible} }
3927 values %$size_alloc; 4610 values %$size_alloc;
3928 4611
3929 while () { 4612 while () {
3930 my $widget = pop @queue || last; 4613 my $widget = pop @queue || last;
3931 4614
3932 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4615 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3933 4616
3934 $w = 0 if $w < 0;
3935 $h = 0 if $h < 0;
3936
3937 $w = max $widget->{min_w}, $w; 4617 $w = max $widget->{min_w}, $w;
3938 $h = max $widget->{min_h}, $h; 4618 $h = max $widget->{min_h}, $h;
3939 4619
4620# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4621# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4622
3940 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4623 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4624 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942 4625
3943 $w = int $w + 0.5; 4626 $w = int $w + 0.5;
3944 $h = int $h + 0.5; 4627 $h = int $h + 0.5;
3945 4628
3946 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}) {
3947 $widget->{old_w} = $widget->{w}; 4630 $widget->{old_w} = $widget->{w};
3948 $widget->{old_h} = $widget->{h}; 4631 $widget->{old_h} = $widget->{h};
3949 4632
3950 $widget->{w} = $w; 4633 $widget->{w} = $w;
3951 $widget->{h} = $h; 4634 $widget->{h} = $h;
3952 4635
3953 $widget->emit (size_allocate => $w, $h); 4636 $widget->emit (size_allocate => $w, $h);
4637 }
3954 } 4638 }
3955 } 4639 }
3956 } 4640 }
3957 4641
3958 while ($self->{post_alloc_hook}) { 4642 while ($self->{post_alloc_hook}) {
3959 $_->() 4643 $_->()
3960 for values %{delete $self->{post_alloc_hook}}; 4644 for values %{delete $self->{post_alloc_hook}};
3961 } 4645 }
3962
3963 4646
3964 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4647 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3965 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4648 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3966 glClear GL_COLOR_BUFFER_BIT; 4649 glClear GL_COLOR_BUFFER_BIT;
3967 4650
… …
3970 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4653 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3971 glMatrixMode GL_MODELVIEW; 4654 glMatrixMode GL_MODELVIEW;
3972 glLoadIdentity; 4655 glLoadIdentity;
3973 4656
3974 { 4657 {
3975 package CFClient::UI::Base; 4658 package DC::UI::Base;
3976 4659
3977 ($draw_x, $draw_y, $draw_w, $draw_h) = 4660 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3978 (0, 0, $self->{w}, $self->{h}); 4661 (0, 0, $self->{w}, $self->{h});
3979 }
3980 4662
3981 $self->_draw; 4663 $self->_draw;
4664 }
3982} 4665}
3983 4666
3984############################################################################# 4667#############################################################################
3985 4668
3986package CFClient::UI; 4669package DC::UI;
3987 4670
3988$ROOT = new CFClient::UI::Root; 4671$ROOT = new DC::UI::Root;
3989$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4672$TOOLTIP = new DC::UI::Tooltip z => 900;
3990 4673
39911 46741
3992

Diff Legend

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