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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.333 by root, Sun Jul 23 11:09:58 2006 UTC vs.
Revision 1.475 by root, Sun Jan 11 22:15:23 2009 UTC

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

Diff Legend

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