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.284 by root, Mon Jun 5 03:06:04 2006 UTC vs.
Revision 1.462 by root, Thu Mar 20 22:28:33 2008 UTC

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

Diff Legend

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