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

Diff Legend

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