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.316 by root, Sun Jul 2 13:57:58 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
991#TODO# update range on size_allocate depending on child
992 1092
993sub add { 1093sub add {
994 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
995 1095
996 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
997} 1097}
998 1098
1099sub set_offset { shift->{vp}->set_offset (@_) }
1100sub set_center { shift->{vp}->set_center (@_) }
1101sub make_visible { shift->{vp}->make_visible (@_) }
1102
999sub update_slider { 1103sub update_slider {
1000 my ($self) = @_; 1104 my ($self) = @_;
1001 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});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003}
1004 1111
1005sub update { 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 {
1006 my ($self) = @_; 1134 my ($self, $ev) = @_;
1007 1135
1008 $self->SUPER::update; 1136 $self->grab_focus;
1009 1137
1010 $self->update_slider; 1138 my $ox = $self->{vp}{view_x};
1139 my $oy = $self->{vp}{view_y};
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
1011} 1190}
1012 1191
1013sub invoke_size_allocate { 1192sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1015 1194
1016 $self->update_slider; 1195 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1197}
1020 1198
1021############################################################################# 1199#############################################################################
1022 1200
1023package CFClient::UI::Frame; 1201package DC::UI::Frame;
1024 1202
1025our @ISA = CFClient::UI::Bin::; 1203our @ISA = DC::UI::Bin::;
1026 1204
1027use CFClient::OpenGL; 1205use DC::OpenGL;
1028 1206
1029sub new { 1207sub new {
1030 my $class = shift; 1208 my $class = shift;
1031 1209
1032 $class->SUPER::new ( 1210 $class->SUPER::new (
1042 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1043 1221
1044 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1046 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1047
1048 glBegin GL_QUADS;
1049 glVertex 0 , 0;
1050 glVertex 0 , $h;
1051 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1052 glVertex $w, 0;
1053 glEnd;
1054
1055 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1056 } 1227 }
1057 1228
1058 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1059} 1230}
1060 1231
1061############################################################################# 1232#############################################################################
1062 1233
1063package CFClient::UI::FancyFrame; 1234package DC::UI::FancyFrame;
1064 1235
1065our @ISA = CFClient::UI::Bin::; 1236our @ISA = DC::UI::Bin::;
1066 1237
1067use 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;
1068 1339
1069my $bg = 1340my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1341 new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1342 mipmap => 1, wrap => 1;
1072 1343
1073my @border = 1344my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1345 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1075 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);
1076 1351
1077sub new { 1352sub new {
1078 my ($class, %arg) = @_; 1353 my ($class, %arg) = @_;
1079 1354
1080 my $self = $class->SUPER::new ( 1355 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1356 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1357 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1358 border => 0.6,
1084 can_events => 1, 1359 can_events => 1,
1085 min_w => 16, 1360 min_w => 64,
1086 min_h => 16, 1361 min_h => 32,
1087 %arg, 1362 %arg,
1088 ); 1363 );
1089 1364
1090 $self->{title_widget} = new CFClient::UI::Label 1365 $self->{title_widget} = new DC::UI::Label
1091 align => 0, 1366 align => 0,
1092 valign => 1, 1367 valign => 1,
1093 text => $self->{title}, 1368 text => $self->{title},
1094 fontsize => $self->{border}, 1369 fontsize => $self->{border},
1095 if exists $self->{title}; 1370 if exists $self->{title};
1096 1371
1097 if ($self->{has_close_button}) { 1372 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1373 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1374 new DC::UI::ImageButton
1100 path => 'x1_close.png', 1375 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1376 on_activate => sub { $self->emit ("delete") };
1102 1377
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1378 $self->DC::UI::Container::add ($self->{close_button});
1104 } 1379 }
1105 1380
1106 $self 1381 $self
1107} 1382}
1108 1383
1109sub add { 1384sub add {
1110 my ($self, @widgets) = @_; 1385 my ($self, @widgets) = @_;
1111 1386
1112 $self->SUPER::add (@widgets); 1387 $self->SUPER::add (@widgets);
1113 $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};
1114 $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};
1115} 1390}
1116 1391
1117sub border { 1392sub border {
1118 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
1119} 1403}
1120 1404
1121sub size_request { 1405sub size_request {
1122 my ($self) = @_; 1406 my ($self) = @_;
1123 1407
1152 $self->child->configure ($border, $border, $w, $h); 1436 $self->child->configure ($border, $border, $w, $h);
1153 1437
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1438 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1439 if $self->{close_button};
1156 1440
1441 1
1442}
1443
1444sub invoke_delete {
1445 my ($self) = @_;
1446
1447 $self->hide;
1448
1157 1 1449 1
1158} 1450}
1159 1451
1160sub invoke_button_down { 1452sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1453 my ($self, $ev, $x, $y) = @_;
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1511 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1512
1221 ! ! $self->{motion} 1513 ! ! $self->{motion}
1222} 1514}
1223 1515
1516sub invoke_visibility_change {
1517 my ($self, $visible) = @_;
1518
1519 delete $self->{motion} unless $visible;
1520
1521 0
1522}
1523
1224sub _draw { 1524sub _draw {
1225 my ($self) = @_; 1525 my ($self) = @_;
1226 1526
1227 my $child = $self->{children}[0]; 1527 my $child = $self->{children}[0];
1228 1528
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234 1534
1235 my $border = $self->border; 1535 my $border = $self->border;
1236 1536
1237 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1238 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241 $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);
1242 1556
1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1245 1559
1246 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
1265 if $self->{close_button}; 1579 if $self->{close_button};
1266} 1580}
1267 1581
1268############################################################################# 1582#############################################################################
1269 1583
1270package CFClient::UI::Table; 1584package DC::UI::Table;
1271 1585
1272our @ISA = CFClient::UI::Base::; 1586our @ISA = DC::UI::Container::;
1273 1587
1274use List::Util qw(max sum); 1588use List::Util qw(max sum);
1275 1589
1276use CFClient::OpenGL; 1590use DC::OpenGL;
1277 1591
1278sub new { 1592sub new {
1279 my $class = shift; 1593 my $class = shift;
1280 1594
1281 $class->SUPER::new ( 1595 $class->SUPER::new (
1282 col_expand => [], 1596 col_expand => [],
1597 row_expand => [],
1283 @_, 1598 @_,
1284 ) 1599 )
1285} 1600}
1286 1601
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289}
1290
1291sub add { 1602sub add {
1292 my ($self, $x, $y, $child) = @_; 1603 my ($self, @widgets) = @_;
1293 1604
1294 $child->set_parent ($self); 1605 for my $child (@widgets) {
1295 $self->{children}[$y][$x] = $child; 1606 $child->{c_rowspan} ||= 1;
1607 $child->{c_colspan} ||= 1;
1608 }
1296 1609
1297 $self->realloc; 1610 $self->SUPER::add (@widgets);
1298} 1611}
1299 1612
1300sub 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 {
1301 my ($self, $child) = @_; 1631 my ($self) = @_;
1302 1632
1303 # TODO: not yet implemented 1633 my (@w, @h);
1304}
1305
1306# TODO: move to container class maybe? send children a signal on removal?
1307sub clear {
1308 my ($self) = @_;
1309 1634
1310 my @children = $self->children; 1635 my @children = $self->children;
1311 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 }
1312 1646 }
1313 for (@children) {
1314 delete $_->{parent};
1315 $_->hide;
1316 }
1317 1647
1318 $self->realloc; 1648 # second pass, rows
1319} 1649 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1320
1321sub get_wh {
1322 my ($self) = @_;
1323
1324 my (@w, @h);
1325
1326 for my $y (0 .. $#{$self->{children}}) {
1327 my $row = $self->{children}[$y]
1328 or next;
1329
1330 for my $x (0 .. $#$row) {
1331 my $widget = $row->[$x]
1332 or next;
1333 my ($w, $h) = @$widget{qw(req_w req_h)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1334 1651
1335 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1336 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337 } 1656 }
1338 } 1657 }
1339 1658
1340 (\@w, \@h) 1659 (\@w, \@h)
1341} 1660}
1357 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1358 1677
1359 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1361 1680
1362 # TODO: nicer code && do row_expand 1681 # now linearly scale the rows/columns to the allocated size
1363 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1366 1685
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1687
1371 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
1372 CFClient::UI::harmonize $hs; 1696 DC::UI::harmonize $hs;
1373 1697
1374 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375 1700
1376 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1377 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)};
1378 or next;
1379 1703
1380 my $x = 0; 1704 $widget->configure (
1381 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382 1707 );
1383 for my $c (0 .. $#$row) { 1708 }
1384 my $col_w = $ws->[$c];
1385 1709
1386 if (my $widget = $row->[$c]) { 1710 1
1387 $widget->configure ($x, $y, $col_w, $row_h); 1711}
1388 }
1389 1712
1390 $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};
1391 } 1740 }
1741 }
1392 1742
1393 $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});
1394 } 1774 }
1395 1775
1396 1 1776 1
1397} 1777}
1398 1778
1399sub find_widget {
1400 my ($self, $x, $y) = @_;
1401
1402 $x -= $self->{x};
1403 $y -= $self->{y};
1404
1405 my $res;
1406
1407 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1408 $res = $_->find_widget ($x, $y)
1409 and return $res;
1410 }
1411
1412 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1413}
1414
1415sub _draw {
1416 my ($self) = @_;
1417
1418 for (grep $_, @{$self->{children}}) {
1419 $_->draw for grep $_, @$_;
1420 }
1421}
1422
1423############################################################################# 1779#############################################################################
1424 1780
1425package CFClient::UI::Box; 1781package DC::UI::Box;
1426 1782
1427our @ISA = CFClient::UI::Container::; 1783our @ISA = DC::UI::Container::;
1428 1784
1429sub size_request { 1785sub size_request {
1430 my ($self) = @_; 1786 my ($self) = @_;
1787
1788 my @children = $self->visible_children;
1431 1789
1432 $self->{vertical} 1790 $self->{vertical}
1433 ? ( 1791 ? (
1434 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::max map $_->{req_w}, @children),
1435 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_h}, @children),
1436 ) 1794 )
1437 : ( 1795 : (
1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1796 (List::Util::sum map $_->{req_w}, @children),
1439 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1797 (List::Util::max map $_->{req_h}, @children),
1440 ) 1798 )
1441} 1799}
1442 1800
1443sub invoke_size_allocate { 1801sub invoke_size_allocate {
1444 my ($self, $w, $h) = @_; 1802 my ($self, $w, $h) = @_;
1465 $req[$_] += $space * $children[$_]{expand} 1823 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1824 for 0 .. $#children;
1467 } 1825 }
1468 } 1826 }
1469 1827
1470 CFClient::UI::harmonize \@req; 1828 DC::UI::harmonize \@req;
1471 1829
1472 my $pos = 0; 1830 my $pos = 0;
1473 for (0 .. $#children) { 1831 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1832 my $alloc = $req[$_];
1475 $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));
1480 1 1838 1
1481} 1839}
1482 1840
1483############################################################################# 1841#############################################################################
1484 1842
1485package CFClient::UI::HBox; 1843package DC::UI::HBox;
1486 1844
1487our @ISA = CFClient::UI::Box::; 1845our @ISA = DC::UI::Box::;
1488 1846
1489sub new { 1847sub new {
1490 my $class = shift; 1848 my $class = shift;
1491 1849
1492 $class->SUPER::new ( 1850 $class->SUPER::new (
1495 ) 1853 )
1496} 1854}
1497 1855
1498############################################################################# 1856#############################################################################
1499 1857
1500package CFClient::UI::VBox; 1858package DC::UI::VBox;
1501 1859
1502our @ISA = CFClient::UI::Box::; 1860our @ISA = DC::UI::Box::;
1503 1861
1504sub new { 1862sub new {
1505 my $class = shift; 1863 my $class = shift;
1506 1864
1507 $class->SUPER::new ( 1865 $class->SUPER::new (
1510 ) 1868 )
1511} 1869}
1512 1870
1513############################################################################# 1871#############################################################################
1514 1872
1515package CFClient::UI::Label; 1873package DC::UI::Label;
1516 1874
1517our @ISA = CFClient::UI::DrawBG::; 1875our @ISA = DC::UI::DrawBG::;
1518 1876
1519use CFClient::OpenGL; 1877use DC::OpenGL;
1520 1878
1521sub new { 1879sub new {
1522 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1523 1881
1524 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
1527 #active_bg => none 1885 #active_bg => none
1528 #font => default_font 1886 #font => default_font
1529 #text => initial text 1887 #text => initial text
1530 #markup => initial narkup 1888 #markup => initial narkup
1531 #max_w => maximum pixel width 1889 #max_w => maximum pixel width
1890 #style => 0, # render flags
1532 ellipsise => 3, # end 1891 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1892 layout => (new DC::Layout),
1534 fontsize => 1, 1893 fontsize => 1,
1535 align => -1, 1894 align => -1,
1536 valign => -1, 1895 valign => -1,
1537 padding_x => 2, 1896 padding_x => 2,
1538 padding_y => 2, 1897 padding_y => 2,
1539 can_events => 0, 1898 can_events => 0,
1540 %arg 1899 %arg
1541 ); 1900 );
1542 1901
1543 if (exists $self->{template}) { 1902 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1903 my $layout = new DC::Layout;
1545 $layout->set_text (delete $self->{template}); 1904 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1905 $self->{template} = $layout;
1547 } 1906 }
1548 1907
1549 if (exists $self->{markup}) { 1908 if (exists $self->{markup}) {
1553 } 1912 }
1554 1913
1555 $self 1914 $self
1556} 1915}
1557 1916
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1917sub update {
1569 my ($self) = @_; 1918 my ($self) = @_;
1570 1919
1571 delete $self->{texture}; 1920 delete $self->{texture};
1572 $self->SUPER::update; 1921 $self->SUPER::update;
1577 1926
1578 delete $self->{ox}; 1927 delete $self->{ox};
1579 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1580} 1929}
1581 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1582sub set_text { 1937sub set_text {
1583 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1584 1939
1585 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
1587 1942
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1943 $self->{layout}->set_text ($text);
1590 1944
1591 delete $self->{size_req}; 1945 delete $self->{size_req};
1592 $self->realloc; 1946 $self->realloc;
1593 $self->update; 1947 $self->update;
1599 return if $self->{text} eq "M$markup"; 1953 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1954 $self->{text} = "M$markup";
1601 1955
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1956 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1957
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1958 $self->{layout}->set_markup ($markup);
1606 1959
1607 delete $self->{size_req}; 1960 delete $self->{size_req};
1608 $self->realloc; 1961 $self->realloc;
1609 $self->update; 1962 $self->update;
1611 1964
1612sub size_request { 1965sub size_request {
1613 my ($self) = @_; 1966 my ($self) = @_;
1614 1967
1615 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1616 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1617 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1618 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1621 1976
1622 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
1623 1978
1624 if (exists $self->{template}) { 1979 if (exists $self->{template}) {
1625 $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);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1982 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1983
1628 my ($w2, $h2) = $self->{template}->size; 1984 my ($w2, $h2) = $self->{template}->size;
1629 1985
1630 $w = List::Util::max $w, $w2; 1986 $w = List::Util::max $w, $w2;
1664 2020
1665sub reconfigure { 2021sub reconfigure {
1666 my ($self) = @_; 2022 my ($self) = @_;
1667 2023
1668 delete $self->{size_req}; 2024 delete $self->{size_req};
2025 delete $self->{texture};
1669 2026
1670 $self->SUPER::reconfigure; 2027 $self->SUPER::reconfigure;
1671} 2028}
1672 2029
1673sub _draw { 2030sub _draw {
1674 my ($self) = @_; 2031 my ($self) = @_;
1675 2032
1676 $self->SUPER::_draw; # draw background, if applicable 2033 $self->SUPER::_draw; # draw background, if applicable
1677 2034
1678 my $tex = $self->{texture} ||= do { 2035 my $size = $self->{texture} ||= do {
1679 $self->{layout}->set_foreground (@{$self->{fg}}); 2036 $self->{layout}->set_foreground (@{$self->{fg}});
1680 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2037 $self->{layout}->set_font ($self->{font}) if $self->{font};
1681 $self->{layout}->set_width ($self->{w}); 2038 $self->{layout}->set_width ($self->{w});
1682 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2039 $self->{layout}->set_ellipsise ($self->{ellipsise});
1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2040 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2041 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685 2042
1686 new_from_layout CFClient::Texture $self->{layout} 2043 [$self->{layout}->size]
1687 }; 2044 };
1688 2045
1689 unless (exists $self->{ox}) { 2046 unless (exists $self->{ox}) {
1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2047 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2048 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692 : ($self->{w} - $tex->{w}) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
1693 2050
1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696 : ($self->{h} - $tex->{h}) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1697 }; 2056 };
1698 2057
1699 glEnable GL_TEXTURE_2D; 2058# unless ($self->{list}) {
1700 2059# $self->{list} = DC::OpenGL::glGenList;
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2060# DC::OpenGL::glNewList $self->{list};
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2061# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1703 2062# DC::OpenGL::glEndList;
1704 if ($tex->{format} == GL_ALPHA) {
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706 glColor @{$self->{fg}};
1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711 } 2063# }
2064#
2065# DC::OpenGL::glCallList $self->{list};
1712 2066
1713 glDisable GL_TEXTURE_2D; 2067 $self->{layout}->draw;
1714} 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#}
1715 2077
1716############################################################################# 2078#############################################################################
1717 2079
1718package CFClient::UI::EntryBase; 2080package DC::UI::EntryBase;
1719 2081
1720our @ISA = CFClient::UI::Label::; 2082our @ISA = DC::UI::Label::;
1721 2083
1722use CFClient::OpenGL; 2084use DC::OpenGL;
1723 2085
1724sub new { 2086sub new {
1725 my $class = shift; 2087 my $class = shift;
1726 2088
1727 $class->SUPER::new ( 2089 $class->SUPER::new (
1728 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
1729 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
1730 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
1731 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
1732 can_hover => 1, 2096 can_hover => 1,
1733 can_focus => 1, 2097 can_focus => 1,
1734 valign => 0, 2098 valign => 0,
1735 can_events => 1, 2099 can_events => 1,
2100 ellipsise => 0,
2101 padding_x => 4,
2102 padding_y => 2,
1736 #text => ... 2103 #text => ...
1737 #hidden => "*", 2104 #hidden => "*",
1738 @_ 2105 @_
1739 ) 2106 )
1740} 2107}
1785 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1786 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1787 2154
1788 my $text = $self->get_text; 2155 my $text = $self->get_text;
1789 2156
2157 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2158
1790 if ($uni == 8) { 2159 if ($uni == 8) {
1791 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1792 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1793 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1794 } elsif ($sym == CFClient::SDLK_LEFT) { 2163 } elsif ($sym == DC::SDLK_LEFT) {
1795 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1796 } elsif ($sym == CFClient::SDLK_RIGHT) { 2165 } elsif ($sym == DC::SDLK_RIGHT) {
1797 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1798 } 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 = "";
1799 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1800 } elsif ($sym == CFClient::SDLK_END) {
1801 $self->{cursor} = length $text;
1802 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1803 $self->emit ('escape'); 2183 $self->emit ('escape');
1804 } elsif ($uni) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1805 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
1806 } else { 2188 } else {
1807 return 0; 2189 return 0;
1808 } 2190 }
1809 2191
1810 $self->_set_text ($text); 2192 $self->_set_text ($text);
1811 2193
1812 $self->realloc; 2194 $self->realloc;
2195 $self->update;
1813 2196
1814 1 2197 1
1815} 2198}
1816 2199
1817sub invoke_focus_in { 2200sub invoke_focus_in {
1829 2212
1830 my $idx = $self->{layout}->xy_to_index ($x, $y); 2213 my $idx = $self->{layout}->xy_to_index ($x, $y);
1831 2214
1832 # byte-index to char-index 2215 # byte-index to char-index
1833 my $text = $self->{text}; 2216 my $text = $self->{text};
1834 utf8::encode $text; 2217 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835 $self->{cursor} = length substr $text, 0, $idx; 2218 $self->{cursor} = length $text;
1836 2219
1837 $self->_set_text ($self->{text}); 2220 $self->_set_text ($self->{text});
1838 $self->update; 2221 $self->update;
1839 2222
1840 1 2223 1
1859 glColor_premultiply @{$self->{bg}}; 2242 glColor_premultiply @{$self->{bg}};
1860 } 2243 }
1861 2244
1862 glEnable GL_BLEND; 2245 glEnable GL_BLEND;
1863 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1864 glBegin GL_QUADS;
1865 glVertex 0 , 0;
1866 glVertex 0 , $self->{h};
1867 glVertex $self->{w}, $self->{h}; 2247 glRect 0, 0, $self->{w}, $self->{h};
1868 glVertex $self->{w}, 0;
1869 glEnd;
1870 glDisable GL_BLEND; 2248 glDisable GL_BLEND;
1871 2249
1872 $self->SUPER::_draw; 2250 $self->SUPER::_draw;
1873 2251
1874 #TODO: force update every cursor change :( 2252 #TODO: force update every cursor change :(
1876 2254
1877 unless (exists $self->{cur_h}) { 2255 unless (exists $self->{cur_h}) {
1878 my $text = substr $self->{text}, 0, $self->{cursor}; 2256 my $text = substr $self->{text}, 0, $self->{cursor};
1879 utf8::encode $text; 2257 utf8::encode $text;
1880 2258
1881 @$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);
1882 } 2260 }
1883 2261
1884 glColor @{$self->{fg}}; 2262 glColor_premultiply @{$self->{active_fg}};
1885 glBegin GL_LINES; 2263 glBegin GL_LINES;
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2264 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1887 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};
1888 glEnd; 2266 glEnd;
1889 }
1890}
1891 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
1892package CFClient::UI::Entry; 2286package DC::UI::Entry;
1893 2287
1894our @ISA = CFClient::UI::EntryBase::; 2288our @ISA = DC::UI::EntryBase::;
1895 2289
1896use CFClient::OpenGL; 2290use DC::OpenGL;
1897 2291
1898sub invoke_key_down { 2292sub invoke_key_down {
1899 my ($self, $ev) = @_; 2293 my ($self, $ev) = @_;
1900 2294
1901 my $sym = $ev->{sym}; 2295 my $sym = $ev->{sym};
1902 2296
1903 if ($sym == 13) { 2297 if ($ev->{uni} == 0x0d || $sym == 13) {
1904 unshift @{$self->{history}}, 2298 unshift @{$self->{history}},
1905 my $txt = $self->get_text; 2299 my $txt = $self->get_text;
1906 2300
1907 $self->{history_pointer} = -1; 2301 $self->{history_pointer} = -1;
1908 $self->{history_saveback} = ''; 2302 $self->{history_saveback} = '';
1909 $self->emit (activate => $txt); 2303 $self->emit (activate => $txt);
1910 $self->update; 2304 $self->update;
1911 2305
1912 } elsif ($sym == CFClient::SDLK_UP) { 2306 } elsif ($sym == DC::SDLK_UP) {
1913 if ($self->{history_pointer} < 0) { 2307 if ($self->{history_pointer} < 0) {
1914 $self->{history_saveback} = $self->get_text; 2308 $self->{history_saveback} = $self->get_text;
1915 } 2309 }
1916 if (@{$self->{history} || []} > 0) { 2310 if (@{$self->{history} || []} > 0) {
1917 $self->{history_pointer}++; 2311 $self->{history_pointer}++;
1919 $self->{history_pointer} = @{$self->{history} || []} - 1; 2313 $self->{history_pointer} = @{$self->{history} || []} - 1;
1920 } 2314 }
1921 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2315 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1922 } 2316 }
1923 2317
1924 } elsif ($sym == CFClient::SDLK_DOWN) { 2318 } elsif ($sym == DC::SDLK_DOWN) {
1925 $self->{history_pointer}--; 2319 $self->{history_pointer}--;
1926 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2320 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1927 2321
1928 if ($self->{history_pointer} >= 0) { 2322 if ($self->{history_pointer} >= 0) {
1929 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2323 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1938 1 2332 1
1939} 2333}
1940 2334
1941############################################################################# 2335#############################################################################
1942 2336
1943package CFClient::UI::Button; 2337package DC::UI::TextEdit;
1944 2338
1945our @ISA = CFClient::UI::Label::; 2339our @ISA = DC::UI::EntryBase::;
1946 2340
1947use CFClient::OpenGL; 2341use DC::OpenGL;
1948
1949my @tex =
1950 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1951 qw(b1_button_active.png);
1952 2342
1953sub new { 2343sub new {
1954 my $class = shift; 2344 my $class = shift;
1955 2345
1956 $class->SUPER::new ( 2346 $class->SUPER::new (
1957 padding_x => 4,
1958 padding_y => 4, 2347 padding_y => 4,
1959 fg => [1, 1, 1], 2348
1960 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 (
1961 can_hover => 1, 2402 can_hover => 1,
1962 align => 0, 2403 align => 0,
1963 valign => 0, 2404 valign => 0,
1964 can_events => 1, 2405 can_events => 1,
1965 @_ 2406 @_
1977} 2418}
1978 2419
1979sub _draw { 2420sub _draw {
1980 my ($self) = @_; 2421 my ($self) = @_;
1981 2422
1982 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1983
1984 glEnable GL_TEXTURE_2D; 2423 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2424 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 glColor 0, 0, 0, 1; 2425 glColor 0, 0, 0, 1;
1987 2426
2427 my $tex = $tex[$GRAB == $self];
1988 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2428 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1989 2429
1990 glDisable GL_TEXTURE_2D; 2430 glDisable GL_TEXTURE_2D;
1991 2431
1992 $self->SUPER::_draw; 2432 $self->SUPER::_draw;
1993} 2433}
1994 2434
1995############################################################################# 2435#############################################################################
1996 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
1997package CFClient::UI::ImageButton; 2642package DC::UI::ImageButton;
1998 2643
1999our @ISA = CFClient::UI::Image::; 2644our @ISA = DC::UI::Image::;
2000 2645
2001use CFClient::OpenGL; 2646use DC::OpenGL;
2002 2647
2003my %textures; 2648my %textures;
2004 2649
2005sub new { 2650sub new {
2006 my $class = shift; 2651 my $class = shift;
2016 can_events => 1, 2661 can_events => 1,
2017 @_ 2662 @_
2018 ); 2663 );
2019} 2664}
2020 2665
2666sub invoke_button_down {
2667 my ($self, $ev, $x, $y) = @_;
2668
2669 1
2670}
2671
2021sub invoke_button_up { 2672sub invoke_button_up {
2022 my ($self, $ev, $x, $y) = @_; 2673 my ($self, $ev, $x, $y) = @_;
2023 2674
2024 $self->emit ("activate") 2675 $self->emit ("activate")
2025 if $x >= 0 && $x < $self->{w} 2676 if $x >= 0 && $x < $self->{w}
2028 1 2679 1
2029} 2680}
2030 2681
2031############################################################################# 2682#############################################################################
2032 2683
2033package CFClient::UI::CheckBox; 2684package DC::UI::VGauge;
2034 2685
2035our @ISA = CFClient::UI::DrawBG::;
2036
2037my @tex =
2038 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2039 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2040
2041use CFClient::OpenGL;
2042
2043sub new {
2044 my $class = shift;
2045
2046 $class->SUPER::new (
2047 padding_x => 2,
2048 padding_y => 2,
2049 fg => [1, 1, 1],
2050 active_fg => [1, 1, 0],
2051 bg => [0, 0, 0, 0.2],
2052 active_bg => [1, 1, 1, 0.5],
2053 state => 0,
2054 can_hover => 1,
2055 @_
2056 )
2057}
2058
2059sub size_request {
2060 my ($self) = @_;
2061
2062 (6) x 2
2063}
2064
2065sub invoke_button_down {
2066 my ($self, $ev, $x, $y) = @_;
2067
2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070 $self->{state} = !$self->{state};
2071 $self->emit (changed => $self->{state});
2072 } else {
2073 return 0
2074 }
2075
2076 1
2077}
2078
2079sub _draw {
2080 my ($self) = @_;
2081
2082 $self->SUPER::_draw;
2083
2084 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2085
2086 my ($w, $h) = @$self{qw(w h)};
2087
2088 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2089
2090 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2091
2092 my $tex = $self->{state} ? $tex[1] : $tex[0];
2093
2094 glEnable GL_TEXTURE_2D;
2095 $tex->draw_quad_alpha (0, 0, $s, $s);
2096 glDisable GL_TEXTURE_2D;
2097}
2098
2099#############################################################################
2100
2101package CFClient::UI::Image;
2102
2103our @ISA = CFClient::UI::Base::; 2686our @ISA = DC::UI::Base::;
2104
2105use CFClient::OpenGL;
2106
2107our %texture_cache;
2108
2109sub new {
2110 my $class = shift;
2111
2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
2116
2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
2119
2120 $self->{tex} = $texture_cache{$self->{path}} ||=
2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2122
2123 Scalar::Util::weaken $texture_cache{$self->{path}};
2124
2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2126
2127 $self
2128}
2129
2130sub size_request {
2131 my ($self) = @_;
2132
2133 ($self->{tex}{w}, $self->{tex}{h})
2134}
2135
2136sub _draw {
2137 my ($self) = @_;
2138
2139 my $tex = $self->{tex};
2140
2141 my ($w, $h) = ($self->{w}, $self->{h});
2142
2143 if ($self->{rot90}) {
2144 glRotate 90, 0, 0, 1;
2145 glTranslate 0, -$self->{w}, 0;
2146
2147 ($w, $h) = ($h, $w);
2148 }
2149
2150 glEnable GL_TEXTURE_2D;
2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152
2153 $tex->draw_quad_alpha (0, 0, $w, $h);
2154
2155 glDisable GL_TEXTURE_2D;
2156}
2157
2158#############################################################################
2159
2160package CFClient::UI::VGauge;
2161
2162our @ISA = CFClient::UI::Base::;
2163 2687
2164use List::Util qw(min max); 2688use List::Util qw(min max);
2165 2689
2166use CFClient::OpenGL; 2690use DC::OpenGL;
2167 2691
2168my %tex = ( 2692my %tex = (
2169 food => [ 2693 food => [
2170 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2694 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2171 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2695 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2172 ], 2696 ],
2173 grace => [ 2697 grace => [
2174 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2698 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2175 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/
2176 ], 2700 ],
2177 hp => [ 2701 hp => [
2178 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2702 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2179 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2703 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2180 ], 2704 ],
2181 mana => [ 2705 mana => [
2182 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2706 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2183 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/
2184 ], 2708 ],
2185); 2709);
2186 2710
2187# eg. VGauge->new (gauge => 'food'), default gauge: food 2711# eg. VGauge->new (gauge => 'food'), default gauge: food
2247 my $ycut1 = max 0, min 1, $ycut; 2771 my $ycut1 = max 0, min 1, $ycut;
2248 my $ycut2 = max 0, min 1, $ycut - 1; 2772 my $ycut2 = max 0, min 1, $ycut - 1;
2249 2773
2250 my $h1 = $self->{h} * (1 - $ycut1); 2774 my $h1 = $self->{h} * (1 - $ycut1);
2251 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);
2252 2779
2253 glEnable GL_BLEND; 2780 glEnable GL_BLEND;
2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2781 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2782 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256 glEnable GL_TEXTURE_2D; 2783 glEnable GL_TEXTURE_2D;
2275 2802
2276 if ($t3) { 2803 if ($t3) {
2277 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2804 glBindTexture GL_TEXTURE_2D, $t3->{name};
2278 glBegin GL_QUADS; 2805 glBegin GL_QUADS;
2279 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2806 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2807 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2808 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2809 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283 glEnd; 2810 glEnd;
2284 } 2811 }
2285 2812
2286 glDisable GL_BLEND; 2813 glDisable GL_BLEND;
2287 glDisable GL_TEXTURE_2D; 2814 glDisable GL_TEXTURE_2D;
2288} 2815}
2289 2816
2290############################################################################# 2817#############################################################################
2291 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
2292package CFClient::UI::Gauge; 2957package DC::UI::Gauge;
2293 2958
2294our @ISA = CFClient::UI::VBox::; 2959our @ISA = DC::UI::VBox::;
2295 2960
2296sub new { 2961sub new {
2297 my ($class, %arg) = @_; 2962 my ($class, %arg) = @_;
2298 2963
2299 my $self = $class->SUPER::new ( 2964 my $self = $class->SUPER::new (
2301 can_hover => 1, 2966 can_hover => 1,
2302 can_events => 1, 2967 can_events => 1,
2303 %arg, 2968 %arg,
2304 ); 2969 );
2305 2970
2306 $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");
2307 $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);
2308 $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");
2309 2974
2310 $self 2975 $self
2311} 2976}
2312 2977
2313sub set_fontsize { 2978sub set_fontsize {
2334 $self->{value}->set_text ($val); 2999 $self->{value}->set_text ($val);
2335} 3000}
2336 3001
2337############################################################################# 3002#############################################################################
2338 3003
2339package CFClient::UI::Slider; 3004package DC::UI::Slider;
2340 3005
2341use strict; 3006use strict;
2342 3007
2343use CFClient::OpenGL; 3008use DC::OpenGL;
2344 3009
2345our @ISA = CFClient::UI::DrawBG::; 3010our @ISA = DC::UI::DrawBG::;
2346 3011
2347my @tex = 3012my @tex =
2348 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3013 map { new_from_file DC::Texture DC::find_rcfile $_ }
2349 qw(s1_slider.png s1_slider_bg.png); 3014 qw(s1_slider.png s1_slider_bg.png);
2350 3015
2351sub new { 3016sub new {
2352 my $class = shift; 3017 my $class = shift;
2353 3018
2421 3086
2422 $self->SUPER::invoke_button_down ($ev, $x, $y); 3087 $self->SUPER::invoke_button_down ($ev, $x, $y);
2423 3088
2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3089 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2425 3090
2426 $self->invoke_mouse_motion ($ev, $x, $y) 3091 $self->invoke_mouse_motion ($ev, $x, $y);
3092
3093 1
2427} 3094}
2428 3095
2429sub invoke_mouse_motion { 3096sub invoke_mouse_motion {
2430 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2431 3098
2438 3105
2439 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3106 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2440 } else { 3107 } else {
2441 return 0; 3108 return 0;
2442 } 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);
2443 3122
2444 1 3123 1
2445} 3124}
2446 3125
2447sub update { 3126sub update {
2498 glDisable GL_TEXTURE_2D; 3177 glDisable GL_TEXTURE_2D;
2499} 3178}
2500 3179
2501############################################################################# 3180#############################################################################
2502 3181
2503package CFClient::UI::ValSlider; 3182package DC::UI::ValSlider;
2504 3183
2505our @ISA = CFClient::UI::HBox::; 3184our @ISA = DC::UI::HBox::;
2506 3185
2507sub new { 3186sub new {
2508 my ($class, %arg) = @_; 3187 my ($class, %arg) = @_;
2509 3188
2510 my $range = delete $arg{range}; 3189 my $range = delete $arg{range};
2511 3190
2512 my $self = $class->SUPER::new ( 3191 my $self = $class->SUPER::new (
2513 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3192 slider => (new DC::UI::Slider expand => 1, range => $range),
2514 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3193 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2515 to_value => sub { shift }, 3194 to_value => sub { shift },
2516 from_value => sub { shift }, 3195 from_value => sub { shift },
2517 %arg, 3196 %arg,
2518 ); 3197 );
2519 3198
2539sub set_range { shift->{slider}->set_range (@_) } 3218sub set_range { shift->{slider}->set_range (@_) }
2540sub set_value { shift->{slider}->set_value (@_) } 3219sub set_value { shift->{slider}->set_value (@_) }
2541 3220
2542############################################################################# 3221#############################################################################
2543 3222
2544package CFClient::UI::TextScroller; 3223package DC::UI::TextScroller;
2545 3224
2546our @ISA = CFClient::UI::HBox::; 3225our @ISA = DC::UI::HBox::;
2547 3226
2548use CFClient::OpenGL; 3227use DC::OpenGL;
2549 3228
2550sub new { 3229sub new {
2551 my $class = shift; 3230 my $class = shift;
2552 3231
2553 my $self = $class->SUPER::new ( 3232 my $self = $class->SUPER::new (
2554 fontsize => 1, 3233 fontsize => 1,
2555 can_events => 0, 3234 can_events => 1,
2556 indent => 0, 3235 indent => 0,
2557 #font => default_font 3236 #font => default_font
2558 @_, 3237 @_,
2559 3238
2560 layout => (new CFClient::Layout 1), 3239 layout => (new DC::Layout),
2561 par => [], 3240 par => [],
3241 max_par => 0,
2562 height => 0, 3242 height => 0,
2563 children => [ 3243 children => [
2564 (new CFClient::UI::Empty expand => 1), 3244 (new DC::UI::Empty expand => 1),
2565 (new CFClient::UI::Slider vertical => 1), 3245 (new DC::UI::Slider vertical => 1),
2566 ], 3246 ],
2567 ); 3247 );
2568 3248
2569 $self->{children}[1]->connect (changed => sub { $self->update }); 3249 $self->{children}[1]->connect (changed => sub { $self->update });
2570 3250
2579} 3259}
2580 3260
2581sub size_request { 3261sub size_request {
2582 my ($self) = @_; 3262 my ($self) = @_;
2583 3263
2584 my ($empty, $slider) = @{ $self->{children} }; 3264 my ($empty, $slider) = $self->visible_children;
2585 3265
2586 local $self->{children} = [$empty, $slider]; 3266 local $self->{children} = [$empty, $slider];
2587 $self->SUPER::size_request 3267 $self->SUPER::size_request
2588} 3268}
2589 3269
2600 3280
2601 $self->reflow; 3281 $self->reflow;
2602 3282
2603 local $self->{children} = [$empty, $slider]; 3283 local $self->{children} = [$empty, $slider];
2604 $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
2605} 3295}
2606 3296
2607sub get_layout { 3297sub get_layout {
2608 my ($self, $para) = @_; 3298 my ($self, $para) = @_;
2609 3299
2637 3327
2638 # todo: base offset on lines or so, not on pixels 3328 # todo: base offset on lines or so, not on pixels
2639 $self->{children}[1]->set_value ($offset); 3329 $self->{children}[1]->set_value ($offset);
2640} 3330}
2641 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
2642sub clear { 3347sub clear {
2643 my ($self) = @_; 3348 my ($self) = @_;
2644 3349
2645 my (undef, undef, @other) = @{ $self->{children} }; 3350 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other; 3351 $self->remove ($_) for @other;
2649 $self->{height} = 0; 3354 $self->{height} = 0;
2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3355 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651} 3356}
2652 3357
2653sub add_paragraph { 3358sub add_paragraph {
2654 my ($self, $color, $para, $indent) = @_; 3359 my $self = shift;
2655 3360
2656 my ($text, @w) = ref $para ? @$para : $para; 3361 for my $para (@_) {
2657
2658 $para = { 3362 $para = {
3363 fg => [1, 1, 1, 1],
3364 indent => 0,
3365 markup => "",
3366 widget => [],
3367 ref $para ? %$para : (markup => $para),
2659 w => 1e10, 3368 w => 1e10,
2660 wrapped => 1, 3369 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2665 }; 3370 };
2666 3371
2667 $self->add (@w) if @w; 3372 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668 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 }
2669 3379
2670 $self->{need_reflow}++; 3380 $self->{need_reflow}++;
2671 $self->update; 3381 $self->update;
2672} 3382}
2673 3383
2674sub scroll_to_bottom { 3384sub scroll_to_bottom {
2675 my ($self) = @_; 3385 my ($self) = @_;
2676 3386
2677 $self->{scroll_to_bottom} = 1; 3387 $self->{scroll_to} = $#{$self->{par}};
2678 $self->update; 3388 $self->update;
2679} 3389}
2680 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
2681sub update { 3424sub update {
2682 my ($self) = @_; 3425 my ($self) = @_;
2683 3426
2684 $self->SUPER::update; 3427 $self->SUPER::update;
2685 3428
2686 return unless $self->{h} > 0; 3429 return unless $self->{h} > 0;
2687 3430
2688 delete $self->{texture}; 3431 delete $self->{texture};
2689 3432
2690 $ROOT->on_post_alloc ($self => sub { 3433 $ROOT->on_post_alloc ($self => sub {
3434 $self->force_uptodate;
3435
2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3436 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2692 3437
2693 if (delete $self->{need_reflow}) {
2694 my $height = 0;
2695
2696 for my $para (@{$self->{par}}) {
2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2698 my $layout = $self->get_layout ($para);
2699 my ($w, $h) = $layout->size;
2700
2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2704 }
2705
2706 $height += $para->{h};
2707 }
2708
2709 $self->{height} = $height;
2710
2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2712
2713 delete $self->{texture};
2714 }
2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2718 }
2719
2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3438 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2721 glClearColor 0, 0, 0, 0; 3439 glClearColor 0, 0, 0, 0;
2722 glClear GL_COLOR_BUFFER_BIT; 3440 glClear GL_COLOR_BUFFER_BIT;
2723 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;
2724 my $top = int $self->{children}[1]{range}[0]; 3450 my $top = int $self->{children}[1]{range}[0];
2725 3451
2726 my $y0 = $top; 3452 my $y0 = $top;
2727 my $y1 = $top + $H; 3453 my $y1 = $top + $H;
2728 3454
2729 my $y = 0;
2730
2731 glEnable GL_BLEND;
2732 #TODO# not correct in windows where rgba is forced off
2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735 for my $para (@{$self->{par}}) { 3455 for my $para (@{$self->{par}}) {
2736 my $h = $para->{h}; 3456 my $h = $para->{h};
3457 my $y = $para->{y};
2737 3458
2738 if ($y0 < $y + $h && $y < $y1) { 3459 if ($y0 < $y + $h && $y < $y1) {
2739
2740 my $layout = $self->get_layout ($para); 3460 my $layout = $self->get_layout ($para);
2741 3461
2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744 glRasterPos $para->{indent}, $y - $y0; 3462 $layout->render ($para->{indent}, $y - $y0);
2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3463 $layout->draw;
2746 3464
2747 if (my @w = @{ $para->{widget} }) { 3465 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes; 3466 my @s = $layout->get_shapes;
2749 3467
2750 glDisable GL_BLEND;
2751 for (@w) { 3468 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, (); 3469 my ($dx, $dy) = splice @s, 0, 2, ();
2753 3470
2754 $_->{x} = $dx + $para->{indent}; 3471 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0; 3472 $_->{y} = $dy + $y - $y0;
2756 3473
2757 $_->draw; 3474 $_->draw;
2758 } 3475 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 } 3476 }
2762 } 3477 }
2763 3478
2764 $y += $h; 3479 $paridx++;
3480 $top_paragraph ||= $paridx if $y >= $top;
2765 } 3481 }
2766 3482
2767 glDisable GL_BLEND; 3483 $self->{top_paragraph} = $top_paragraph;
2768 }; 3484 };
2769 }); 3485 });
2770} 3486}
2771 3487
2772sub reconfigure { 3488sub reconfigure {
2790 $self->{children}[1]->draw; 3506 $self->{children}[1]->draw;
2791} 3507}
2792 3508
2793############################################################################# 3509#############################################################################
2794 3510
2795package CFClient::UI::Animator; 3511package DC::UI::Animator;
2796 3512
2797use CFClient::OpenGL; 3513use DC::OpenGL;
2798 3514
2799our @ISA = CFClient::UI::Bin::; 3515our @ISA = DC::UI::Bin::;
2800 3516
2801sub moveto { 3517sub moveto {
2802 my ($self, $x, $y) = @_; 3518 my ($self, $x, $y) = @_;
2803 3519
2804 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3520 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
2832 glPopMatrix; 3548 glPopMatrix;
2833} 3549}
2834 3550
2835############################################################################# 3551#############################################################################
2836 3552
2837package CFClient::UI::Flopper; 3553package DC::UI::Flopper;
2838 3554
2839our @ISA = CFClient::UI::Button::; 3555our @ISA = DC::UI::Button::;
2840 3556
2841sub new { 3557sub new {
2842 my $class = shift; 3558 my $class = shift;
2843 3559
2844 my $self = $class->SUPER::new ( 3560 my $self = $class->SUPER::new (
2856 $self->{other}->toggle_visibility; 3572 $self->{other}->toggle_visibility;
2857} 3573}
2858 3574
2859############################################################################# 3575#############################################################################
2860 3576
2861package CFClient::UI::Tooltip; 3577package DC::UI::Tooltip;
2862 3578
2863our @ISA = CFClient::UI::Bin::; 3579our @ISA = DC::UI::Bin::;
2864 3580
2865use CFClient::OpenGL; 3581use DC::OpenGL;
2866 3582
2867sub new { 3583sub new {
2868 my $class = shift; 3584 my $class = shift;
2869 3585
2870 $class->SUPER::new ( 3586 $class->SUPER::new (
2874} 3590}
2875 3591
2876sub set_tooltip_from { 3592sub set_tooltip_from {
2877 my ($self, $widget) = @_; 3593 my ($self, $widget) = @_;
2878 3594
2879 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 =~ /^#(.*)$/;
2880 3600
2881 if ($ENV{CFPLUS_DEBUG} & 2) { 3601 if ($ENV{CFPLUS_DEBUG} & 2) {
2882 $tooltip .= "\n\n" . (ref $widget) . "\n" 3602 $tip .= "\n\n" . (ref $widget) . "\n"
2883 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3603 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2884 . "req $widget->{req_w} $widget->{req_h}\n" 3604 . "req $widget->{req_w} $widget->{req_h}\n"
2885 . "visible $widget->{visible}"; 3605 . "visible $widget->{visible}";
2886 } 3606 }
2887 3607
2888 $tooltip =~ s/^\n+//; 3608 $tip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//; 3609 $tip =~ s/\n+$//;
2890 3610
2891 $self->add (new CFClient::UI::Label 3611 $self->add (new DC::UI::Label
2892 markup => $tooltip, 3612 markup => $tip,
2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3613 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2894 fontsize => 0.8, 3614 fontsize => 0.8,
2895 fg => [0, 0, 0, 1], 3615 style => 1, # FLAG_INVERSE
2896 ellipsise => 0, 3616 ellipsise => 0,
2897 font => ($widget->{tooltip_font} || $::FONT_PROP), 3617 font => ($widget->{tooltip_font} || $::FONT_PROP),
2898 ); 3618 );
2899} 3619}
2900 3620
2919 3639
2920 $self->{root}->on_post_alloc ("move_$self" => sub { 3640 $self->{root}->on_post_alloc ("move_$self" => sub {
2921 my $widget = $self->{owner} 3641 my $widget = $self->{owner}
2922 or return; 3642 or return;
2923 3643
3644 if ($widget->{visible}) {
2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3645 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925 3646
2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3647 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927 if $x + $self->{w} > $self->{root}{w}; 3648 if $x + $self->{w} > $self->{root}{w};
2928 3649
2929 $self->move_abs ($x, $y); 3650 $self->move_abs ($x, $y);
3651 } else {
3652 $self->hide;
3653 }
2930 }); 3654 });
2931} 3655}
2932 3656
2933sub _draw { 3657sub _draw {
2934 my ($self) = @_; 3658 my ($self) = @_;
2935 3659
2936 glTranslate 0.375, 0.375;
2937
2938 my ($w, $h) = @$self{qw(w h)}; 3660 my ($w, $h) = @$self{qw(w h)};
2939 3661
2940 glColor 1, 0.8, 0.4; 3662 glColor 1, 0.8, 0.4;
2941 glBegin GL_QUADS; 3663 glRect 0, 0, $w, $h;
2942 glVertex 0 , 0;
2943 glVertex 0 , $h;
2944 glVertex $w, $h;
2945 glVertex $w, 0;
2946 glEnd;
2947 3664
2948 glColor 0, 0, 0; 3665 glColor 0, 0, 0;
2949 glBegin GL_LINE_LOOP; 3666 glRect_lineloop .5, .5, $w + .5, $h + .5;
2950 glVertex 0 , 0;
2951 glVertex 0 , $h;
2952 glVertex $w, $h;
2953 glVertex $w, 0;
2954 glEnd;
2955 3667
2956 glTranslate 2 - 0.375, 2 - 0.375; 3668 glTranslate 2, 2;
2957 3669
2958 $self->SUPER::_draw; 3670 $self->SUPER::_draw;
2959} 3671}
2960 3672
2961############################################################################# 3673#############################################################################
2962 3674
2963package CFClient::UI::Face; 3675package DC::UI::Face;
2964 3676
2965our @ISA = CFClient::UI::Base::; 3677our @ISA = DC::UI::DrawBG::;
2966 3678
2967use CFClient::OpenGL; 3679use DC::OpenGL;
2968 3680
2969sub new { 3681sub new {
2970 my $class = shift; 3682 my $class = shift;
2971 3683
2972 my $self = $class->SUPER::new ( 3684 my $self = $class->SUPER::new (
3685 size_w => 32,
3686 size_h => 8,
2973 aspect => 1, 3687 aspect => 1,
2974 can_events => 0, 3688 can_events => 0,
2975 @_, 3689 @_,
2976 ); 3690 );
2977 3691
2978 if ($self->{anim} && $self->{animspeed}) { 3692 if ($self->{anim} && $self->{animspeed}) {
2979 Scalar::Util::weaken (my $widget = $self); 3693 DC::weaken (my $widget = $self);
2980 3694
2981 $self->{timer} = Event->timer ( 3695 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2982 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3696 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2983 hard => 1, 3697 return unless $::CONN;
2984 interval => $self->{animspeed}, 3698
2985 cb => sub { 3699 my $w = $widget
3700 or return;
3701
2986 ++$widget->{frame}; 3702 ++$w->{frame};
3703 $w->update_face;
3704
3705 # somehow, $widget can go away
2987 $widget->update; 3706 $w->update;
2988 }, 3707 $w->update_timer;
2989 ); 3708 };
3709
3710 $self->update_face;
3711 $self->update_timer;
2990 } 3712 }
2991 3713
2992 $self 3714 $self
2993} 3715}
2994 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
2995sub size_request { 3748sub size_request {
2996 (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)
2997} 3766}
2998 3767
2999sub update { 3768sub update {
3000 my ($self) = @_; 3769 my ($self) = @_;
3001 3770
3002 return unless $self->{visible}; 3771 return unless $self->{visible};
3003 3772
3004 $self->SUPER::update; 3773 $self->SUPER::update;
3005} 3774}
3006 3775
3776sub invoke_visibility_change {
3777 my ($self) = @_;
3778
3779 $self->update_timer;
3780
3781 0
3782}
3783
3007sub _draw { 3784sub _draw {
3008 my ($self) = @_; 3785 my ($self) = @_;
3009 3786
3010 return unless $::CONN; 3787 $self->SUPER::_draw;
3011 3788
3012 my $face; 3789 if (my $tex = $self->{tex}) {
3013
3014 if ($self->{frame}) {
3015 my $anim = $::CONN->{anim}[$self->{anim}];
3016
3017 $face = $anim->[ $self->{frame} % @$anim ]
3018 if $anim && @$anim;
3019 }
3020
3021 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3022
3023 if ($tex) {
3024 glEnable GL_TEXTURE_2D; 3790 glEnable GL_TEXTURE_2D;
3025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3791 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3026 glColor 0, 0, 0, 1; 3792 glColor 0, 0, 0, 1;
3027 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3793 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3028 glDisable GL_TEXTURE_2D; 3794 glDisable GL_TEXTURE_2D;
3030} 3796}
3031 3797
3032sub destroy { 3798sub destroy {
3033 my ($self) = @_; 3799 my ($self) = @_;
3034 3800
3035 $self->{timer}->cancel 3801 (delete $self->{timer})->cancel
3036 if $self->{timer}; 3802 if $self->{timer};
3037 3803
3038 $self->SUPER::destroy; 3804 $self->SUPER::destroy;
3039} 3805}
3040 3806
3041############################################################################# 3807#############################################################################
3042 3808
3043package CFClient::UI::Buttonbar; 3809package DC::UI::Buttonbar;
3044 3810
3045our @ISA = CFClient::UI::HBox::; 3811our @ISA = DC::UI::HBox::;
3046 3812
3047# TODO: should actualyl wrap buttons and other goodies. 3813# TODO: should actually wrap buttons and other goodies.
3048 3814
3049############################################################################# 3815#############################################################################
3050 3816
3051package CFClient::UI::Menu; 3817package DC::UI::Menu;
3052 3818
3053our @ISA = CFClient::UI::FancyFrame::; 3819our @ISA = DC::UI::Toplevel::;
3054 3820
3055use CFClient::OpenGL; 3821use DC::OpenGL;
3056 3822
3057sub new { 3823sub new {
3058 my $class = shift; 3824 my $class = shift;
3059 3825
3060 my $self = $class->SUPER::new ( 3826 my $self = $class->SUPER::new (
3061 items => [], 3827 items => [],
3062 z => 100, 3828 z => 100,
3063 @_, 3829 @_,
3064 ); 3830 );
3065 3831
3066 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3832 $self->add ($self->{vbox} = new DC::UI::VBox);
3067 3833
3068 for my $item (@{ $self->{items} }) { 3834 for my $item (@{ $self->{items} }) {
3069 my ($widget, $cb, $tooltip) = @$item; 3835 my ($widget, $cb, $tooltip) = @$item;
3070 3836
3071 # handle various types of items, only text for now 3837 # handle various types of items, only text for now
3072 if (!ref $widget) { 3838 if (!ref $widget) {
3839 if ($widget =~ /\t/) {
3840 my ($left, $right) = split /\t/, $widget, 2;
3841
3073 $widget = new CFClient::UI::Label 3842 $widget = new DC::UI::HBox
3074 can_hover => 1, 3843 can_hover => 1,
3075 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,
3076 markup => $widget, 3856 markup => $widget,
3077 tooltip => $tooltip 3857 tooltip => $tooltip;
3858 }
3078 } 3859 }
3079 3860
3080 $self->{item}{$widget} = $item; 3861 $self->{item}{$widget} = $item;
3081 3862
3082 $self->{vbox}->add ($widget); 3863 $self->{vbox}->add ($widget);
3125 1 3906 1
3126} 3907}
3127 3908
3128############################################################################# 3909#############################################################################
3129 3910
3130package CFClient::UI::Multiplexer; 3911package DC::UI::Multiplexer;
3131 3912
3132our @ISA = CFClient::UI::Container::; 3913our @ISA = DC::UI::Container::;
3133 3914
3134sub new { 3915sub new {
3135 my $class = shift; 3916 my $class = shift;
3136 3917
3137 my $self = $class->SUPER::new ( 3918 my $self = $class->SUPER::new (
3151 3932
3152 $self->{current} = $self->{children}[0] 3933 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} }; 3934 if @{ $self->{children} };
3154} 3935}
3155 3936
3937sub get_current_page {
3938 my ($self) = @_;
3939
3940 $self->{current}
3941}
3942
3156sub set_current_page { 3943sub set_current_page {
3157 my ($self, $page_or_widget) = @_; 3944 my ($self, $page_or_widget) = @_;
3158 3945
3159 my $widget = ref $page_or_widget 3946 my $widget = ref $page_or_widget
3160 ? $page_or_widget 3947 ? $page_or_widget
3192 $self->{current}->draw; 3979 $self->{current}->draw;
3193} 3980}
3194 3981
3195############################################################################# 3982#############################################################################
3196 3983
3197package CFClient::UI::Notebook; 3984package DC::UI::Notebook;
3198 3985
3986use DC::OpenGL;
3987
3199our @ISA = CFClient::UI::VBox::; 3988our @ISA = DC::UI::VBox::;
3200 3989
3201sub new { 3990sub new {
3202 my $class = shift; 3991 my $class = shift;
3203 3992
3204 my $self = $class->SUPER::new ( 3993 my $self = $class->SUPER::new (
3205 buttonbar => (new CFClient::UI::Buttonbar), 3994 buttonbar => (new DC::UI::Buttonbar),
3206 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3995 multiplexer => (new DC::UI::Multiplexer expand => 1),
3996 active_outline => [.7, .7, 0.2],
3207 # filter => # will be put between multiplexer and $self 3997 # filter => # will be put between multiplexer and $self
3208 @_, 3998 @_,
3209 ); 3999 );
3210 4000
3211 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4001 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3212 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4002 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3213 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
3214 $self 4038 $self
3215} 4039}
3216 4040
3217sub 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 {
3218 my ($self, $title, $widget, $tooltip) = @_; 4059 my ($self, $title, $widget, $tooltip) = @_;
3219 4060
3220 Scalar::Util::weaken $self; 4061 $title = [$title, $tooltip] unless ref $title;
4062 $widget->{c_tab} = $title;
3221 4063
3222 $self->{buttonbar}->add (new CFClient::UI::Button
3223 markup => $title,
3224 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) },
3226 );
3227
3228 $self->{multiplexer}->add ($widget); 4064 $self->add ($widget);
4065}
4066
4067sub get_current_page {
4068 my ($self) = @_;
4069
4070 $self->{multiplexer}->get_current_page
3229} 4071}
3230 4072
3231sub set_current_page { 4073sub set_current_page {
3232 my ($self, $page) = @_; 4074 my ($self, $page) = @_;
3233 4075
3234 $self->{multiplexer}->set_current_page ($page); 4076 $self->{multiplexer}->set_current_page ($page);
3235 $self->emit (page_changed => $self->{multiplexer}{current}); 4077 $self->emit (page_changed => $self->{multiplexer}{current});
3236} 4078}
3237 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
3238############################################################################# 4100#############################################################################
3239 4101
3240package CFClient::UI::Combobox; 4102package DC::UI::Selector;
3241 4103
3242use utf8; 4104use utf8;
3243 4105
3244our @ISA = CFClient::UI::Button::; 4106our @ISA = DC::UI::Button::;
3245 4107
3246sub new { 4108sub new {
3247 my $class = shift; 4109 my $class = shift;
3248 4110
3249 my $self = $class->SUPER::new ( 4111 my $self = $class->SUPER::new (
3266 my ($value, $title, $tooltip) = @$_; 4128 my ($value, $title, $tooltip) = @$_;
3267 4129
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4130 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 } 4131 }
3270 4132
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4133 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272} 4134}
3273 4135
3274sub _set_value { 4136sub _set_value {
3275 my ($self, $value) = @_; 4137 my ($self, $value) = @_;
3276 4138
3277 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4139 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4140 $item ||= $self->{options}[0]
3278 or return; 4141 or return;
3279 4142
3280 $self->{value} = $item->[0]; 4143 $self->{value} = $item->[0];
3281 $self->set_markup ("$item->[1] ⇓"); 4144 $self->set_markup ("$item->[1] ⇓");
3282 $self->set_tooltip ($item->[2]); 4145# $self->set_tooltip ($item->[2]);
3283} 4146}
3284 4147
3285sub set_value { 4148sub set_value {
3286 my ($self, $value) = @_; 4149 my ($self, $value) = @_;
3287 4150
3289 4152
3290 $self->_set_value ($value); 4153 $self->_set_value ($value);
3291 $self->emit (changed => $value); 4154 $self->emit (changed => $value);
3292} 4155}
3293 4156
4157sub set_options {
4158 my ($self, $options) = @_;
4159
4160 $self->{options} = $options;
4161 $self->_set_value ($self->{value});
4162}
4163
3294############################################################################# 4164#############################################################################
3295 4165
3296package CFClient::UI::Statusbox; 4166package DC::UI::Statusbox;
3297 4167
3298our @ISA = CFClient::UI::VBox::; 4168our @ISA = DC::UI::VBox::;
3299 4169
3300sub new { 4170sub new {
3301 my $class = shift; 4171 my $class = shift;
3302 4172
3303 my $self = $class->SUPER::new ( 4173 my $self = $class->SUPER::new (
3304 fontsize => 0.8, 4174 fontsize => 0.8,
3305 @_, 4175 @_,
3306 ); 4176 );
3307 4177
3308 Scalar::Util::weaken (my $this = $self); 4178 DC::weaken (my $this = $self);
3309 4179
3310 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4180 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3311 4181
3312 $self 4182 $self
3313} 4183}
3314 4184
3315sub reorder { 4185sub reorder {
3316 my ($self) = @_; 4186 my ($self) = @_;
3317 my $NOW = Time::HiRes::time; 4187 my $NOW = Time::HiRes::time;
3318 4188
3319 # freeze display when hovering over any label 4189 # freeze display when hovering over any label
3320 return if $CFClient::UI::TOOLTIP->{owner} 4190 return if $DC::UI::TOOLTIP->{owner}
3321 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4191 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3322 values %{ $self->{item} }; 4192 values %{ $self->{item} };
3323 4193
3324 while (my ($k, $v) = each %{ $self->{item} }) { 4194 while (my ($k, $v) = each %{ $self->{item} }) {
3325 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4195 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3326 } 4196 }
4197
4198 $self->{timer}->set (1, 1);
3327 4199
3328 my @widgets; 4200 my @widgets;
3329 4201
3330 my @items = sort { 4202 my @items = sort {
3331 $a->{pri} <=> $b->{pri} 4203 $a->{pri} <=> $b->{pri}
3332 or $b->{id} <=> $a->{id} 4204 or $b->{id} <=> $a->{id}
3333 } values %{ $self->{item} }; 4205 } values %{ $self->{item} };
3334
3335 $self->{timer}->interval (1);
3336 4206
3337 my $count = 10 + 1; 4207 my $count = 10 + 1;
3338 for my $item (@items) { 4208 for my $item (@items) {
3339 last unless --$count; 4209 last unless --$count;
3340 4210
3347 for ($short) { 4217 for ($short) {
3348 s/^\s+//; 4218 s/^\s+//;
3349 s/\s+/ /g; 4219 s/\s+/ /g;
3350 } 4220 }
3351 4221
3352 new CFClient::UI::Label 4222 new DC::UI::Label
3353 markup => $short, 4223 markup => $short,
3354 tooltip => $item->{tooltip}, 4224 tooltip => $item->{tooltip},
3355 tooltip_font => $::FONT_PROP, 4225 tooltip_font => $::FONT_PROP,
3356 tooltip_width => 0.67, 4226 tooltip_width => 0.67,
3357 fontsize => $item->{fontsize} || $self->{fontsize}, 4227 fontsize => $item->{fontsize} || $self->{fontsize},
3364 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4234 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3365 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4235 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3366 $label->update; 4236 $label->update;
3367 $label->set_max_size (undef, $label->{req_h} * $diff) 4237 $label->set_max_size (undef, $label->{req_h} * $diff)
3368 if $diff < 1; 4238 if $diff < 1;
3369 $self->{timer}->interval (1/30); 4239 $self->{timer}->set (1/30, 1/30);
3370 } else { 4240 } else {
3371 $label->{fg}[3] = $item->{fg}[3] || 1; 4241 $label->{fg}[3] = $item->{fg}[3] || 1;
3372 } 4242 }
3373 4243
3374 push @widgets, $label; 4244 push @widgets, $label;
3436 $self->SUPER::destroy; 4306 $self->SUPER::destroy;
3437} 4307}
3438 4308
3439############################################################################# 4309#############################################################################
3440 4310
3441package CFClient::UI::Inventory;
3442
3443our @ISA = CFClient::UI::ScrolledWindow::;
3444
3445sub new {
3446 my $class = shift;
3447
3448 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450 @_,
3451 );
3452
3453 $self
3454}
3455
3456sub set_items {
3457 my ($self, $items) = @_;
3458
3459 $self->{child}->clear;
3460 return unless $items;
3461
3462 my @items = sort {
3463 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name})
3465 } values %$items;
3466
3467 $self->{real_items} = \@items;
3468
3469 my $row = 0;
3470 for my $item (@items) {
3471 CFClient::Item::update_widgets $item;
3472
3473 $self->{child}->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget});
3476
3477 $row++;
3478 }
3479}
3480
3481#############################################################################
3482
3483package CFClient::UI::SpellList;
3484
3485our @ISA = CFClient::UI::Table::;
3486
3487sub new {
3488 my $class = shift;
3489
3490 my $self = $class->SUPER::new (
3491 binding => [],
3492 commands => [],
3493 @_,
3494 )
3495}
3496
3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510sub rebuild_spell_list {
3511 my ($self) = @_;
3512
3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3514 $self->clear;
3515
3516 return unless $::CONN;
3517
3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3545 } else {
3546 return 0;
3547 }
3548
3549 1
3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578 }
3579 });
3580}
3581
3582sub add_spell {
3583 my ($self, $spell) = @_;
3584
3585 $self->{spell}->{$spell->{name}} = $spell;
3586 $self->rebuild_spell_list;
3587}
3588
3589sub remove_spell {
3590 my ($self, $spell) = @_;
3591
3592 delete $self->{spell}->{$spell->{name}};
3593 $self->rebuild_spell_list;
3594}
3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3600 $self->rebuild_spell_list;
3601}
3602
3603#############################################################################
3604
3605package CFClient::UI::Root; 4311package DC::UI::Root;
3606 4312
3607our @ISA = CFClient::UI::Container::; 4313our @ISA = DC::UI::Container::;
3608 4314
3609use List::Util qw(min max); 4315use List::Util qw(min max);
3610 4316
3611use CFClient::OpenGL; 4317use DC::OpenGL;
3612 4318
3613sub new { 4319sub new {
3614 my $class = shift; 4320 my $class = shift;
3615 4321
3616 my $self = $class->SUPER::new ( 4322 my $self = $class->SUPER::new (
3617 visible => 1, 4323 visible => 1,
3618 @_, 4324 @_,
3619 ); 4325 );
3620 4326
3621 Scalar::Util::weaken ($self->{root} = $self); 4327 DC::weaken ($self->{root} = $self);
3622 4328
3623 $self 4329 $self
3624} 4330}
3625 4331
3626sub size_request { 4332sub size_request {
3674} 4380}
3675 4381
3676sub update { 4382sub update {
3677 my ($self) = @_; 4383 my ($self) = @_;
3678 4384
3679 $::WANT_REFRESH++; 4385 $::WANT_REFRESH = 1;
3680} 4386}
3681 4387
3682sub add { 4388sub add {
3683 my ($self, @children) = @_; 4389 my ($self, @children) = @_;
3684 4390
3721 while ($self->{refresh_hook}) { 4427 while ($self->{refresh_hook}) {
3722 $_->() 4428 $_->()
3723 for values %{delete $self->{refresh_hook}}; 4429 for values %{delete $self->{refresh_hook}};
3724 } 4430 }
3725 4431
3726 if ($self->{realloc}) { 4432 while ($self->{realloc}) {
3727 my %queue; 4433 my %queue;
3728 my @queue; 4434 my @queue;
3729 my $widget; 4435 my $widget;
3730 4436
3731 outer: 4437 outer:
3778 } 4484 }
3779 } 4485 }
3780 4486
3781 delete $self->{realloc}{$widget+0}; 4487 delete $self->{realloc}{$widget+0};
3782 } 4488 }
3783 }
3784 4489
3785 while (my $size_alloc = delete $self->{size_alloc}) { 4490 while (my $size_alloc = delete $self->{size_alloc}) {
3786 my @queue = sort { $b->{visible} <=> $a->{visible} } 4491 my @queue = sort { $a->{visible} <=> $b->{visible} }
3787 values %$size_alloc; 4492 values %$size_alloc;
3788 4493
3789 while () { 4494 while () {
3790 my $widget = pop @queue || last; 4495 my $widget = pop @queue || last;
3791 4496
3792 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4497 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793 4498
3794 $w = 0 if $w < 0; 4499 $w = max $widget->{min_w}, $w;
3795 $h = 0 if $h < 0; 4500 $h = max $widget->{min_h}, $h;
3796 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
3797 $w = int $w + 0.5; 4508 $w = int $w + 0.5;
3798 $h = int $h + 0.5; 4509 $h = int $h + 0.5;
3799 4510
3800 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}) {
3801 $widget->{old_w} = $widget->{w}; 4512 $widget->{old_w} = $widget->{w};
3802 $widget->{old_h} = $widget->{h}; 4513 $widget->{old_h} = $widget->{h};
3803 4514
3804 $widget->{w} = $w; 4515 $widget->{w} = $w;
3805 $widget->{h} = $h; 4516 $widget->{h} = $h;
3806 4517
3807 $widget->emit (size_allocate => $w, $h); 4518 $widget->emit (size_allocate => $w, $h);
4519 }
3808 } 4520 }
3809 } 4521 }
3810 } 4522 }
3811 4523
3812 while ($self->{post_alloc_hook}) { 4524 while ($self->{post_alloc_hook}) {
3813 $_->() 4525 $_->()
3814 for values %{delete $self->{post_alloc_hook}}; 4526 for values %{delete $self->{post_alloc_hook}};
3815 } 4527 }
3816
3817 4528
3818 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4529 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3819 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4530 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3820 glClear GL_COLOR_BUFFER_BIT; 4531 glClear GL_COLOR_BUFFER_BIT;
3821 4532
3824 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4535 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3825 glMatrixMode GL_MODELVIEW; 4536 glMatrixMode GL_MODELVIEW;
3826 glLoadIdentity; 4537 glLoadIdentity;
3827 4538
3828 { 4539 {
3829 package CFClient::UI::Base; 4540 package DC::UI::Base;
3830 4541
3831 ($draw_x, $draw_y, $draw_w, $draw_h) = 4542 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3832 (0, 0, $self->{w}, $self->{h}); 4543 (0, 0, $self->{w}, $self->{h});
3833 }
3834 4544
3835 $self->_draw; 4545 $self->_draw;
4546 }
3836} 4547}
3837 4548
3838############################################################################# 4549#############################################################################
3839 4550
3840package CFClient::UI; 4551package DC::UI;
3841 4552
3842$ROOT = new CFClient::UI::Root; 4553$ROOT = new DC::UI::Root;
3843$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4554$TOOLTIP = new DC::UI::Tooltip z => 900;
3844 4555
38451 45561
3846 4557

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines