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.473 by root, Sun Jan 11 03:19:47 2009 UTC

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

Diff Legend

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