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.484 by root, Sun Jan 8 07:58:39 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
… …
346} 363}
347 364
348sub set_size { 365sub set_size {
349 my ($self, $w, $h) = @_; 366 my ($self, $w, $h) = @_;
350 367
351 $self->{force_w} = $w; 368 $self->{force_w} = List::Util::min $w, ($self->{max_w} || $::WIDTH );
352 $self->{force_h} = $h; 369 $self->{force_h} = List::Util::min $h, ($self->{max_h} || $::HEIGHT);
353 370
354 $self->realloc; 371 $self->realloc;
372}
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)
355} 390}
356 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";
… …
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
… …
1238 my ($self, $ev, $x, $y) = @_; 1474 my ($self, $ev, $x, $y) = @_;
1239 1475
1240 my ($w, $h) = @$self{qw(w h)}; 1476 my ($w, $h) = @$self{qw(w h)};
1241 my $border = $self->border; 1477 my $border = $self->border;
1242 1478
1243 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); 1479 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); # left-right
1244 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); 1480 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); # top-down
1245 1481
1246 if ($lr & $td) { 1482 if ($lr & $td) { # corners
1247 my ($wx, $wy) = ($self->{x}, $self->{y}); 1483 my ($wx, $wy) = ($self->{x}, $self->{y});
1248 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1484 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1249 my ($bw, $bh) = ($self->{w}, $self->{h}); 1485 my ($bw, $bh) = ($self->{w}, $self->{h});
1250 1486
1251 my $mx = $x < $border; 1487 my $mx = $x < $border;
… …
1255 my ($ev, $x, $y) = @_; 1491 my ($ev, $x, $y) = @_;
1256 1492
1257 my $dx = $ev->{x} - $ox; 1493 my $dx = $ev->{x} - $ox;
1258 my $dy = $ev->{y} - $oy; 1494 my $dy = $ev->{y} - $oy;
1259 1495
1496 $self->set_size (
1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1497 $bw + $dx * ($mx ? -1 : 1),
1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1498 $bh + $dy * ($my ? -1 : 1),
1499 );
1262 1500
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my); 1501 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1264 $self->realloc; 1502 $self->realloc;
1265 }; 1503 };
1266 1504
1267 } elsif ($lr ^ $td) { 1505 } elsif ($lr ^ $td) { # edges
1268 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1506 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1269 my ($bx, $by) = ($self->{x}, $self->{y}); 1507 my ($bx, $by) = ($self->{x}, $self->{y});
1270 1508
1271 $self->{motion} = sub { 1509 $self->{motion} = sub {
1272 my ($ev, $x, $y) = @_; 1510 my ($ev, $x, $y) = @_;
… …
1296 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1534 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297 1535
1298 ! ! $self->{motion} 1536 ! ! $self->{motion}
1299} 1537}
1300 1538
1539sub invoke_visibility_change {
1540 my ($self, $visible) = @_;
1541
1542 delete $self->{motion} unless $visible;
1543
1544 0
1545}
1546
1301sub _draw { 1547sub _draw {
1302 my ($self) = @_; 1548 my ($self) = @_;
1303 1549
1304 my $child = $self->{children}[0]; 1550 my $child = $self->{children}[0];
1305 1551
… …
1309 glEnable GL_TEXTURE_2D; 1555 glEnable GL_TEXTURE_2D;
1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311 1557
1312 my $border = $self->border; 1558 my $border = $self->border;
1313 1559
1560 if ($border) {
1314 glColor @{ $self->{border_bg} }; 1561 glColor @{ $self->{border_bg} };
1315 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1562 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1563 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1564 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1565 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1566
1567 # move
1568 my $w2 = ($w - $border) * .5;
1569 my $h2 = ($h - $border) * .5;
1570 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1571 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1572 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1573
1574 # resize
1575 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1576 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1577 unless $self->{has_close_button};
1578 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1579 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1580 }
1319 1581
1320 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1582 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321 glColor @{ $self->{bg} }; 1583 glColor @{ $self->{bg} };
1322 1584
1323 # TODO: repeat texture not scale 1585 # TODO: repeat texture not scale
… …
1342 if $self->{close_button}; 1604 if $self->{close_button};
1343} 1605}
1344 1606
1345############################################################################# 1607#############################################################################
1346 1608
1347package CFClient::UI::Table; 1609package DC::UI::Table;
1348 1610
1349our @ISA = CFClient::UI::Base::; 1611our @ISA = DC::UI::Container::;
1350 1612
1351use List::Util qw(max sum); 1613use List::Util qw(max sum);
1352 1614
1353use CFClient::OpenGL; 1615use DC::OpenGL;
1354 1616
1355sub new { 1617sub new {
1356 my $class = shift; 1618 my $class = shift;
1357 1619
1358 $class->SUPER::new ( 1620 $class->SUPER::new (
1359 col_expand => [], 1621 col_expand => [],
1622 row_expand => [],
1360 @_, 1623 @_,
1361 ) 1624 )
1362} 1625}
1363 1626
1364sub children {
1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366}
1367
1368sub add { 1627sub add {
1628 my ($self, @widgets) = @_;
1629
1630 for my $child (@widgets) {
1631 $child->{c_rowspan} ||= 1;
1632 $child->{c_colspan} ||= 1;
1633 }
1634
1635 $self->SUPER::add (@widgets);
1636}
1637
1638sub add_at {
1369 my ($self) = shift; 1639 my $self = shift;
1640
1641 my @widgets;
1370 1642
1371 while (@_) { 1643 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, (); 1644 my ($col, $row, $child) = splice @_, 0, 3, ();
1373 $child->set_parent ($self);
1374 $self->{children}[$y][$x] = $child;
1375 }
1376 1645
1377 $self->{force_realloc} = 1; 1646 $child->{c_row} = $row;
1378 $self->{force_size_alloc} = 1; 1647 $child->{c_col} = $col;
1379 $self->realloc;
1380}
1381 1648
1382sub remove { 1649 push @widgets, $child;
1650 }
1651
1652 $self->add (@widgets);
1653}
1654
1655sub get_wh {
1383 my ($self, $child) = @_; 1656 my ($self) = @_;
1384 1657
1385 # TODO: not yet implemented 1658 my (@w, @h);
1386}
1387
1388# TODO: move to container class maybe? send children a signal on removal?
1389sub clear {
1390 my ($self) = @_;
1391 1659
1392 my @children = $self->children; 1660 my @children = $self->children;
1393 delete $self->{children}; 1661
1662 # first pass, columns
1663 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1664 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1665
1666 my $sw = sum @w[$c .. $c + $cs - 1];
1667
1668 if ($w > $sw) {
1669 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1670 }
1394 1671 }
1395 for (@children) {
1396 delete $_->{parent};
1397 $_->hide;
1398 }
1399 1672
1400 $self->realloc; 1673 # second pass, rows
1401} 1674 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)}; 1675 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1416 1676
1417 $w[$x] = max $w[$x], $w; 1677 my $sh = sum @h[$r .. $r + $rs - 1];
1418 $h[$y] = max $h[$y], $h; 1678
1679 if ($h > $sh) {
1680 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1419 } 1681 }
1420 } 1682 }
1421 1683
1422 (\@w, \@h) 1684 (\@w, \@h)
1423} 1685}
… …
1439 my ($ws, $hs) = $self->get_wh; 1701 my ($ws, $hs) = $self->get_wh;
1440 1702
1441 my $req_w = (sum @$ws) || 1; 1703 my $req_w = (sum @$ws) || 1;
1442 my $req_h = (sum @$hs) || 1; 1704 my $req_h = (sum @$hs) || 1;
1443 1705
1444 # TODO: nicer code && do row_expand 1706 # now linearly scale the rows/columns to the allocated size
1445 my @col_expand = @{$self->{col_expand}}; 1707 my @col_expand = @{$self->{col_expand}};
1446 @col_expand = (1) x @$ws unless @col_expand; 1708 @col_expand = (1) x @$ws unless @col_expand;
1447 my $col_expand = (sum @col_expand) || 1; 1709 my $col_expand = (sum @col_expand) || 1;
1448 1710
1449 # linearly scale sizes
1450 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1711 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452 1712
1453 CFClient::UI::harmonize $ws; 1713 DC::UI::harmonize $ws;
1714
1715 my @row_expand = @{$self->{row_expand}};
1716 @row_expand = (1) x @$ws unless @row_expand;
1717 my $row_expand = (sum @row_expand) || 1;
1718
1719 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1720
1454 CFClient::UI::harmonize $hs; 1721 DC::UI::harmonize $hs;
1455 1722
1456 my $y; 1723 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1724 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1457 1725
1458 for my $r (0 .. $#{$self->{children}}) { 1726 for my $widget ($self->children) {
1459 my $row = $self->{children}[$r] 1727 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 1728
1462 my $x = 0; 1729 $widget->configure (
1463 my $row_h = $hs->[$r]; 1730 $x[$c], $y[$r],
1731 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1464 1732 );
1465 for my $c (0 .. $#$row) { 1733 }
1466 my $col_w = $ws->[$c];
1467 1734
1468 if (my $widget = $row->[$c]) { 1735 1
1469 $widget->configure ($x, $y, $col_w, $row_h); 1736}
1470 }
1471 1737
1472 $x += $col_w; 1738#############################################################################
1739
1740package DC::UI::Fixed;
1741
1742use List::Util qw(min max);
1743
1744our @ISA = DC::UI::Container::;
1745
1746sub _scale($$$) {
1747 my ($rel, $val, $max) = @_;
1748
1749 $rel ? $val * $max : $val
1750}
1751
1752sub size_request {
1753 my ($self) = @_;
1754
1755 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1756
1757 # determine overall size by querying abs widgets
1758 for my $child ($self->visible_children) {
1759 unless ($child->{c_rel}) {
1760 my $x = $child->{c_x};
1761 my $y = $child->{c_y};
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1473 } 1765 }
1766 }
1474 1767
1475 $y += $row_h; 1768 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1;
1770
1771 # now layout remaining widgets
1772 for my $child ($self->visible_children) {
1773 if ($child->{c_rel}) {
1774 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1775 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1776
1777 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1778 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1779 }
1780 }
1781
1782 my $W = $x2 - $x1;
1783 my $H = $y2 - $y1;
1784
1785 ($W, $H)
1786}
1787
1788sub invoke_size_allocate {
1789 my ($self, $W, $H) = @_;
1790
1791 for my $child ($self->visible_children) {
1792 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1793 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1794
1795 $x += $child->{c_halign} * $child->{req_w};
1796 $y += $child->{c_valign} * $child->{req_h};
1797
1798 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1476 } 1799 }
1477 1800
1478 1 1801 1
1479} 1802}
1480 1803
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############################################################################# 1804#############################################################################
1506 1805
1507package CFClient::UI::Box; 1806package DC::UI::Box;
1508 1807
1509our @ISA = CFClient::UI::Container::; 1808our @ISA = DC::UI::Container::;
1510 1809
1511sub size_request { 1810sub size_request {
1512 my ($self) = @_; 1811 my ($self) = @_;
1812
1813 my @children = $self->visible_children;
1513 1814
1514 $self->{vertical} 1815 $self->{vertical}
1515 ? ( 1816 ? (
1516 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1817 (List::Util::max map $_->{req_w}, @children),
1517 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_h}, @children),
1518 ) 1819 )
1519 : ( 1820 : (
1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1821 (List::Util::sum map $_->{req_w}, @children),
1521 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1822 (List::Util::max map $_->{req_h}, @children),
1522 ) 1823 )
1523} 1824}
1524 1825
1525sub invoke_size_allocate { 1826sub invoke_size_allocate {
1526 my ($self, $w, $h) = @_; 1827 my ($self, $w, $h) = @_;
… …
1547 $req[$_] += $space * $children[$_]{expand} 1848 $req[$_] += $space * $children[$_]{expand}
1548 for 0 .. $#children; 1849 for 0 .. $#children;
1549 } 1850 }
1550 } 1851 }
1551 1852
1552 CFClient::UI::harmonize \@req; 1853 DC::UI::harmonize \@req;
1553 1854
1554 my $pos = 0; 1855 my $pos = 0;
1555 for (0 .. $#children) { 1856 for (0 .. $#children) {
1556 my $alloc = $req[$_]; 1857 my $alloc = $req[$_];
1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1858 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1562 1 1863 1
1563} 1864}
1564 1865
1565############################################################################# 1866#############################################################################
1566 1867
1567package CFClient::UI::HBox; 1868package DC::UI::HBox;
1568 1869
1569our @ISA = CFClient::UI::Box::; 1870our @ISA = DC::UI::Box::;
1570 1871
1571sub new { 1872sub new {
1572 my $class = shift; 1873 my $class = shift;
1573 1874
1574 $class->SUPER::new ( 1875 $class->SUPER::new (
… …
1577 ) 1878 )
1578} 1879}
1579 1880
1580############################################################################# 1881#############################################################################
1581 1882
1582package CFClient::UI::VBox; 1883package DC::UI::VBox;
1583 1884
1584our @ISA = CFClient::UI::Box::; 1885our @ISA = DC::UI::Box::;
1585 1886
1586sub new { 1887sub new {
1587 my $class = shift; 1888 my $class = shift;
1588 1889
1589 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1592 ) 1893 )
1593} 1894}
1594 1895
1595############################################################################# 1896#############################################################################
1596 1897
1597package CFClient::UI::Label; 1898package DC::UI::Label;
1598 1899
1599our @ISA = CFClient::UI::DrawBG::; 1900our @ISA = DC::UI::DrawBG::;
1600 1901
1601use CFClient::OpenGL; 1902use DC::OpenGL;
1602 1903
1603sub new { 1904sub new {
1604 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1605 1906
1606 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
… …
1609 #active_bg => none 1910 #active_bg => none
1610 #font => default_font 1911 #font => default_font
1611 #text => initial text 1912 #text => initial text
1612 #markup => initial narkup 1913 #markup => initial narkup
1613 #max_w => maximum pixel width 1914 #max_w => maximum pixel width
1915 #style => 0, # render flags
1614 ellipsise => 3, # end 1916 ellipsise => 3, # end
1615 layout => (new CFClient::Layout), 1917 layout => (new DC::Layout),
1616 fontsize => 1, 1918 fontsize => 1,
1617 align => -1, 1919 align => 0.5,
1618 valign => -1, 1920 valign => 0.5,
1619 padding_x => 2, 1921 padding_x => 4,
1620 padding_y => 2, 1922 padding_y => 2,
1621 can_events => 0, 1923 can_events => 0,
1622 %arg 1924 %arg
1623 ); 1925 );
1624 1926
1625 if (exists $self->{template}) { 1927 if (exists $self->{template}) {
1626 my $layout = new CFClient::Layout; 1928 my $layout = new DC::Layout;
1627 $layout->set_text (delete $self->{template}); 1929 $layout->set_text (delete $self->{template});
1628 $self->{template} = $layout; 1930 $self->{template} = $layout;
1629 } 1931 }
1630 1932
1631 if (exists $self->{markup}) { 1933 if (exists $self->{markup}) {
… …
1649 1951
1650 delete $self->{ox}; 1952 delete $self->{ox};
1651 $self->SUPER::realloc; 1953 $self->SUPER::realloc;
1652} 1954}
1653 1955
1956sub clear {
1957 my ($self) = @_;
1958
1959 $self->set_text ("");
1960}
1961
1654sub set_text { 1962sub set_text {
1655 my ($self, $text) = @_; 1963 my ($self, $text) = @_;
1656 1964
1657 return if $self->{text} eq "T$text"; 1965 return if $self->{text} eq "T$text";
1658 $self->{text} = "T$text"; 1966 $self->{text} = "T$text";
… …
1681 1989
1682sub size_request { 1990sub size_request {
1683 my ($self) = @_; 1991 my ($self) = @_;
1684 1992
1685 $self->{size_req} ||= do { 1993 $self->{size_req} ||= do {
1994 my ($max_w, $max_h) = $self->get_max_wh;
1995
1686 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1996 $self->{layout}->set_font ($self->{font}) if $self->{font};
1687 $self->{layout}->set_width ($self->{max_w} || -1); 1997 $self->{layout}->set_width ($max_w);
1688 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1998 $self->{layout}->set_ellipsise ($self->{ellipsise});
1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1999 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2000 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1691 2001
1692 my ($w, $h) = $self->{layout}->size; 2002 my ($w, $h) = $self->{layout}->size;
1693 2003
1694 if (exists $self->{template}) { 2004 if (exists $self->{template}) {
1695 $self->{template}->set_font ($self->{font}) if $self->{font}; 2005 $self->{template}->set_font ($self->{font}) if $self->{font};
1696 $self->{template}->set_width ($self->{max_w} || -1); 2006 $self->{template}->set_width ($max_w);
1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2007 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1698 2008
1699 my ($w2, $h2) = $self->{template}->size; 2009 my ($w2, $h2) = $self->{template}->size;
1700 2010
1701 $w = List::Util::max $w, $w2; 2011 $w = List::Util::max $w, $w2;
… …
1757 2067
1758 [$self->{layout}->size] 2068 [$self->{layout}->size]
1759 }; 2069 };
1760 2070
1761 unless (exists $self->{ox}) { 2071 unless (exists $self->{ox}) {
1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2072 $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} 2073 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1764 : ($self->{w} - $size->[0]) * 0.5);
1765 2074
1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2075 $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 }; 2076 };
1770 2077
1771 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2078# unless ($self->{list}) {
1772 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2079# $self->{list} = DC::OpenGL::glGenList;
1773 2080# DC::OpenGL::glNewList $self->{list};
1774 $self->{layout}->render ($self->{ox}, $self->{oy}); 2081# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2082# DC::OpenGL::glEndList;
2083# }
2084#
2085# DC::OpenGL::glCallList $self->{list};
2086
2087 $self->{layout}->draw;
1775} 2088}
2089
2090#sub destroy {
2091# my ($self) = @_;
2092#
2093# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2094#
2095# $self->SUPER::destroy;
2096#}
1776 2097
1777############################################################################# 2098#############################################################################
1778 2099
1779package CFClient::UI::EntryBase; 2100package DC::UI::EntryBase;
1780 2101
1781our @ISA = CFClient::UI::Label::; 2102our @ISA = DC::UI::Label::;
1782 2103
1783use CFClient::OpenGL; 2104use DC::OpenGL;
1784 2105
1785sub new { 2106sub new {
1786 my $class = shift; 2107 my $class = shift;
1787 2108
1788 $class->SUPER::new ( 2109 $class->SUPER::new (
1789 fg => [1, 1, 1], 2110 fg => [1, 1, 1],
1790 bg => [0, 0, 0, 0.2], 2111 bg => [0, 0, 0, 0.2],
2112 outline => undef,
1791 active_bg => [1, 1, 1, 0.5], 2113 active_bg => [0, 0, 1, .2],
1792 active_fg => [0, 0, 0], 2114 active_fg => [1, 1, 1],
2115 active_outline => [1, 1, 0],
1793 can_hover => 1, 2116 can_hover => 1,
1794 can_focus => 1, 2117 can_focus => 1,
2118 align => 0,
1795 valign => 0, 2119 valign => 0.5,
1796 can_events => 1, 2120 can_events => 1,
2121 ellipsise => 0,
2122 padding_x => 4,
2123 padding_y => 2,
1797 #text => ... 2124 #text => ...
1798 #hidden => "*", 2125 #hidden => "*",
1799 @_ 2126 @_
1800 ) 2127 )
1801} 2128}
… …
1846 my $sym = $ev->{sym}; 2173 my $sym = $ev->{sym};
1847 my $uni = $ev->{unicode}; 2174 my $uni = $ev->{unicode};
1848 2175
1849 my $text = $self->get_text; 2176 my $text = $self->get_text;
1850 2177
1851 if ($uni == 8) { 2178 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2179
2180 if ($sym == DC::SDLK_BACKSPACE) {
1852 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2181 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853 } elsif ($uni == 127) { 2182 } elsif ($sym == DC::SDLK_DELETE) {
1854 substr $text, $self->{cursor}, 1, ""; 2183 substr $text, $self->{cursor}, 1, "";
1855 } elsif ($sym == CFClient::SDLK_LEFT) { 2184 } elsif ($sym == DC::SDLK_LEFT) {
1856 --$self->{cursor} if $self->{cursor}; 2185 --$self->{cursor} if $self->{cursor};
1857 } elsif ($sym == CFClient::SDLK_RIGHT) { 2186 } elsif ($sym == DC::SDLK_RIGHT) {
1858 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2187 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1859 } elsif ($sym == CFClient::SDLK_HOME) { 2188 } elsif ($sym == DC::SDLK_HOME) {
2189 # what a hack
2190 $self->{cursor} =
2191 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2192 ? length $1
2193 : 0;
2194 } elsif ($sym == DC::SDLK_END) {
2195 # uh, again
2196 $self->{cursor} =
2197 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2198 ? $self->{cursor} + length $1
2199 : length $self->{text};
2200 } elsif ($uni == 21) { # ctrl-u
2201 $text = "";
1860 $self->{cursor} = 0; 2202 $self->{cursor} = 0;
1861 } elsif ($sym == CFClient::SDLK_END) {
1862 $self->{cursor} = length $text;
1863 } elsif ($uni == 27) { 2203 } elsif ($uni == 27) {
1864 $self->emit ('escape'); 2204 $self->emit ('escape');
1865 } elsif ($uni) { 2205 } elsif ($uni == 0x0d) {
2206 substr $text, $self->{cursor}++, 0, "\012";
2207 } elsif ($uni >= 0x20) {
1866 substr $text, $self->{cursor}++, 0, chr $uni; 2208 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else { 2209 } else {
1868 return 0; 2210 return 0;
1869 } 2211 }
1870 2212
1871 $self->_set_text ($text); 2213 $self->_set_text ($text);
1872 2214
1873 $self->realloc; 2215 $self->realloc;
2216 $self->update;
1874 2217
1875 1 2218 1
1876} 2219}
1877 2220
1878sub invoke_focus_in { 2221sub invoke_focus_in {
… …
1920 glColor_premultiply @{$self->{bg}}; 2263 glColor_premultiply @{$self->{bg}};
1921 } 2264 }
1922 2265
1923 glEnable GL_BLEND; 2266 glEnable GL_BLEND;
1924 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2267 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}; 2268 glRect 0, 0, $self->{w}, $self->{h};
1929 glVertex $self->{w}, 0;
1930 glEnd;
1931 glDisable GL_BLEND; 2269 glDisable GL_BLEND;
1932 2270
1933 $self->SUPER::_draw; 2271 $self->SUPER::_draw;
1934 2272
1935 #TODO: force update every cursor change :( 2273 #TODO: force update every cursor change :(
… …
1937 2275
1938 unless (exists $self->{cur_h}) { 2276 unless (exists $self->{cur_h}) {
1939 my $text = substr $self->{text}, 0, $self->{cursor}; 2277 my $text = substr $self->{text}, 0, $self->{cursor};
1940 utf8::encode $text; 2278 utf8::encode $text;
1941 2279
1942 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2280 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1943 } 2281 }
1944 2282
1945 glColor @{$self->{fg}}; 2283 glColor_premultiply @{$self->{active_fg}};
1946 glBegin GL_LINES; 2284 glBegin GL_LINES;
1947 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2285 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}; 2286 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949 glEnd; 2287 glEnd;
1950 }
1951}
1952 2288
2289 glLineWidth 3;
2290 glColor @{$self->{active_outline}};
2291 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2292 glLineWidth 1;
2293
2294 } else {
2295 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2296 glBegin GL_LINE_STRIP;
2297 glVertex .5, $self->{h} * .5;
2298 glVertex .5, $self->{h} - 2.5;
2299 glVertex $self->{w} - .5, $self->{h} - 2.5;
2300 glVertex $self->{w} - .5, $self->{h} * .5;
2301 glEnd;
2302 }
2303}
2304
2305#############################################################################
2306
1953package CFClient::UI::Entry; 2307package DC::UI::Entry;
1954 2308
1955our @ISA = CFClient::UI::EntryBase::; 2309our @ISA = DC::UI::EntryBase::;
1956 2310
1957use CFClient::OpenGL; 2311use DC::OpenGL;
2312
2313sub new {
2314 my $class = shift;
2315
2316 $class->SUPER::new (
2317 history_pointer => -1,
2318 @_
2319 )
2320}
2321
1958 2322
1959sub invoke_key_down { 2323sub invoke_key_down {
1960 my ($self, $ev) = @_; 2324 my ($self, $ev) = @_;
1961 2325
1962 my $sym = $ev->{sym}; 2326 my $sym = $ev->{sym};
1963 2327
1964 if ($sym == 13) { 2328 if ($ev->{uni} == 0x0d || $sym == 13) {
1965 unshift @{$self->{history}}, 2329 unshift @{$self->{history}},
1966 my $txt = $self->get_text; 2330 my $txt = $self->get_text;
1967 2331
1968 $self->{history_pointer} = -1; 2332 $self->{history_pointer} = -1;
1969 $self->{history_saveback} = ''; 2333 $self->{history_saveback} = '';
1970 $self->emit (activate => $txt); 2334 $self->emit (activate => $txt);
1971 $self->update; 2335 $self->update;
1972 2336
1973 } elsif ($sym == CFClient::SDLK_UP) { 2337 } elsif ($sym == DC::SDLK_UP) {
1974 if ($self->{history_pointer} < 0) { 2338 if ($self->{history_pointer} < 0) {
1975 $self->{history_saveback} = $self->get_text; 2339 $self->{history_saveback} = $self->get_text;
1976 } 2340 }
1977 if (@{$self->{history} || []} > 0) { 2341 if (@{$self->{history} || []} > 0) {
1978 $self->{history_pointer}++; 2342 $self->{history_pointer}++;
… …
1980 $self->{history_pointer} = @{$self->{history} || []} - 1; 2344 $self->{history_pointer} = @{$self->{history} || []} - 1;
1981 } 2345 }
1982 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2346 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1983 } 2347 }
1984 2348
1985 } elsif ($sym == CFClient::SDLK_DOWN) { 2349 } elsif ($sym == DC::SDLK_DOWN) {
1986 $self->{history_pointer}--; 2350 $self->{history_pointer}--;
1987 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2351 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988 2352
1989 if ($self->{history_pointer} >= 0) { 2353 if ($self->{history_pointer} >= 0) {
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2354 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1991 } else { 2355 } else {
2356 if (defined $self->{history_saveback}) {
1992 $self->set_text ($self->{history_saveback}); 2357 $self->set_text ($self->{history_saveback});
2358 $self->{history_saveback} = undef;
2359 }
1993 } 2360 }
1994 2361
1995 } else { 2362 } else {
1996 return $self->SUPER::invoke_key_down ($ev) 2363 return $self->SUPER::invoke_key_down ($ev)
1997 } 2364 }
… …
1999 1 2366 1
2000} 2367}
2001 2368
2002############################################################################# 2369#############################################################################
2003 2370
2004package CFClient::UI::Button; 2371package DC::UI::TextEdit;
2005 2372
2006our @ISA = CFClient::UI::Label::; 2373our @ISA = DC::UI::EntryBase::;
2007 2374
2008use CFClient::OpenGL; 2375use DC::OpenGL;
2009
2010my @tex =
2011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2012 qw(b1_button_active.png);
2013 2376
2014sub new { 2377sub new {
2015 my $class = shift; 2378 my $class = shift;
2016 2379
2017 $class->SUPER::new ( 2380 $class->SUPER::new (
2018 padding_x => 4,
2019 padding_y => 4, 2381 padding_y => 4,
2020 fg => [1, 1, 1], 2382
2021 active_fg => [0, 0, 1], 2383 @_
2384 )
2385}
2386
2387sub move_cursor_ver {
2388 my ($self, $dy) = @_;
2389
2390 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2391
2392 $line += $dy;
2393
2394 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2395 $self->{cursor} = $index;
2396 delete $self->{cur_h};
2397 $self->update;
2398 return;
2399 }
2400}
2401
2402sub invoke_key_down {
2403 my ($self, $ev) = @_;
2404
2405 my $sym = $ev->{sym};
2406
2407 if ($sym == DC::SDLK_UP) {
2408 $self->move_cursor_ver (-1);
2409 } elsif ($sym == DC::SDLK_DOWN) {
2410 $self->move_cursor_ver (+1);
2411 } else {
2412 return $self->SUPER::invoke_key_down ($ev)
2413 }
2414
2415 1
2416}
2417
2418#############################################################################
2419
2420package DC::UI::ButtonBin;
2421
2422our @ISA = DC::UI::Bin::;
2423
2424use DC::OpenGL;
2425
2426my @tex =
2427 map { new_from_resource DC::Texture $_, mipmap => 1 }
2428 qw(b1_button_inactive.png b1_button_active.png);
2429
2430sub new {
2431 my $class = shift;
2432
2433 $class->SUPER::new (
2022 can_hover => 1, 2434 can_hover => 1,
2023 align => 0, 2435 align => 0.5,
2024 valign => 0, 2436 valign => 0.5,
2025 can_events => 1, 2437 can_events => 1,
2026 @_ 2438 @_
2027 ) 2439 )
2028} 2440}
2029 2441
… …
2038} 2450}
2039 2451
2040sub _draw { 2452sub _draw {
2041 my ($self) = @_; 2453 my ($self) = @_;
2042 2454
2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2044
2045 glEnable GL_TEXTURE_2D; 2455 glEnable GL_TEXTURE_2D;
2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2047 glColor 0, 0, 0, 1; 2457 glColor 0, 0, 0, 1;
2048 2458
2459 my $tex = $tex[$GRAB == $self];
2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2050 2461
2051 glDisable GL_TEXTURE_2D; 2462 glDisable GL_TEXTURE_2D;
2052 2463
2053 $self->SUPER::_draw; 2464 $self->SUPER::_draw;
2054} 2465}
2055 2466
2056############################################################################# 2467#############################################################################
2057 2468
2058package CFClient::UI::CheckBox; 2469package DC::UI::Button;
2059 2470
2060our @ISA = CFClient::UI::DrawBG::; 2471our @ISA = DC::UI::Label::;
2472
2473use DC::OpenGL;
2061 2474
2062my @tex = 2475my @tex =
2063 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 map { new_from_resource DC::Texture $_, mipmap => 1 }
2064 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2477 qw(b1_button_inactive.png b1_button_active.png);
2065
2066use CFClient::OpenGL;
2067 2478
2068sub new { 2479sub new {
2069 my $class = shift; 2480 my $class = shift;
2070 2481
2071 $class->SUPER::new ( 2482 $class->SUPER::new (
2483 padding_x => 8,
2484 padding_y => 4,
2485 fg => [1.0, 1.0, 1.0],
2486 active_fg => [0.8, 0.8, 0.8],
2487 can_hover => 1,
2488 align => 0.5,
2489 valign => 0.5,
2490 can_events => 1,
2491 @_
2492 )
2493}
2494
2495sub invoke_button_up {
2496 my ($self, $ev, $x, $y) = @_;
2497
2498 $self->emit ("activate")
2499 if $x >= 0 && $x < $self->{w}
2500 && $y >= 0 && $y < $self->{h};
2501
2502 1
2503}
2504
2505sub _draw {
2506 my ($self) = @_;
2507
2508 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2509
2510 glEnable GL_TEXTURE_2D;
2511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2512 glColor 0, 0, 0, 1;
2513
2514 my $tex = $tex[$GRAB == $self];
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516
2517 glDisable GL_TEXTURE_2D;
2518
2519 $self->SUPER::_draw;
2520}
2521
2522#############################################################################
2523
2524package DC::UI::CheckBox;
2525
2526our @ISA = DC::UI::DrawBG::;
2527
2528my @tex =
2529 map { new_from_resource DC::Texture $_, mipmap => 1 }
2530 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2531
2532use DC::OpenGL;
2533
2534sub new {
2535 my $class = shift;
2536
2537 $class->SUPER::new (
2538 fontsize => 1,
2072 padding_x => 2, 2539 padding_x => 2,
2073 padding_y => 2, 2540 padding_y => 2,
2074 fg => [1, 1, 1], 2541 fg => [1, 1, 1],
2075 active_fg => [1, 1, 0], 2542 active_fg => [1, 1, 0],
2076 bg => [0, 0, 0, 0.2], 2543 bg => [0, 0, 0, 0.2],
… …
2082} 2549}
2083 2550
2084sub size_request { 2551sub size_request {
2085 my ($self) = @_; 2552 my ($self) = @_;
2086 2553
2087 (6) x 2 2554 ($self->{fontsize} * $::FONTSIZE) x 2
2088} 2555}
2089 2556
2090sub toggle { 2557sub toggle {
2091 my ($self) = @_; 2558 my ($self) = @_;
2092 2559
… …
2111sub _draw { 2578sub _draw {
2112 my ($self) = @_; 2579 my ($self) = @_;
2113 2580
2114 $self->SUPER::_draw; 2581 $self->SUPER::_draw;
2115 2582
2116 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2583 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2117 2584
2118 my ($w, $h) = @$self{qw(w h)}; 2585 my ($w, $h) = @$self{qw(w h)};
2119 2586
2120 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2587 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2121 2588
… …
2128 glDisable GL_TEXTURE_2D; 2595 glDisable GL_TEXTURE_2D;
2129} 2596}
2130 2597
2131############################################################################# 2598#############################################################################
2132 2599
2133package CFClient::UI::Image; 2600package DC::UI::Image;
2134 2601
2135our @ISA = CFClient::UI::Base::; 2602our @ISA = DC::UI::DrawBG::;
2136 2603
2137use CFClient::OpenGL; 2604use DC::OpenGL;
2138 2605
2139our %texture_cache; 2606our %texture_cache;
2140 2607
2141sub new { 2608sub new {
2142 my $class = shift; 2609 my $class = shift;
2143 2610
2144 my $self = $class->SUPER::new ( 2611 my $self = $class->SUPER::new (
2145 can_events => 0, 2612 can_events => 0,
2613 scale => 1,
2146 @_, 2614 @_,
2147 ); 2615 );
2148 2616
2149 $self->{path} || $self->{tex} 2617 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required"; 2618 or Carp::croak "'path' or 'tex' attributes required";
2151 2619
2152 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2620 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2621 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2154 2622
2155 Scalar::Util::weaken $texture_cache{$self->{path}}; 2623 DC::weaken $texture_cache{$self->{path}};
2156 2624
2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2625 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158 2626
2159 $self 2627 $self
2160} 2628}
2161 2629
2162sub STORABLE_freeze { 2630sub STORABLE_freeze {
2163 my ($self, $cloning) = @_; 2631 my ($self, $cloning) = @_;
2164 2632
2165 $self->{path} 2633 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2634 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2167 2635
2168 $self->{path} 2636 $self->{path}
2169} 2637}
2170 2638
2171sub STORABLE_attach { 2639sub STORABLE_attach {
2172 my ($self, $cloning, $path) = @_; 2640 my ($self, $cloning, $path) = @_;
2173 2641
2174 $self->new (path => $path) 2642 $self->new (path => $path)
2175} 2643}
2176 2644
2645sub set_texture {
2646 my ($self, $tex) = @_;
2647
2648 $self->{tex} = $tex;
2649 $self->update;
2650}
2651
2177sub size_request { 2652sub size_request {
2178 my ($self) = @_; 2653 my ($self) = @_;
2179 2654
2180 ($self->{tex}{w}, $self->{tex}{h}) 2655 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2181} 2656}
2182 2657
2183sub _draw { 2658sub _draw {
2184 my ($self) = @_; 2659 my ($self) = @_;
2660
2661 $self->SUPER::_draw;
2185 2662
2186 my $tex = $self->{tex}; 2663 my $tex = $self->{tex};
2187 2664
2188 my ($w, $h) = ($self->{w}, $self->{h}); 2665 my ($w, $h) = ($self->{w}, $self->{h});
2189 2666
… …
2195 } 2672 }
2196 2673
2197 glEnable GL_TEXTURE_2D; 2674 glEnable GL_TEXTURE_2D;
2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199 2676
2200 $tex->draw_quad (0, 0, $w, $h); 2677 $tex->draw_quad_alpha (0, 0, $w, $h);
2201 2678
2202 glDisable GL_TEXTURE_2D; 2679 glDisable GL_TEXTURE_2D;
2203} 2680}
2204 2681
2205############################################################################# 2682#############################################################################
2206 2683
2207package CFClient::UI::ImageButton; 2684package DC::UI::ImageButton;
2208 2685
2209our @ISA = CFClient::UI::Image::; 2686our @ISA = DC::UI::Image::;
2210 2687
2211use CFClient::OpenGL; 2688use DC::OpenGL;
2212
2213my %textures;
2214 2689
2215sub new { 2690sub new {
2216 my $class = shift; 2691 my $class = shift;
2217 2692
2218 my $self = $class->SUPER::new ( 2693 my $self = $class->SUPER::new (
2219 padding_x => 4, 2694 padding_x => 4,
2220 padding_y => 4, 2695 padding_y => 4,
2221 fg => [1, 1, 1], 2696 fg => [1, 1, 1],
2222 active_fg => [0, 0, 1], 2697 active_fg => [0, 0, 1],
2223 can_hover => 1, 2698 can_hover => 1,
2224 align => 0, 2699 align => 0.5,
2225 valign => 0, 2700 valign => 0.5,
2226 can_events => 1, 2701 can_events => 1,
2227 @_ 2702 @_
2228 ); 2703 );
2229} 2704}
2230 2705
2706sub invoke_button_down {
2707 my ($self, $ev, $x, $y) = @_;
2708
2709 1
2710}
2711
2231sub invoke_button_up { 2712sub invoke_button_up {
2232 my ($self, $ev, $x, $y) = @_; 2713 my ($self, $ev, $x, $y) = @_;
2233 2714
2234 $self->emit ("activate") 2715 $self->emit ("activate")
2235 if $x >= 0 && $x < $self->{w} 2716 if $x >= 0 && $x < $self->{w}
… …
2238 1 2719 1
2239} 2720}
2240 2721
2241############################################################################# 2722#############################################################################
2242 2723
2243package CFClient::UI::VGauge; 2724package DC::UI::VGauge;
2244 2725
2245our @ISA = CFClient::UI::Base::; 2726our @ISA = DC::UI::Base::;
2246 2727
2247use List::Util qw(min max); 2728use List::Util qw(min max);
2248 2729
2249use CFClient::OpenGL; 2730use DC::OpenGL;
2250 2731
2251my %tex = ( 2732my %tex = (
2252 food => [ 2733 food => [
2253 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2734 map { new_from_resource DC::Texture $_, mipmap => 1 }
2254 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2735 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255 ], 2736 ],
2256 grace => [ 2737 grace => [
2257 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2738 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/ 2739 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259 ], 2740 ],
2260 hp => [ 2741 hp => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2742 map { new_from_resource DC::Texture $_, mipmap => 1 }
2262 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2743 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263 ], 2744 ],
2264 mana => [ 2745 mana => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2746 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/ 2747 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267 ], 2748 ],
2268); 2749);
2269 2750
2270# eg. VGauge->new (gauge => 'food'), default gauge: food 2751# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2373 glDisable GL_TEXTURE_2D; 2854 glDisable GL_TEXTURE_2D;
2374} 2855}
2375 2856
2376############################################################################# 2857#############################################################################
2377 2858
2859package DC::UI::Progress;
2860
2861our @ISA = DC::UI::Label::;
2862
2863use DC::OpenGL;
2864
2865sub new {
2866 my ($class, %arg) = @_;
2867
2868 my $self = $class->SUPER::new (
2869 padding_x => 2,
2870 padding_y => 2,
2871 fg => [1, 1, 1],
2872 bg => [0, 0, 1, 0.2],
2873 bar => [0.7, 0.5, 0.1, 0.8],
2874 outline => [0.4, 0.3, 0],
2875 fontsize => 0.9,
2876 valign => 0.5,
2877 align => 0.5,
2878 can_events => 1,
2879 ellipsise => 1,
2880 label => "%d%%",
2881 %arg,
2882 );
2883
2884 $self->set_value ($arg{value} || -1);
2885
2886 $self
2887}
2888
2889sub set_label {
2890 my ($self, $label) = @_;
2891
2892 return if $self->{label} eq $label;
2893 $self->{label} = $label;
2894
2895 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2896}
2897
2898sub set_value {
2899 my ($self, $value) = @_;
2900
2901 if ($self->{value} ne $value) {
2902 $self->{value} = $value;
2903
2904 if ($value < 0) {
2905 $self->set_text ("-");
2906 } else {
2907 $self->set_text (sprintf $self->{label}, $value * 100);
2908 }
2909
2910 $self->update;
2911 }
2912}
2913
2914sub _draw {
2915 my ($self) = @_;
2916
2917 glEnable GL_BLEND;
2918 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2919
2920 my $px = $self->{padding_x};
2921 my $py = $self->{padding_y};
2922
2923 if ($self->{value} >= 0) {
2924 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2925
2926 glColor_premultiply @{$self->{bar}};
2927 glRect $px, $py, $s, $self->{h} - $py;
2928 glColor_premultiply @{$self->{bg}};
2929 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2930 }
2931
2932 glColor_premultiply @{$self->{outline}};
2933
2934 $px -= .5;
2935 $py -= .5;
2936
2937 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2938
2939 glDisable GL_BLEND;
2940
2941 {
2942 local $self->{bg}; # do not draw background
2943 $self->SUPER::_draw;
2944 }
2945}
2946
2947#############################################################################
2948
2949package DC::UI::ExperienceProgress;
2950
2951our @ISA = DC::UI::Progress::;
2952
2953sub new {
2954 my ($class, %arg) = @_;
2955
2956 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2957
2958 my $self = $class->SUPER::new (
2959 %arg,
2960 tooltip => sub {
2961 my ($self) = @_;
2962
2963 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2964 $tt,
2965 $self->{lvl},
2966 ::formsep ($self->{exp}),
2967 ::formsep ($self->{nxt}),
2968 ::formsep ($self->{nxt} - $self->{exp}),
2969 $self->_percent * 100,
2970 },
2971 );
2972
2973 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2974 if $::CONN;
2975
2976 $self
2977}
2978
2979sub DESTROY {
2980 my ($self) = @_;
2981
2982 delete $::CONN->{on_exp_update}{$self+0}
2983 if $::CONN;
2984
2985 $self->SUPER::DESTROY;
2986}
2987
2988sub _percent {
2989 my ($self) = @_;
2990
2991 my $table = $::CONN && $::CONN->{exp_table}
2992 or return -1;
2993
2994 my $l0 = $table->[$self->{lvl} - 1];
2995 my $l1 = $table->[$self->{lvl}];
2996
2997 $self->{nxt} = $l1;
2998
2999 ($self->{exp} - $l0) / ($l1 - $l0)
3000}
3001
3002sub set_value {
3003 my ($self, $lvl, $exp) = @_;
3004
3005 $self->{lvl} = $lvl;
3006 $self->{exp} = $exp;
3007
3008 $self->SUPER::set_value ($self->_percent);
3009}
3010
3011#############################################################################
3012
2378package CFClient::UI::Gauge; 3013package DC::UI::Gauge;
2379 3014
2380our @ISA = CFClient::UI::VBox::; 3015our @ISA = DC::UI::VBox::;
2381 3016
2382sub new { 3017sub new {
2383 my ($class, %arg) = @_; 3018 my ($class, %arg) = @_;
2384 3019
2385 my $self = $class->SUPER::new ( 3020 my $self = $class->SUPER::new (
… …
2387 can_hover => 1, 3022 can_hover => 1,
2388 can_events => 1, 3023 can_events => 1,
2389 %arg, 3024 %arg,
2390 ); 3025 );
2391 3026
2392 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 3027 $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); 3028 $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"); 3029 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2395 3030
2396 $self 3031 $self
2397} 3032}
2398 3033
2399sub set_fontsize { 3034sub set_fontsize {
… …
2420 $self->{value}->set_text ($val); 3055 $self->{value}->set_text ($val);
2421} 3056}
2422 3057
2423############################################################################# 3058#############################################################################
2424 3059
2425package CFClient::UI::Slider; 3060package DC::UI::Slider;
2426 3061
2427use strict; 3062use common::sense;
2428 3063
2429use CFClient::OpenGL; 3064use DC::OpenGL;
2430 3065
2431our @ISA = CFClient::UI::DrawBG::; 3066our @ISA = DC::UI::DrawBG::;
2432 3067
2433my @tex = 3068my @tex =
2434 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3069 map { new_from_resource DC::Texture $_ }
2435 qw(s1_slider.png s1_slider_bg.png); 3070 qw(s1_slider.png s1_slider_bg.png);
2436 3071
2437sub new { 3072sub new {
2438 my $class = shift; 3073 my $class = shift;
2439 3074
… …
2476sub set_value { 3111sub set_value {
2477 my ($self, $value) = @_; 3112 my ($self, $value) = @_;
2478 3113
2479 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3114 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2480 3115
2481 $hi = $lo + 1 if $hi <= $lo; 3116 $hi = $lo if $hi < $lo;
2482 3117
2483 $page = $hi - $lo if $page > $hi - $lo; 3118 $value = $hi - $page if $value > $hi - $page;
2484
2485 $value = $lo if $value < $lo; 3119 $value = $lo if $value < $lo;
2486 $value = $hi - $page if $value > $hi - $page;
2487 3120
2488 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3121 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2489 if $unit; 3122 if $unit;
2490 3123
2491 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3124 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2507 3140
2508 $self->SUPER::invoke_button_down ($ev, $x, $y); 3141 $self->SUPER::invoke_button_down ($ev, $x, $y);
2509 3142
2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3143 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2511 3144
2512 $self->invoke_mouse_motion ($ev, $x, $y) 3145 $self->invoke_mouse_motion ($ev, $x, $y);
3146
3147 1
2513} 3148}
2514 3149
2515sub invoke_mouse_motion { 3150sub invoke_mouse_motion {
2516 my ($self, $ev, $x, $y) = @_; 3151 my ($self, $ev, $x, $y) = @_;
2517 3152
2518 if ($GRAB == $self) { 3153 if ($GRAB == $self) {
2519 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3154 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2520 3155
2521 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3156 my (undef, $lo, $hi, $page) = @{$self->{range}};
2522 3157
2523 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3158 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2524 3159
2525 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3160 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2526 } else { 3161 } else {
2527 return 0; 3162 return 0;
2528 } 3163 }
… …
2533sub invoke_mouse_wheel { 3168sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_; 3169 my ($self, $ev) = @_;
2535 3170
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3171 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537 3172
3173 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3174
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3175 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539 3176
2540 ! ! $delta 3177 1
2541} 3178}
2542 3179
2543sub update { 3180sub update {
2544 my ($self) = @_; 3181 my ($self) = @_;
2545 3182
… …
2551 my ($self) = @_; 3188 my ($self) = @_;
2552 3189
2553 unless ($self->{knob_w}) { 3190 unless ($self->{knob_w}) {
2554 $self->set_value ($self->{range}[0]); 3191 $self->set_value ($self->{range}[0]);
2555 3192
2556 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3193 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2557 my $range = ($hi - $page - $lo) || 1e-100; 3194 my $range = ($hi - $page - $lo) || 1e-10;
2558 3195
2559 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3196 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2560 3197
2561 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3198 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2562 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3199 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2563 3200
2564 $value = ($value - $lo) / $range; 3201 $value = ($value - $lo) / $range;
… …
2594 glDisable GL_TEXTURE_2D; 3231 glDisable GL_TEXTURE_2D;
2595} 3232}
2596 3233
2597############################################################################# 3234#############################################################################
2598 3235
2599package CFClient::UI::ValSlider; 3236package DC::UI::ValSlider;
2600 3237
2601our @ISA = CFClient::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
2602 3239
2603sub new { 3240sub new {
2604 my ($class, %arg) = @_; 3241 my ($class, %arg) = @_;
2605 3242
2606 my $range = delete $arg{range}; 3243 my $range = delete $arg{range};
2607 3244
2608 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
2609 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3246 slider => (new DC::UI::Slider expand => 1, range => $range),
2610 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3247 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2611 to_value => sub { shift }, 3248 to_value => sub { shift },
2612 from_value => sub { shift }, 3249 from_value => sub { shift },
2613 %arg, 3250 %arg,
2614 ); 3251 );
2615 3252
… …
2635sub set_range { shift->{slider}->set_range (@_) } 3272sub set_range { shift->{slider}->set_range (@_) }
2636sub set_value { shift->{slider}->set_value (@_) } 3273sub set_value { shift->{slider}->set_value (@_) }
2637 3274
2638############################################################################# 3275#############################################################################
2639 3276
2640package CFClient::UI::TextScroller; 3277package DC::UI::TextScroller;
2641 3278
2642our @ISA = CFClient::UI::HBox::; 3279our @ISA = DC::UI::HBox::;
2643 3280
2644use CFClient::OpenGL; 3281use DC::OpenGL;
2645 3282
2646sub new { 3283sub new {
2647 my $class = shift; 3284 my $class = shift;
2648 3285
2649 my $self = $class->SUPER::new ( 3286 my $self = $class->SUPER::new (
… …
2651 can_events => 1, 3288 can_events => 1,
2652 indent => 0, 3289 indent => 0,
2653 #font => default_font 3290 #font => default_font
2654 @_, 3291 @_,
2655 3292
2656 layout => (new CFClient::Layout), 3293 layout => (new DC::Layout),
2657 par => [], 3294 max_par => 0,
2658 height => 0, 3295 height => 0,
2659 children => [ 3296 children => [
2660 (new CFClient::UI::Empty expand => 1), 3297 (new DC::UI::Empty expand => 1),
2661 (new CFClient::UI::Slider vertical => 1), 3298 (new DC::UI::Slider vertical => 1),
2662 ], 3299 ],
2663 ); 3300 );
2664 3301
2665 $self->{children}[1]->connect (changed => sub { $self->update }); 3302 $self->{children}[1]->connect (changed => sub { $self->update });
2666 3303
3304 $self->add_paragraph (@{ delete $self->{par} }) if @{ $self->{par} };
3305
2667 $self 3306 $self
2668} 3307}
2669 3308
2670sub set_fontsize { 3309sub set_fontsize {
2671 my ($self, $fontsize) = @_; 3310 my ($self, $fontsize) = @_;
… …
2675} 3314}
2676 3315
2677sub size_request { 3316sub size_request {
2678 my ($self) = @_; 3317 my ($self) = @_;
2679 3318
2680 my ($empty, $slider) = @{ $self->{children} }; 3319 my ($empty, $slider) = $self->visible_children;
2681 3320
2682 local $self->{children} = [$empty, $slider]; 3321 local $self->{children} = [$empty, $slider];
2683 $self->SUPER::size_request 3322 $self->SUPER::size_request
2684} 3323}
2685 3324
… …
2722 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3361 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2723 $layout->set_markup ($para->{markup}); 3362 $layout->set_markup ($para->{markup});
2724 3363
2725 $layout->set_shapes ( 3364 $layout->set_shapes (
2726 map 3365 map
2727 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3366 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2728 @{$para->{widget}} 3367 @{$para->{widget}}
2729 ); 3368 );
2730 3369
2731 $layout 3370 $layout
2732} 3371}
… …
2741sub set_offset { 3380sub set_offset {
2742 my ($self, $offset) = @_; 3381 my ($self, $offset) = @_;
2743 3382
2744 # todo: base offset on lines or so, not on pixels 3383 # todo: base offset on lines or so, not on pixels
2745 $self->{children}[1]->set_value ($offset); 3384 $self->{children}[1]->set_value ($offset);
3385}
3386
3387sub current_paragraph {
3388 my ($self) = @_;
3389
3390 $self->{top_paragraph} - 1
3391}
3392
3393sub scroll_to {
3394 my ($self, $para) = @_;
3395
3396 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3397
3398 $self->{scroll_to} = $para;
3399 $self->update;
2746} 3400}
2747 3401
2748sub clear { 3402sub clear {
2749 my ($self) = @_; 3403 my ($self) = @_;
2750 3404
… …
2755 $self->{height} = 0; 3409 $self->{height} = 0;
2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3410 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757} 3411}
2758 3412
2759sub add_paragraph { 3413sub add_paragraph {
2760 my ($self, $color, $para, $indent) = @_; 3414 my $self = shift;
2761 3415
2762 my ($text, @w) = ref $para ? @$para : $para; 3416 for my $para (@_) {
2763
2764 $para = { 3417 $para = {
3418 fg => [1, 1, 1, 1],
3419 indent => 0,
3420 markup => "",
3421 widget => [],
3422 ref $para ? %$para : (markup => $para),
2765 w => 1e10, 3423 w => 1e10,
2766 wrapped => 1, 3424 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2771 }; 3425 };
2772 3426
2773 $self->add (@w) if @w; 3427 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para; 3428 push @{$self->{par}}, $para;
3429 }
3430
3431 if (my $max = $self->{max_par}) {
3432 shift @{$self->{par}} while @{$self->{par}} > $max;
3433 }
2775 3434
2776 $self->{need_reflow}++; 3435 $self->{need_reflow}++;
2777 $self->update; 3436 $self->update;
2778} 3437}
2779 3438
2780sub scroll_to_bottom { 3439sub scroll_to_bottom {
2781 my ($self) = @_; 3440 my ($self) = @_;
2782 3441
2783 $self->{scroll_to_bottom} = 1; 3442 $self->{scroll_to} = $#{$self->{par}};
2784 $self->update; 3443 $self->update;
2785} 3444}
2786 3445
3446sub force_uptodate {
3447 my ($self) = @_;
3448
3449 if (delete $self->{need_reflow}) {
3450 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3451
3452 my $height = 0;
3453
3454 for my $para (@{$self->{par}}) {
3455 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3456 my $layout = $self->get_layout ($para);
3457 my ($w, $h) = $layout->size;
3458
3459 $para->{w} = $w + $para->{indent};
3460 $para->{h} = $h;
3461 $para->{wrapped} = $layout->has_wrapped;
3462 }
3463
3464 $para->{y} = $height;
3465 $height += $para->{h};
3466 }
3467
3468 $self->{height} = $height;
3469 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3470
3471 delete $self->{texture};
3472 }
3473
3474 if (my $paridx = delete $self->{scroll_to}) {
3475 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3476 }
3477}
3478
2787sub update { 3479sub update {
2788 my ($self) = @_; 3480 my ($self) = @_;
2789 3481
2790 $self->SUPER::update; 3482 $self->SUPER::update;
2791 3483
2792 return unless $self->{h} > 0; 3484 return unless $self->{h} > 0;
2793 3485
2794 delete $self->{texture}; 3486 delete $self->{texture};
2795 3487
2796 $ROOT->on_post_alloc ($self => sub { 3488 $ROOT->on_post_alloc ($self => sub {
3489 $self->force_uptodate;
3490
2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3491 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798 3492
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 { 3493 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2827 glClearColor 0, 0, 0, 0; 3494 glClearColor 0, 0, 0, 0;
2828 glClear GL_COLOR_BUFFER_BIT; 3495 glClear GL_COLOR_BUFFER_BIT;
2829 3496
3497 package DC::UI::Base;
3498 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3499 (0, 0, $self->{w}, $self->{h});
3500
3501 my $top = int $self->{children}[1]{range}[0];
3502
3503 my $paridx = 0;
3504 my $top_paragraph;
2830 my $top = int $self->{children}[1]{range}[0]; 3505 my $top = int $self->{children}[1]{range}[0];
2831 3506
2832 my $y0 = $top; 3507 my $y0 = $top;
2833 my $y1 = $top + $H; 3508 my $y1 = $top + $H;
2834 3509
2835 my $y = 0;
2836
2837 for my $para (@{$self->{par}}) { 3510 for my $para (@{$self->{par}}) {
2838 my $h = $para->{h}; 3511 my $h = $para->{h};
3512 my $y = $para->{y};
2839 3513
2840 if ($y0 < $y + $h && $y < $y1) { 3514 if ($y0 < $y + $h && $y < $y1) {
2841
2842 my $layout = $self->get_layout ($para); 3515 my $layout = $self->get_layout ($para);
2843 3516
2844 $layout->render ($para->{indent}, $y - $y0); 3517 $layout->render ($para->{indent}, $y - $y0);
3518 $layout->draw;
2845 3519
2846 if (my @w = @{ $para->{widget} }) { 3520 if (my @w = @{ $para->{widget} }) {
2847 my @s = $layout->get_shapes; 3521 my @s = $layout->get_shapes;
2848 3522
2849 for (@w) { 3523 for (@w) {
… …
2855 $_->draw; 3529 $_->draw;
2856 } 3530 }
2857 } 3531 }
2858 } 3532 }
2859 3533
2860 $y += $h; 3534 $paridx++;
3535 $top_paragraph ||= $paridx if $y >= $top;
2861 } 3536 }
3537
3538 $self->{top_paragraph} = $top_paragraph;
2862 }; 3539 };
2863 }); 3540 });
2864} 3541}
2865 3542
2866sub reconfigure { 3543sub reconfigure {
… …
2884 $self->{children}[1]->draw; 3561 $self->{children}[1]->draw;
2885} 3562}
2886 3563
2887############################################################################# 3564#############################################################################
2888 3565
2889package CFClient::UI::Animator; 3566package DC::UI::Animator;
2890 3567
2891use CFClient::OpenGL; 3568use DC::OpenGL;
2892 3569
2893our @ISA = CFClient::UI::Bin::; 3570our @ISA = DC::UI::Bin::;
2894 3571
2895sub moveto { 3572sub moveto {
2896 my ($self, $x, $y) = @_; 3573 my ($self, $x, $y) = @_;
2897 3574
2898 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3575 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2926 glPopMatrix; 3603 glPopMatrix;
2927} 3604}
2928 3605
2929############################################################################# 3606#############################################################################
2930 3607
2931package CFClient::UI::Flopper; 3608package DC::UI::Flopper;
2932 3609
2933our @ISA = CFClient::UI::Button::; 3610our @ISA = DC::UI::Button::;
2934 3611
2935sub new { 3612sub new {
2936 my $class = shift; 3613 my $class = shift;
2937 3614
2938 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
… …
2950 $self->{other}->toggle_visibility; 3627 $self->{other}->toggle_visibility;
2951} 3628}
2952 3629
2953############################################################################# 3630#############################################################################
2954 3631
2955package CFClient::UI::Tooltip; 3632package DC::UI::Tooltip;
2956 3633
2957our @ISA = CFClient::UI::Bin::; 3634our @ISA = DC::UI::Bin::;
2958 3635
2959use CFClient::OpenGL; 3636use DC::OpenGL;
2960 3637
2961sub new { 3638sub new {
2962 my $class = shift; 3639 my $class = shift;
2963 3640
2964 $class->SUPER::new ( 3641 $class->SUPER::new (
… …
2968} 3645}
2969 3646
2970sub set_tooltip_from { 3647sub set_tooltip_from {
2971 my ($self, $widget) = @_; 3648 my ($self, $widget) = @_;
2972 3649
2973 my $tooltip = $widget->{tooltip}; 3650 my $tip = $widget->{tooltip};
3651 $tip = $tip->($widget) if "CODE" eq ref $tip;
3652
3653 $tip = DC::Pod::section_label tooltip => $1
3654 if $tip =~ /^#(.*)$/;
2974 3655
2975 if ($ENV{CFPLUS_DEBUG} & 2) { 3656 if ($ENV{CFPLUS_DEBUG} & 2) {
2976 $tooltip .= "\n\n" . (ref $widget) . "\n" 3657 $tip .= "\n\n" . (ref $widget) . "\n"
2977 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3658 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2978 . "req $widget->{req_w} $widget->{req_h}\n" 3659 . "req $widget->{req_w} $widget->{req_h}\n"
2979 . "visible $widget->{visible}"; 3660 . "visible $widget->{visible}";
2980 } 3661 }
2981 3662
2982 $tooltip =~ s/^\n+//; 3663 $tip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//; 3664 $tip =~ s/\n+$//;
2984 3665
2985 $self->add (new CFClient::UI::Label 3666 $self->add (new DC::UI::Label
3667 fg => $DC::THEME{tooltip_fg},
2986 markup => $tooltip, 3668 markup => $tip,
2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3669 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3670 align => 0,
2988 fontsize => 0.8, 3671 fontsize => 0.8,
2989 fg => [0, 0, 0, 1], 3672 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
2990 ellipsise => 0, 3673 ellipsise => 0,
2991 font => ($widget->{tooltip_font} || $::FONT_PROP), 3674 font => ($widget->{tooltip_font} || $::FONT_PROP),
2992 ); 3675 );
2993} 3676}
2994 3677
… …
3029} 3712}
3030 3713
3031sub _draw { 3714sub _draw {
3032 my ($self) = @_; 3715 my ($self) = @_;
3033 3716
3034 glTranslate 0.375, 0.375;
3035
3036 my ($w, $h) = @$self{qw(w h)}; 3717 my ($w, $h) = @$self{qw(w h)};
3037 3718
3038 glColor 1, 0.8, 0.4; 3719 glColor @{ $DC::THEME{tooltip_bg} };
3039 glBegin GL_QUADS; 3720 glRect 0, 0, $w, $h;
3040 glVertex 0 , 0;
3041 glVertex 0 , $h;
3042 glVertex $w, $h;
3043 glVertex $w, 0;
3044 glEnd;
3045 3721
3046 glColor 0, 0, 0; 3722 glColor @{ $DC::THEME{tooltip_border} };
3047 glBegin GL_LINE_LOOP; 3723 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 3724
3054 glTranslate 2 - 0.375, 2 - 0.375; 3725 glTranslate 2, 2;
3055 3726
3056 $self->SUPER::_draw; 3727 $self->SUPER::_draw;
3057} 3728}
3058 3729
3059############################################################################# 3730#############################################################################
3060 3731
3061package CFClient::UI::Face; 3732package DC::UI::Face;
3062 3733
3063our @ISA = CFClient::UI::DrawBG::; 3734our @ISA = DC::UI::DrawBG::;
3064 3735
3065use CFClient::OpenGL; 3736use DC::OpenGL;
3066 3737
3067sub new { 3738sub new {
3068 my $class = shift; 3739 my $class = shift;
3069 3740
3070 my $self = $class->SUPER::new ( 3741 my $self = $class->SUPER::new (
3742 size_w => 32,
3743 size_h => 8,
3071 aspect => 1, 3744 aspect => 1,
3072 can_events => 0, 3745 can_events => 0,
3073 @_, 3746 @_,
3074 ); 3747 );
3075 3748
3076 if ($self->{anim} && $self->{animspeed}) { 3749 $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 3750
3090 $self 3751 $self
3091} 3752}
3092 3753
3754sub update_timer {
3755 my ($self) = @_;
3756
3757 return unless $self->{timer};
3758
3759 if ($self->{visible}) {
3760 $self->{timer}->start;
3761 } else {
3762 $self->{timer}->stop;
3763 }
3764}
3765
3766sub update_face {
3767 my ($self) = @_;
3768
3769 if ($::CONN) {
3770 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3771 if ($anim && @$anim) {
3772 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3773 delete $self->{face_change_cb};
3774
3775 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3776 unless ($tex->{name} || $tex->{loading}) {
3777 $tex->upload (sub { $self->reconfigure });
3778 }
3779 }
3780 }
3781 }
3782 }
3783}
3784
3785sub update_anim {
3786 my ($self) = @_;
3787
3788 if ($self->{anim} && $self->{animspeed}) {
3789 DC::weaken (my $widget = $self);
3790
3791 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3792 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3793 return unless $::CONN;
3794
3795 my $w = $widget
3796 or return;
3797
3798 ++$w->{frame};
3799 $w->update_face;
3800
3801 # somehow, $widget can go away
3802 $w->update;
3803 $w->update_timer;
3804 };
3805
3806 $self->update_face;
3807 $self->update_timer;
3808 } else {
3809 delete $self->{timer};
3810 }
3811}
3812
3093sub size_request { 3813sub size_request {
3094 (32, 8) 3814 my ($self) = @_;
3815
3816 if ($::CONN) {
3817 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3818 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3819 if ($tex->{name}) {
3820 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3821 } elsif (!$tex->{loading}) {
3822 $tex->upload (sub { $self->reconfigure });
3823 }
3824 }
3825
3826 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3827 }
3828 }
3829
3830 ($self->{size_w} || 8, $self->{size_h} || 8)
3095} 3831}
3096 3832
3097sub update { 3833sub update {
3098 my ($self) = @_; 3834 my ($self) = @_;
3099 3835
3100 return unless $self->{visible}; 3836 return unless $self->{visible};
3101 3837
3102 $self->SUPER::update; 3838 $self->SUPER::update;
3103} 3839}
3104 3840
3841sub set_face {
3842 my ($self, $face) = @_;
3843
3844 $self->{face} = $face;
3845 $self->reconfigure;
3846}
3847
3848sub set_anim {
3849 my ($self, $anim) = @_;
3850
3851 $self->{anim} = $anim;
3852 $self->update_anim;
3853}
3854
3855sub set_animspeed {
3856 my ($self, $animspeed) = @_;
3857
3858 $self->{animspeed} = $animspeed;
3859 $self->update_anim;
3860}
3861
3862sub invoke_visibility_change {
3863 my ($self) = @_;
3864
3865 $self->update_timer;
3866
3867 0
3868}
3869
3105sub _draw { 3870sub _draw {
3106 my ($self) = @_; 3871 my ($self) = @_;
3107 3872
3108 return unless $::CONN;
3109
3110 $self->SUPER::_draw; 3873 $self->SUPER::_draw;
3111 3874
3112 my $face; 3875 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; 3876 glEnable GL_TEXTURE_2D;
3125 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3126 glColor 0, 0, 0, 1; 3878 glColor 0, 0, 0, 1;
3127 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3128 glDisable GL_TEXTURE_2D; 3880 glDisable GL_TEXTURE_2D;
… …
3130} 3882}
3131 3883
3132sub destroy { 3884sub destroy {
3133 my ($self) = @_; 3885 my ($self) = @_;
3134 3886
3135 $self->{timer}->cancel 3887 (delete $self->{timer})->cancel
3136 if $self->{timer}; 3888 if $self->{timer};
3137 3889
3138 $self->SUPER::destroy; 3890 $self->SUPER::destroy;
3139} 3891}
3140 3892
3141############################################################################# 3893#############################################################################
3142 3894
3143package CFClient::UI::Buttonbar; 3895package DC::UI::Buttonbar;
3144 3896
3145our @ISA = CFClient::UI::HBox::; 3897our @ISA = DC::UI::HBox::;
3146 3898
3147# TODO: should actualyl wrap buttons and other goodies. 3899# TODO: should actually wrap buttons and other goodies.
3148 3900
3149############################################################################# 3901#############################################################################
3150 3902
3151package CFClient::UI::Menu; 3903package DC::UI::Menu;
3152 3904
3153our @ISA = CFClient::UI::FancyFrame::; 3905our @ISA = DC::UI::Toplevel::;
3154 3906
3155use CFClient::OpenGL; 3907use DC::OpenGL;
3156 3908
3157sub new { 3909sub new {
3158 my $class = shift; 3910 my $class = shift;
3159 3911
3160 my $self = $class->SUPER::new ( 3912 my $self = $class->SUPER::new (
3161 items => [], 3913 items => [],
3162 z => 100, 3914 z => 100,
3163 @_, 3915 @_,
3164 ); 3916 );
3165 3917
3166 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3918 $self->add ($self->{vbox} = new DC::UI::VBox);
3167 3919
3168 for my $item (@{ $self->{items} }) { 3920 for my $item (@{ $self->{items} }) {
3169 my ($widget, $cb, $tooltip) = @$item; 3921 my ($widget, $cb, $tooltip) = @$item;
3170 3922
3171 # handle various types of items, only text for now 3923 # handle various types of items, only text for now
3172 if (!ref $widget) { 3924 if (!ref $widget) {
3173 if ($widget =~ /\t/) { 3925 if ($widget =~ /\t/) {
3174 my ($left, $right) = split /\t/, $widget, 2; 3926 my ($left, $right) = split /\t/, $widget, 2;
3175 3927
3176 $widget = new CFClient::UI::HBox 3928 $widget = new DC::UI::HBox
3177 can_hover => 1, 3929 can_hover => 1,
3178 can_events => 1, 3930 can_events => 1,
3179 tooltip => $tooltip, 3931 tooltip => $tooltip,
3180 children => [ 3932 children => [
3181 (new CFClient::UI::Label markup => $left, expand => 1), 3933 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3182 (new CFClient::UI::Label markup => $right, align => +1), 3934 (new DC::UI::Label markup => $right, align => 1),
3183 ], 3935 ],
3184 ; 3936 ;
3185 3937
3186 } else { 3938 } else {
3187 $widget = new CFClient::UI::Label 3939 $widget = new DC::UI::Label
3188 can_hover => 1, 3940 can_hover => 1,
3189 can_events => 1, 3941 can_events => 1,
3942 align => 0,
3190 markup => $widget, 3943 markup => $widget,
3191 tooltip => $tooltip; 3944 tooltip => $tooltip;
3192 } 3945 }
3193 } 3946 }
3194 3947
… …
3209 # maybe save $GRAB? must be careful about events... 3962 # maybe save $GRAB? must be careful about events...
3210 $GRAB = $self; 3963 $GRAB = $self;
3211 $self->{button} = $ev->{button}; 3964 $self->{button} = $ev->{button};
3212 3965
3213 $self->show; 3966 $self->show;
3214 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3967
3968 my $x = $ev->{x};
3969 my $y = $ev->{y};
3970
3971 $self->{root}->on_post_alloc ($self => sub {
3972 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3973 });
3974
3975 1 # so it can be used inside event handlers
3215} 3976}
3216 3977
3217sub invoke_mouse_motion { 3978sub invoke_mouse_motion {
3218 my ($self, $ev, $x, $y) = @_; 3979 my ($self, $ev, $x, $y) = @_;
3219 3980
… …
3240 1 4001 1
3241} 4002}
3242 4003
3243############################################################################# 4004#############################################################################
3244 4005
3245package CFClient::UI::Multiplexer; 4006package DC::UI::Multiplexer;
3246 4007
3247our @ISA = CFClient::UI::Container::; 4008our @ISA = DC::UI::Container::;
3248 4009
3249sub new { 4010sub new {
3250 my $class = shift; 4011 my $class = shift;
3251 4012
3252 my $self = $class->SUPER::new ( 4013 my $self = $class->SUPER::new (
3253 @_, 4014 @_,
3254 ); 4015 );
3255 4016
3256 $self->{current} = $self->{children}[0] 4017 $self->set_current_page (0);
3257 if @{ $self->{children} };
3258 4018
3259 $self 4019 $self
3260} 4020}
3261 4021
3262sub add { 4022sub add {
3263 my ($self, @widgets) = @_; 4023 my ($self, @widgets) = @_;
3264 4024
3265 $self->SUPER::add (@widgets); 4025 $self->SUPER::add (@widgets);
3266 4026
3267 $self->{current} = $self->{children}[0] 4027 $self->set_current_page (0)
3268 if @{ $self->{children} }; 4028 if @widgets == @{ $self->{children} };
3269} 4029}
3270 4030
3271sub get_current_page { 4031sub get_current_page {
3272 my ($self) = @_; 4032 my ($self) = @_;
3273 4033
… …
3279 4039
3280 my $widget = ref $page_or_widget 4040 my $widget = ref $page_or_widget
3281 ? $page_or_widget 4041 ? $page_or_widget
3282 : $self->{children}[$page_or_widget]; 4042 : $self->{children}[$page_or_widget];
3283 4043
4044 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4045
3284 $self->{current} = $widget; 4046 if (($self->{current} = $widget)) {
4047 $self->{current}->set_visible if $self->{current} && $self->{visible};
3285 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4048 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3286 4049
3287 $self->emit (page_changed => $self->{current}); 4050 $self->emit (page_changed => $self->{current});
4051 }
3288 4052
3289 $self->realloc; 4053 $self->realloc;
3290} 4054}
3291 4055
3292sub visible_children { 4056sub visible_children {
3293 $_[0]{current} 4057 $_[0]{current} || ()
3294} 4058}
3295 4059
3296sub size_request { 4060sub size_request {
3297 my ($self) = @_; 4061 my ($self) = @_;
3298 4062
4063 $self->{current}
3299 $self->{current}->size_request 4064 ? $self->{current}->size_request
4065 : (0, 0)
3300} 4066}
3301 4067
3302sub invoke_size_allocate { 4068sub invoke_size_allocate {
3303 my ($self, $w, $h) = @_; 4069 my ($self, $w, $h) = @_;
3304 4070
3305 $self->{current}->configure (0, 0, $w, $h); 4071 $self->{current}->configure (0, 0, $w, $h)
4072 if $self->{current};
3306 4073
3307 1 4074 1
3308} 4075}
3309 4076
3310sub _draw { 4077sub _draw {
3311 my ($self) = @_; 4078 my ($self) = @_;
3312 4079
3313 $self->{current}->draw; 4080 $self->{current}->draw
4081 if $self->{current};
3314} 4082}
3315 4083
3316############################################################################# 4084#############################################################################
3317 4085
3318package CFClient::UI::Notebook; 4086package DC::UI::Notebook;
3319 4087
4088use DC::OpenGL;
4089
3320our @ISA = CFClient::UI::VBox::; 4090our @ISA = DC::UI::VBox::;
3321 4091
3322sub new { 4092sub new {
3323 my $class = shift; 4093 my $class = shift;
3324 4094
3325 my $self = $class->SUPER::new ( 4095 my $self = $class->SUPER::new (
3326 buttonbar => (new CFClient::UI::Buttonbar), 4096 buttonbar => (new DC::UI::Buttonbar),
3327 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 4097 multiplexer => (new DC::UI::Multiplexer expand => 1),
4098 active_outline => [.7, .7, 0.2],
3328 # filter => # will be put between multiplexer and $self 4099 # filter => # will be put between multiplexer and $self
3329 @_, 4100 @_,
3330 ); 4101 );
3331 4102
3332 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4103 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3333 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4104 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3334 4105
4106 {
4107 Scalar::Util::weaken (my $wself = $self);
4108
4109 $self->{multiplexer}->connect (c_add => sub {
4110 my ($mplex, $widgets) = @_;
4111
4112 for my $child (@$widgets) {
4113 Scalar::Util::weaken $child;
4114 $child->{c_tab_} ||= do {
4115 my $tab =
4116 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4117 ? $child->{c_tab}
4118 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4119
4120 $tab->connect (activate => sub {
4121 $wself->set_current_page ($child);
4122 });
4123
4124 $tab
4125 };
4126
4127 $self->{buttonbar}->add ($child->{c_tab_});
4128 }
4129 });
4130
4131 $self->{multiplexer}->connect (c_remove => sub {
4132 my ($mplex, $widgets) = @_;
4133
4134 for my $child (@$widgets) {
4135 $wself->{buttonbar}->remove ($child->{c_tab_});
4136 }
4137 });
4138 }
4139
3335 $self 4140 $self
3336} 4141}
3337 4142
3338sub add { 4143sub add {
4144 my ($self, @widgets) = @_;
4145
4146 $self->{multiplexer}->add (@widgets)
4147}
4148
4149sub remove {
4150 my ($self, @widgets) = @_;
4151
4152 $self->{multiplexer}->remove (@widgets)
4153}
4154
4155sub pages {
4156 my ($self) = @_;
4157 $self->{multiplexer}->children
4158}
4159
4160sub page_index {
4161 my ($self, $widget) = @_;
4162
4163 my $i = 0;
4164 for ($self->pages) {
4165 if ($_ eq $widget) { return $i };
4166 $i++;
4167 }
4168
4169 undef
4170}
4171
4172sub add_tab {
3339 my ($self, $title, $widget, $tooltip) = @_; 4173 my ($self, $title, $widget, $tooltip) = @_;
3340 4174
3341 Scalar::Util::weaken $self; 4175 $title = [$title, $tooltip] unless ref $title;
4176 $widget->{c_tab} = $title;
3342 4177
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); 4178 $self->add ($widget);
3350} 4179}
3351 4180
3352sub get_current_page { 4181sub get_current_page {
3353 my ($self) = @_; 4182 my ($self) = @_;
3354 4183
… …
3360 4189
3361 $self->{multiplexer}->set_current_page ($page); 4190 $self->{multiplexer}->set_current_page ($page);
3362 $self->emit (page_changed => $self->{multiplexer}{current}); 4191 $self->emit (page_changed => $self->{multiplexer}{current});
3363} 4192}
3364 4193
4194sub _draw {
4195 my ($self) = @_;
4196
4197 $self->SUPER::_draw ();
4198
4199 if (my $cur = $self->{multiplexer}{current}) {
4200 if ($cur = $cur->{c_tab_}) {
4201 glTranslate $self->{buttonbar}{x} + $cur->{x},
4202 $self->{buttonbar}{y} + $cur->{y};
4203 glLineWidth 3;
4204 #glEnable GL_BLEND;
4205 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4206 glColor @{$self->{active_outline}};
4207 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4208 glLineWidth 1;
4209 #glDisable GL_BLEND;
4210 }
4211 }
4212}
4213
3365############################################################################# 4214#############################################################################
3366 4215
3367package CFClient::UI::Selector; 4216package DC::UI::Selector;
3368 4217
3369use utf8; 4218use utf8;
3370 4219
3371our @ISA = CFClient::UI::Button::; 4220our @ISA = DC::UI::Button::;
3372 4221
3373sub new { 4222sub new {
3374 my $class = shift; 4223 my $class = shift;
3375 4224
3376 my $self = $class->SUPER::new ( 4225 my $self = $class->SUPER::new (
… …
3393 my ($value, $title, $tooltip) = @$_; 4242 my ($value, $title, $tooltip) = @$_;
3394 4243
3395 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4244 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396 } 4245 }
3397 4246
3398 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4247 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399} 4248}
3400 4249
3401sub _set_value { 4250sub _set_value {
3402 my ($self, $value) = @_; 4251 my ($self, $value) = @_;
3403 4252
3404 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4253 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4254 $item ||= $self->{options}[0]
3405 or return; 4255 or return;
3406 4256
3407 $self->{value} = $item->[0]; 4257 $self->{value} = $item->[0];
3408 $self->set_markup ("$item->[1] ⇓"); 4258 $self->set_markup ("$item->[1] ⇓");
3409 $self->set_tooltip ($item->[2]); 4259# $self->set_tooltip ($item->[2]);
3410} 4260}
3411 4261
3412sub set_value { 4262sub set_value {
3413 my ($self, $value) = @_; 4263 my ($self, $value) = @_;
3414 4264
… …
3416 4266
3417 $self->_set_value ($value); 4267 $self->_set_value ($value);
3418 $self->emit (changed => $value); 4268 $self->emit (changed => $value);
3419} 4269}
3420 4270
4271sub set_options {
4272 my ($self, $options) = @_;
4273
4274 $self->{options} = $options;
4275 $self->_set_value ($self->{value});
4276}
4277
3421############################################################################# 4278#############################################################################
3422 4279
3423package CFClient::UI::Statusbox; 4280package DC::UI::Statusbox;
3424 4281
3425our @ISA = CFClient::UI::VBox::; 4282our @ISA = DC::UI::VBox::;
3426 4283
3427sub new { 4284sub new {
3428 my $class = shift; 4285 my $class = shift;
3429 4286
3430 my $self = $class->SUPER::new ( 4287 my $self = $class->SUPER::new (
3431 fontsize => 0.8, 4288 fontsize => 0.8,
3432 @_, 4289 @_,
3433 ); 4290 );
3434 4291
3435 Scalar::Util::weaken (my $this = $self); 4292 DC::weaken (my $this = $self);
3436 4293
3437 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4294 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3438 4295
3439 $self 4296 $self
3440} 4297}
3441 4298
3442sub reorder { 4299sub reorder {
3443 my ($self) = @_; 4300 my ($self) = @_;
3444 my $NOW = Time::HiRes::time; 4301 my $NOW = AE::time;
3445 4302
3446 # freeze display when hovering over any label 4303 # freeze display when hovering over any label
3447 return if $CFClient::UI::TOOLTIP->{owner} 4304 return if $DC::UI::TOOLTIP->{owner}
3448 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4305 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3449 values %{ $self->{item} }; 4306 values %{ $self->{item} };
3450 4307
3451 while (my ($k, $v) = each %{ $self->{item} }) { 4308 while (my ($k, $v) = each %{ $self->{item} }) {
3452 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4309 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3453 } 4310 }
4311
4312 $self->{timer}->set (1, 1);
3454 4313
3455 my @widgets; 4314 my @widgets;
3456 4315
3457 my @items = sort { 4316 my @items = sort {
3458 $a->{pri} <=> $b->{pri} 4317 $a->{pri} <=> $b->{pri}
3459 or $b->{id} <=> $a->{id} 4318 or $b->{id} <=> $a->{id}
3460 } values %{ $self->{item} }; 4319 } values %{ $self->{item} };
3461
3462 $self->{timer}->interval (1);
3463 4320
3464 my $count = 10 + 1; 4321 my $count = 10 + 1;
3465 for my $item (@items) { 4322 for my $item (@items) {
3466 last unless --$count; 4323 last unless --$count;
3467 4324
… …
3474 for ($short) { 4331 for ($short) {
3475 s/^\s+//; 4332 s/^\s+//;
3476 s/\s+/ /g; 4333 s/\s+/ /g;
3477 } 4334 }
3478 4335
3479 new CFClient::UI::Label 4336 new DC::UI::Label
3480 markup => $short, 4337 markup => $short,
3481 tooltip => $item->{tooltip}, 4338 tooltip => $item->{tooltip},
3482 tooltip_font => $::FONT_PROP, 4339 tooltip_font => $::FONT_PROP,
3483 tooltip_width => 0.67, 4340 tooltip_width => 0.67,
3484 fontsize => $item->{fontsize} || $self->{fontsize}, 4341 fontsize => $item->{fontsize} || $self->{fontsize},
3485 max_w => $::WIDTH * 0.44, 4342 max_w => $::WIDTH * 0.44,
4343 align => 0,
3486 fg => [@{ $item->{fg} }], 4344 fg => [@{ $item->{fg} }],
3487 can_events => 1, 4345 can_events => 1,
3488 can_hover => 1 4346 can_hover => 1
3489 }; 4347 };
3490 4348
3491 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4349 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3492 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4350 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3493 $label->update; 4351 $label->update;
3494 $label->set_max_size (undef, $label->{req_h} * $diff) 4352 $label->set_max_size (undef, $label->{req_h} * $diff)
3495 if $diff < 1; 4353 if $diff < 1;
3496 $self->{timer}->interval (1/30); 4354 $self->{timer}->set (1/30, 1/30);
3497 } else { 4355 } else {
3498 $label->{fg}[3] = $item->{fg}[3] || 1; 4356 $label->{fg}[3] = $item->{fg}[3] || 1;
3499 } 4357 }
3500 4358
3501 push @widgets, $label; 4359 push @widgets, $label;
3502 } 4360 }
4361
4362 my $hash = join ",", @widgets;
4363 return if $hash eq $self->{last_widget_hash};
4364 $self->{last_widget_hash} = $hash;
3503 4365
3504 $self->clear; 4366 $self->clear;
3505 $self->SUPER::add (reverse @widgets); 4367 $self->SUPER::add (reverse @widgets);
3506} 4368}
3507 4369
… …
3543 $ROOT->on_refresh (reorder => sub { 4405 $ROOT->on_refresh (reorder => sub {
3544 $self->reorder; 4406 $self->reorder;
3545 }); 4407 });
3546} 4408}
3547 4409
4410sub clr_group {
4411 my ($self, $group) = @_;
4412
4413 if (delete $self->{item}{$group}) {
4414 $ROOT->on_refresh (reorder => sub {
4415 $self->reorder;
4416 });
4417 }
4418}
4419
3548sub reconfigure { 4420sub reconfigure {
3549 my ($self) = @_; 4421 my ($self) = @_;
3550 4422
3551 delete $_->{label} 4423 delete $_->{label}
3552 for values %{ $self->{item} || {} }; 4424 for values %{ $self->{item} || {} };
… …
3563 $self->SUPER::destroy; 4435 $self->SUPER::destroy;
3564} 4436}
3565 4437
3566############################################################################# 4438#############################################################################
3567 4439
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; 4440package DC::UI::Root;
3753 4441
3754our @ISA = CFClient::UI::Container::; 4442our @ISA = DC::UI::Container::;
3755 4443
3756use List::Util qw(min max); 4444use List::Util qw(min max);
3757 4445
3758use CFClient::OpenGL; 4446use DC::OpenGL;
3759 4447
3760sub new { 4448sub new {
3761 my $class = shift; 4449 my $class = shift;
3762 4450
3763 my $self = $class->SUPER::new ( 4451 my $self = $class->SUPER::new (
3764 visible => 1, 4452 visible => 1,
3765 @_, 4453 @_,
3766 ); 4454 );
3767 4455
3768 Scalar::Util::weaken ($self->{root} = $self); 4456 DC::weaken ($self->{root} = $self);
3769 4457
3770 $self 4458 $self
3771} 4459}
3772 4460
3773sub size_request { 4461sub size_request {
… …
3821} 4509}
3822 4510
3823sub update { 4511sub update {
3824 my ($self) = @_; 4512 my ($self) = @_;
3825 4513
3826 $::WANT_REFRESH++; 4514 $::WANT_REFRESH = 1;
3827} 4515}
3828 4516
3829sub add { 4517sub add {
3830 my ($self, @children) = @_; 4518 my ($self, @children) = @_;
3831 4519
… …
3868 while ($self->{refresh_hook}) { 4556 while ($self->{refresh_hook}) {
3869 $_->() 4557 $_->()
3870 for values %{delete $self->{refresh_hook}}; 4558 for values %{delete $self->{refresh_hook}};
3871 } 4559 }
3872 4560
3873 if ($self->{realloc}) { 4561 while ($self->{realloc}) {
3874 my %queue; 4562 my %queue;
3875 my @queue; 4563 my @queue;
3876 my $widget; 4564 my $widget;
3877 4565
3878 outer: 4566 outer:
… …
3898 4586
3899 delete $queue{$widget+0}; 4587 delete $queue{$widget+0};
3900 4588
3901 my ($w, $h) = $widget->size_request; 4589 my ($w, $h) = $widget->size_request;
3902 4590
3903 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4591 $w += $widget->{padding_x} * 2;
3904 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4592 $h += $widget->{padding_y} * 2;
4593
4594 $w = max $widget->{min_w}, $w;
4595 $h = max $widget->{min_h}, $h;
3905 4596
3906 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4597 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3907 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4598 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3908 4599
3909 $w = $widget->{force_w} if exists $widget->{force_w}; 4600 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3925 } 4616 }
3926 } 4617 }
3927 4618
3928 delete $self->{realloc}{$widget+0}; 4619 delete $self->{realloc}{$widget+0};
3929 } 4620 }
3930 }
3931 4621
3932 while (my $size_alloc = delete $self->{size_alloc}) { 4622 while (my $size_alloc = delete $self->{size_alloc}) {
3933 my @queue = sort { $b->{visible} <=> $a->{visible} } 4623 my @queue = sort { $a->{visible} <=> $b->{visible} }
3934 values %$size_alloc; 4624 values %$size_alloc;
3935 4625
3936 while () { 4626 while () {
3937 my $widget = pop @queue || last; 4627 my $widget = pop @queue || last;
3938 4628
3939 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4629 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3940 4630
3941 $w = 0 if $w < 0;
3942 $h = 0 if $h < 0;
3943
3944 $w = max $widget->{min_w}, $w; 4631 $w = max $widget->{min_w}, $w;
3945 $h = max $widget->{min_h}, $h; 4632 $h = max $widget->{min_h}, $h;
3946 4633
3947# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4634# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3948# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4635# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3949 4636
3950 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4637 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3951 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4638 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3952 4639
3953 $w = int $w + 0.5; 4640 $w = int $w + 0.5;
3954 $h = int $h + 0.5; 4641 $h = int $h + 0.5;
3955 4642
3956 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4643 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3957 $widget->{old_w} = $widget->{w}; 4644 $widget->{old_w} = $widget->{w};
3958 $widget->{old_h} = $widget->{h}; 4645 $widget->{old_h} = $widget->{h};
3959 4646
3960 $widget->{w} = $w; 4647 $widget->{w} = $w;
3961 $widget->{h} = $h; 4648 $widget->{h} = $h;
3962 4649
3963 $widget->emit (size_allocate => $w, $h); 4650 $widget->emit (size_allocate => $w, $h);
4651 }
3964 } 4652 }
3965 } 4653 }
3966 } 4654 }
3967 4655
3968 while ($self->{post_alloc_hook}) { 4656 while ($self->{post_alloc_hook}) {
3969 $_->() 4657 $_->()
3970 for values %{delete $self->{post_alloc_hook}}; 4658 for values %{delete $self->{post_alloc_hook}};
3971 } 4659 }
3972
3973 4660
3974 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4661 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3975 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4662 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3976 glClear GL_COLOR_BUFFER_BIT; 4663 glClear GL_COLOR_BUFFER_BIT;
3977 4664
… …
3980 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4667 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3981 glMatrixMode GL_MODELVIEW; 4668 glMatrixMode GL_MODELVIEW;
3982 glLoadIdentity; 4669 glLoadIdentity;
3983 4670
3984 { 4671 {
3985 package CFClient::UI::Base; 4672 package DC::UI::Base;
3986 4673
3987 ($draw_x, $draw_y, $draw_w, $draw_h) = 4674 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3988 (0, 0, $self->{w}, $self->{h}); 4675 (0, 0, $self->{w}, $self->{h});
3989 }
3990 4676
3991 $self->_draw; 4677 $self->_draw;
4678 }
3992} 4679}
3993 4680
3994############################################################################# 4681#############################################################################
3995 4682
3996package CFClient::UI; 4683package DC::UI;
3997 4684
3998$ROOT = new CFClient::UI::Root; 4685$ROOT = new DC::UI::Root;
3999$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4686$TOOLTIP = new DC::UI::Tooltip z => 900;
4000 4687
40011 46881
4002

Diff Legend

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