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

Diff Legend

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