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.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.462 by root, Thu Mar 20 22:28:33 2008 UTC

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

Diff Legend

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