ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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