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.294 by root, Tue Jun 6 03:19:26 2006 UTC vs.
Revision 1.453 by root, Wed Dec 26 20:46:39 2007 UTC

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

Diff Legend

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