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.458 by root, Fri Dec 28 15:05:33 2007 UTC

1package CFClient::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFClient; 8use DC;
9use DC::Pod;
11use CFClient::Texture; 10use DC::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 29 $TOOLTIP->hide;
28 30
29 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 33
31 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
32 35
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show; 37 $TOOLTIP->show;
39 } 38 }
40 39
41 return; 40 return;
42 } 41 }
43 } 42 }
44 } 43 }
45 44
46 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48}); 48};
49 49
50sub get_layout { 50sub get_layout {
51 my $layout; 51 my $layout;
52 52
53 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->again;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
90 105
91 $GRAB = $widget; 106 $GRAB = $widget;
92 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
93 108
94 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
95 } 110 }
96 111
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
98 117
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 118 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 119 $ev->{dy} = $shift ? 0 : $delta;
120
121 $GRAB->emit (mouse_wheel => $ev);
122 } else {
123 $GRAB->emit (button_down => $ev)
124 }
125 }
101} 126}
102 127
103sub feed_sdl_button_up_event { 128sub feed_sdl_button_up_event {
104 my ($ev) = @_; 129 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 130
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 131 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 132
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 133 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 134
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 135 $GRAB->emit (button_up => $ev)
112 if $GRAB; 136 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 137
114 if (!$BUTTON_STATE) { 138 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 140 $grab->update if $grab;
117 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
118 142
143 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
120 } 145 }
121} 146}
122 147
123sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
124 my ($ev) = @_; 149 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 150 my ($x, $y) = ($ev->{x}, $ev->{y});
126 151
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 152 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 153
129 if ($widget != $HOVER) { 154 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 155
132 $hover->update if $hover && $hover->{can_hover}; 156 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 157 if $HOVER;
140} 158}
141 159
142# convert position array to integers 160# convert position array to integers
143sub harmonize { 161sub harmonize {
… …
193 reconfigure_widgets; 211 reconfigure_widgets;
194} 212}
195 213
196############################################################################# 214#############################################################################
197 215
216package DC::UI::Event;
217
218sub xy {
219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
220}
221
222#############################################################################
223
198package CFClient::UI::Base; 224package DC::UI::Base;
199 225
200use strict; 226use strict;
201 227
202use CFClient::OpenGL; 228use DC::OpenGL;
203 229
204sub new { 230sub new {
205 my $class = shift; 231 my $class = shift;
206 232
207 my $self = bless { 233 my $self = bless {
… …
212 h => undef, 238 h => undef,
213 can_events => 1, 239 can_events => 1,
214 @_ 240 @_
215 }, $class; 241 }, $class;
216 242
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
218 244
219 for (keys %$self) { 245 for (keys %$self) {
220 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
222 } 248 }
223 } 249 }
224 250
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
230 256
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 259
234 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
239 265
240sub destroy { 266sub destroy {
241 my ($self) = @_; 267 my ($self) = @_;
242 268
243 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
244 %$self = (); 271 %$self = ();
245} 272}
246 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
247sub show { 278sub show {
248 my ($self) = @_; 279 my ($self) = @_;
249 280
250 return if $self->{parent}; 281 return if $self->{parent};
251 282
252 $CFClient::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
253} 284}
254 285
255sub set_visible { 286sub set_visible {
256 my ($self) = @_; 287 my ($self) = @_;
257 288
… …
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 / $_ : $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 / $_ : $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,
2101 padding_x => 4,
2102 padding_y => 2,
1691 #text => ... 2103 #text => ...
2104 #hidden => "*",
1692 @_ 2105 @_
1693 ) 2106 )
1694} 2107}
1695 2108
1696sub _set_text { 2109sub _set_text {
… …
1703 $self->{last_activity} = $::NOW; 2116 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 2117 $self->{text} = $text;
1705 2118
1706 $text =~ s/./*/g if $self->{hidden}; 2119 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 2120 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 2121 delete $self->{size_req};
1709 2122
1710 $self->_emit (changed => $self->{text}); 2123 $self->emit (changed => $self->{text});
1711 2124
1712 $self->realloc; 2125 $self->realloc;
1713 $self->update; 2126 $self->update;
1714} 2127}
1715 2128
… …
1730 my ($w, $h) = $self->SUPER::size_request; 2143 my ($w, $h) = $self->SUPER::size_request;
1731 2144
1732 ($w + 1, $h) # add 1 for cursor 2145 ($w + 1, $h) # add 1 for cursor
1733} 2146}
1734 2147
1735sub key_down { 2148sub invoke_key_down {
1736 my ($self, $ev) = @_; 2149 my ($self, $ev) = @_;
1737 2150
1738 my $mod = $ev->{mod}; 2151 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1741 2154
1742 my $text = $self->get_text; 2155 my $text = $self->get_text;
2156
2157 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1743 2158
1744 if ($uni == 8) { 2159 if ($uni == 8) {
1745 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1746 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1747 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1748 } elsif ($sym == CFClient::SDLK_LEFT) { 2163 } elsif ($sym == DC::SDLK_LEFT) {
1749 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1750 } elsif ($sym == CFClient::SDLK_RIGHT) { 2165 } elsif ($sym == DC::SDLK_RIGHT) {
1751 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1752 } elsif ($sym == CFClient::SDLK_HOME) { 2167 } elsif ($sym == DC::SDLK_HOME) {
2168 # what a hack
2169 $self->{cursor} =
2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2171 ? length $1
2172 : 0;
2173 } elsif ($sym == DC::SDLK_END) {
2174 # uh, again
2175 $self->{cursor} =
2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2177 ? $self->{cursor} + length $1
2178 : length $self->{text};
2179 } elsif ($uni == 21) { # ctrl-u
2180 $text = "";
1753 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) {
1755 $self->{cursor} = length $text;
1756 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 2183 $self->emit ('escape');
1758 } elsif ($uni) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 2188 } else {
1761 return 0; 2189 return 0;
1762 } 2190 }
1763 2191
1764 $self->_set_text ($text); 2192 $self->_set_text ($text);
1765 2193
1766 $self->realloc; 2194 $self->realloc;
2195 $self->update;
1767 2196
1768 1 2197 1
1769} 2198}
1770 2199
1771sub focus_in { 2200sub invoke_focus_in {
1772 my ($self) = @_; 2201 my ($self) = @_;
1773 2202
1774 $self->{last_activity} = $::NOW; 2203 $self->{last_activity} = $::NOW;
1775 2204
1776 $self->SUPER::focus_in; 2205 $self->SUPER::invoke_focus_in
1777} 2206}
1778 2207
1779sub button_down { 2208sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 2209 my ($self, $ev, $x, $y) = @_;
1781 2210
1782 $self->SUPER::button_down ($ev, $x, $y); 2211 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 2212
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 2213 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 2214
1786 # byte-index to char-index 2215 # byte-index to char-index
1787 my $text = $self->{text}; 2216 my $text = $self->{text};
1788 utf8::encode $text; 2217 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789 $self->{cursor} = length substr $text, 0, $idx; 2218 $self->{cursor} = length $text;
1790 2219
1791 $self->_set_text ($self->{text}); 2220 $self->_set_text ($self->{text});
1792 $self->update; 2221 $self->update;
1793 2222
1794 1 2223 1
1795} 2224}
1796 2225
1797sub mouse_motion { 2226sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2228# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800 2229
1801 0 2230 1
1802} 2231}
1803 2232
1804sub _draw { 2233sub _draw {
1805 my ($self) = @_; 2234 my ($self) = @_;
1806 2235
… …
1813 glColor_premultiply @{$self->{bg}}; 2242 glColor_premultiply @{$self->{bg}};
1814 } 2243 }
1815 2244
1816 glEnable GL_BLEND; 2245 glEnable GL_BLEND;
1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2246 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}; 2247 glRect 0, 0, $self->{w}, $self->{h};
1822 glVertex $self->{w}, 0;
1823 glEnd;
1824 glDisable GL_BLEND; 2248 glDisable GL_BLEND;
1825 2249
1826 $self->SUPER::_draw; 2250 $self->SUPER::_draw;
1827 2251
1828 #TODO: force update every cursor change :( 2252 #TODO: force update every cursor change :(
… …
1830 2254
1831 unless (exists $self->{cur_h}) { 2255 unless (exists $self->{cur_h}) {
1832 my $text = substr $self->{text}, 0, $self->{cursor}; 2256 my $text = substr $self->{text}, 0, $self->{cursor};
1833 utf8::encode $text; 2257 utf8::encode $text;
1834 2258
1835 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2259 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1836 } 2260 }
1837 2261
1838 glColor @{$self->{fg}}; 2262 glColor_premultiply @{$self->{active_fg}};
1839 glBegin GL_LINES; 2263 glBegin GL_LINES;
1840 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2264 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}; 2265 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1842 glEnd; 2266 glEnd;
1843 }
1844}
1845 2267
2268 glLineWidth 3;
2269 glColor @{$self->{active_outline}};
2270 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2271 glLineWidth 1;
2272
2273 } else {
2274 glColor @{$self->{outline}};
2275 glBegin GL_LINE_STRIP;
2276 glVertex .5, $self->{h} * .5;
2277 glVertex .5, $self->{h} - 2.5;
2278 glVertex $self->{w} - .5, $self->{h} - 2.5;
2279 glVertex $self->{w} - .5, $self->{h} * .5;
2280 glEnd;
2281 }
2282}
2283
2284#############################################################################
2285
1846package CFClient::UI::Entry; 2286package DC::UI::Entry;
1847 2287
1848our @ISA = CFClient::UI::EntryBase::; 2288our @ISA = DC::UI::EntryBase::;
1849 2289
1850use CFClient::OpenGL; 2290use DC::OpenGL;
1851 2291
1852sub key_down { 2292sub invoke_key_down {
1853 my ($self, $ev) = @_; 2293 my ($self, $ev) = @_;
1854 2294
1855 my $sym = $ev->{sym}; 2295 my $sym = $ev->{sym};
1856 2296
1857 if ($sym == 13) { 2297 if ($ev->{uni} == 0x0d || $sym == 13) {
1858 unshift @{$self->{history}}, 2298 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 2299 my $txt = $self->get_text;
2300
1860 $self->{history_pointer} = -1; 2301 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 2302 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 2303 $self->emit (activate => $txt);
1863 $self->update; 2304 $self->update;
1864 2305
1865 } elsif ($sym == CFClient::SDLK_UP) { 2306 } elsif ($sym == DC::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 2307 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 2308 $self->{history_saveback} = $self->get_text;
1868 } 2309 }
1869 if (@{$self->{history} || []} > 0) { 2310 if (@{$self->{history} || []} > 0) {
1870 $self->{history_pointer}++; 2311 $self->{history_pointer}++;
… …
1872 $self->{history_pointer} = @{$self->{history} || []} - 1; 2313 $self->{history_pointer} = @{$self->{history} || []} - 1;
1873 } 2314 }
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2315 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } 2316 }
1876 2317
1877 } elsif ($sym == CFClient::SDLK_DOWN) { 2318 } elsif ($sym == DC::SDLK_DOWN) {
1878 $self->{history_pointer}--; 2319 $self->{history_pointer}--;
1879 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2320 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1880 2321
1881 if ($self->{history_pointer} >= 0) { 2322 if ($self->{history_pointer} >= 0) {
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2323 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } else { 2324 } else {
1884 $self->set_text ($self->{history_saveback}); 2325 $self->set_text ($self->{history_saveback});
1885 } 2326 }
1886 2327
1887 } else { 2328 } else {
1888 return $self->SUPER::key_down ($ev) 2329 return $self->SUPER::invoke_key_down ($ev)
1889 } 2330 }
1890 2331
1891 1 2332 1
1892} 2333}
1893 2334
1894############################################################################# 2335#############################################################################
1895 2336
1896package CFClient::UI::Button; 2337package DC::UI::TextEdit;
1897 2338
1898our @ISA = CFClient::UI::Label::; 2339our @ISA = DC::UI::EntryBase::;
1899 2340
1900use CFClient::OpenGL; 2341use DC::OpenGL;
1901
1902my @tex =
1903 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1904 qw(b1_button_active.png);
1905 2342
1906sub new { 2343sub new {
1907 my $class = shift; 2344 my $class = shift;
1908 2345
1909 $class->SUPER::new ( 2346 $class->SUPER::new (
1910 padding_x => 4,
1911 padding_y => 4, 2347 padding_y => 4,
1912 fg => [1, 1, 1], 2348
1913 active_fg => [0, 0, 1], 2349 @_
2350 )
2351}
2352
2353sub move_cursor_ver {
2354 my ($self, $dy) = @_;
2355
2356 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2357
2358 $line += $dy;
2359
2360 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2361 $self->{cursor} = $index;
2362 delete $self->{cur_h};
2363 $self->update;
2364 return;
2365 }
2366}
2367
2368sub invoke_key_down {
2369 my ($self, $ev) = @_;
2370
2371 my $sym = $ev->{sym};
2372
2373 if ($sym == DC::SDLK_UP) {
2374 $self->move_cursor_ver (-1);
2375 } elsif ($sym == DC::SDLK_DOWN) {
2376 $self->move_cursor_ver (+1);
2377 } else {
2378 return $self->SUPER::invoke_key_down ($ev)
2379 }
2380
2381 1
2382}
2383
2384#############################################################################
2385
2386package DC::UI::ButtonBin;
2387
2388our @ISA = DC::UI::Bin::;
2389
2390use DC::OpenGL;
2391
2392my @tex =
2393 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2394 qw(b1_button_inactive.png b1_button_active.png);
2395
2396sub new {
2397 my $class = shift;
2398
2399 $class->SUPER::new (
1914 can_hover => 1, 2400 can_hover => 1,
1915 align => 0, 2401 align => 0,
1916 valign => 0, 2402 valign => 0,
1917 can_events => 1, 2403 can_events => 1,
1918 @_ 2404 @_
1919 ) 2405 )
1920} 2406}
1921 2407
1922sub activate { }
1923
1924sub button_up { 2408sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
1926 2410
1927 $self->emit ("activate") 2411 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 2412 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 2413 && $y >= 0 && $y < $self->{h};
… …
1932} 2416}
1933 2417
1934sub _draw { 2418sub _draw {
1935 my ($self) = @_; 2419 my ($self) = @_;
1936 2420
1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1938
1939 glEnable GL_TEXTURE_2D; 2421 glEnable GL_TEXTURE_2D;
1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2422 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1941 glColor 0, 0, 0, 1; 2423 glColor 0, 0, 0, 1;
1942 2424
2425 my $tex = $tex[$GRAB == $self];
1943 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2426 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1944 2427
1945 glDisable GL_TEXTURE_2D; 2428 glDisable GL_TEXTURE_2D;
1946 2429
1947 $self->SUPER::_draw; 2430 $self->SUPER::_draw;
1948} 2431}
1949 2432
1950############################################################################# 2433#############################################################################
1951 2434
1952package CFClient::UI::CheckBox; 2435package DC::UI::Button;
1953 2436
1954our @ISA = CFClient::UI::DrawBG::; 2437our @ISA = DC::UI::Label::;
2438
2439use DC::OpenGL;
1955 2440
1956my @tex = 2441my @tex =
1957 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2442 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2443 qw(b1_button_inactive.png b1_button_active.png);
2444
2445sub new {
2446 my $class = shift;
2447
2448 $class->SUPER::new (
2449 padding_x => 8,
2450 padding_y => 4,
2451 fg => [1.0, 1.0, 1.0],
2452 active_fg => [0.8, 0.8, 0.8],
2453 can_hover => 1,
2454 align => 0,
2455 valign => 0,
2456 can_events => 1,
2457 @_
2458 )
2459}
2460
2461sub invoke_button_up {
2462 my ($self, $ev, $x, $y) = @_;
2463
2464 $self->emit ("activate")
2465 if $x >= 0 && $x < $self->{w}
2466 && $y >= 0 && $y < $self->{h};
2467
2468 1
2469}
2470
2471sub _draw {
2472 my ($self) = @_;
2473
2474 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2475
2476 glEnable GL_TEXTURE_2D;
2477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2478 glColor 0, 0, 0, 1;
2479
2480 my $tex = $tex[$GRAB == $self];
2481 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2482
2483 glDisable GL_TEXTURE_2D;
2484
2485 $self->SUPER::_draw;
2486}
2487
2488#############################################################################
2489
2490package DC::UI::CheckBox;
2491
2492our @ISA = DC::UI::DrawBG::;
2493
2494my @tex =
2495 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1958 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2496 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1959 2497
1960use CFClient::OpenGL; 2498use DC::OpenGL;
1961 2499
1962sub new { 2500sub new {
1963 my $class = shift; 2501 my $class = shift;
1964 2502
1965 $class->SUPER::new ( 2503 $class->SUPER::new (
… …
1979 my ($self) = @_; 2517 my ($self) = @_;
1980 2518
1981 (6) x 2 2519 (6) x 2
1982} 2520}
1983 2521
2522sub toggle {
2523 my ($self) = @_;
2524
2525 $self->{state} = !$self->{state};
2526 $self->emit (changed => $self->{state});
2527 $self->update;
2528}
2529
1984sub button_down { 2530sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2531 my ($self, $ev, $x, $y) = @_;
1986 2532
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2533 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2534 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2535 $self->toggle;
1990 $self->_emit (changed => $self->{state});
1991 } else { 2536 } else {
1992 return 0 2537 return 0
1993 } 2538 }
1994 2539
1995 1 2540 1
… …
1998sub _draw { 2543sub _draw {
1999 my ($self) = @_; 2544 my ($self) = @_;
2000 2545
2001 $self->SUPER::_draw; 2546 $self->SUPER::_draw;
2002 2547
2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2548 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2004 2549
2005 my ($w, $h) = @$self{qw(w h)}; 2550 my ($w, $h) = @$self{qw(w h)};
2006 2551
2007 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2552 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2008 2553
… …
2015 glDisable GL_TEXTURE_2D; 2560 glDisable GL_TEXTURE_2D;
2016} 2561}
2017 2562
2018############################################################################# 2563#############################################################################
2019 2564
2020package CFClient::UI::Image; 2565package DC::UI::Image;
2021 2566
2022our @ISA = CFClient::UI::Base::; 2567our @ISA = DC::UI::Base::;
2023 2568
2024use CFClient::OpenGL; 2569use DC::OpenGL;
2025use Carp qw/confess/;
2026 2570
2027our %loaded_images; 2571our %texture_cache;
2028 2572
2029sub new { 2573sub new {
2030 my $class = shift; 2574 my $class = shift;
2031 2575
2032 my $self = $class->SUPER::new (can_events => 0, @_); 2576 my $self = $class->SUPER::new (
2577 can_events => 0,
2578 scale => 1,
2579 @_,
2580 );
2033 2581
2034 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2582 $self->{path} || $self->{tex}
2583 or Carp::croak "'path' or 'tex' attributes required";
2035 2584
2036 $loaded_images{$self->{image}} ||= 2585 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2037 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2586 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2038 2587
2039 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2588 DC::weaken $texture_cache{$self->{path}};
2040 2589
2041 Scalar::Util::weaken $loaded_images{$self->{image}}; 2590 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043 $self->{aspect} = $tex->{w} / $tex->{h};
2044 2591
2045 $self 2592 $self
2046} 2593}
2047 2594
2595sub STORABLE_freeze {
2596 my ($self, $cloning) = @_;
2597
2598 $self->{path}
2599 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2600
2601 $self->{path}
2602}
2603
2604sub STORABLE_attach {
2605 my ($self, $cloning, $path) = @_;
2606
2607 $self->new (path => $path)
2608}
2609
2048sub size_request { 2610sub size_request {
2049 my ($self) = @_; 2611 my ($self) = @_;
2050 2612
2051 ($self->{tex}->{w}, $self->{tex}->{h}) 2613 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2052} 2614}
2053 2615
2054sub _draw { 2616sub _draw {
2055 my ($self) = @_; 2617 my ($self) = @_;
2056 2618
… …
2073 glDisable GL_TEXTURE_2D; 2635 glDisable GL_TEXTURE_2D;
2074} 2636}
2075 2637
2076############################################################################# 2638#############################################################################
2077 2639
2640package DC::UI::ImageButton;
2641
2642our @ISA = DC::UI::Image::;
2643
2644use DC::OpenGL;
2645
2646my %textures;
2647
2648sub new {
2649 my $class = shift;
2650
2651 my $self = $class->SUPER::new (
2652 padding_x => 4,
2653 padding_y => 4,
2654 fg => [1, 1, 1],
2655 active_fg => [0, 0, 1],
2656 can_hover => 1,
2657 align => 0,
2658 valign => 0,
2659 can_events => 1,
2660 @_
2661 );
2662}
2663
2664sub invoke_button_down {
2665 my ($self, $ev, $x, $y) = @_;
2666
2667 1
2668}
2669
2670sub invoke_button_up {
2671 my ($self, $ev, $x, $y) = @_;
2672
2673 $self->emit ("activate")
2674 if $x >= 0 && $x < $self->{w}
2675 && $y >= 0 && $y < $self->{h};
2676
2677 1
2678}
2679
2680#############################################################################
2681
2078package CFClient::UI::VGauge; 2682package DC::UI::VGauge;
2079 2683
2080our @ISA = CFClient::UI::Base::; 2684our @ISA = DC::UI::Base::;
2081 2685
2082use List::Util qw(min max); 2686use List::Util qw(min max);
2083 2687
2084use CFClient::OpenGL; 2688use DC::OpenGL;
2085 2689
2086my %tex = ( 2690my %tex = (
2087 food => [ 2691 food => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2692 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2089 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2693 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2090 ], 2694 ],
2091 grace => [ 2695 grace => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2696 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/ 2697 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2094 ], 2698 ],
2095 hp => [ 2699 hp => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2700 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2097 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2701 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2098 ], 2702 ],
2099 mana => [ 2703 mana => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2704 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/ 2705 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2102 ], 2706 ],
2103); 2707);
2104 2708
2105# eg. VGauge->new (gauge => 'food'), default gauge: food 2709# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2165 my $ycut1 = max 0, min 1, $ycut; 2769 my $ycut1 = max 0, min 1, $ycut;
2166 my $ycut2 = max 0, min 1, $ycut - 1; 2770 my $ycut2 = max 0, min 1, $ycut - 1;
2167 2771
2168 my $h1 = $self->{h} * (1 - $ycut1); 2772 my $h1 = $self->{h} * (1 - $ycut1);
2169 my $h2 = $self->{h} * (1 - $ycut2); 2773 my $h2 = $self->{h} * (1 - $ycut2);
2774 my $h3 = $self->{h};
2775
2776 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2170 2777
2171 glEnable GL_BLEND; 2778 glEnable GL_BLEND;
2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2779 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2780 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174 glEnable GL_TEXTURE_2D; 2781 glEnable GL_TEXTURE_2D;
… …
2193 2800
2194 if ($t3) { 2801 if ($t3) {
2195 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2802 glBindTexture GL_TEXTURE_2D, $t3->{name};
2196 glBegin GL_QUADS; 2803 glBegin GL_QUADS;
2197 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2804 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2805 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2806 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2807 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201 glEnd; 2808 glEnd;
2202 } 2809 }
2203 2810
2204 glDisable GL_BLEND; 2811 glDisable GL_BLEND;
2205 glDisable GL_TEXTURE_2D; 2812 glDisable GL_TEXTURE_2D;
2206} 2813}
2207 2814
2208############################################################################# 2815#############################################################################
2209 2816
2817package DC::UI::Progress;
2818
2819our @ISA = DC::UI::Label::;
2820
2821use DC::OpenGL;
2822
2823sub new {
2824 my ($class, %arg) = @_;
2825
2826 my $self = $class->SUPER::new (
2827 fg => [1, 1, 1],
2828 bg => [0, 0, 1, 0.2],
2829 bar => [0.7, 0.5, 0.1, 0.8],
2830 outline => [0.4, 0.3, 0],
2831 fontsize => 0.9,
2832 valign => 0,
2833 align => 0,
2834 can_events => 1,
2835 ellipsise => 1,
2836 label => "%d%%",
2837 %arg,
2838 );
2839
2840 $self->set_value ($arg{value} || -1);
2841
2842 $self
2843}
2844
2845sub set_label {
2846 my ($self, $label) = @_;
2847
2848 return if $self->{label} eq $label;
2849 $self->{label} = $label;
2850
2851 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2852}
2853
2854sub set_value {
2855 my ($self, $value) = @_;
2856
2857 if ($self->{value} ne $value) {
2858 $self->{value} = $value;
2859
2860 if ($value < 0) {
2861 $self->set_text ("-");
2862 } else {
2863 $self->set_text (sprintf $self->{label}, $value * 100);
2864 }
2865
2866 $self->update;
2867 }
2868}
2869
2870sub _draw {
2871 my ($self) = @_;
2872
2873 glEnable GL_BLEND;
2874 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2875
2876 if ($self->{value} >= 0) {
2877 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2878
2879 glColor_premultiply @{$self->{bar}};
2880 glRect 2, 2, $s, $self->{h} - 2;
2881 glColor_premultiply @{$self->{bg}};
2882 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2883 }
2884
2885 glColor_premultiply @{$self->{outline}};
2886 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2887
2888 glDisable GL_BLEND;
2889
2890 {
2891 local $self->{bg}; # do not draw background
2892 $self->SUPER::_draw;
2893 }
2894}
2895
2896#############################################################################
2897
2898package DC::UI::ExperienceProgress;
2899
2900our @ISA = DC::UI::Progress::;
2901
2902sub new {
2903 my ($class, %arg) = @_;
2904
2905 my $self = $class->SUPER::new (
2906 tooltip => sub {
2907 my ($self) = @_;
2908
2909 sprintf "level %d\n%s points\n%s next level\n%s to go",
2910 $self->{lvl},
2911 ::formsep ($self->{exp}),
2912 ::formsep ($self->{nxt}),
2913 ::formsep ($self->{nxt} - $self->{exp}),
2914 },
2915 %arg
2916 );
2917
2918 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2919 if $::CONN;
2920
2921 $self
2922}
2923
2924sub DESTROY {
2925 my ($self) = @_;
2926
2927 delete $::CONN->{on_exp_update}{$self+0}
2928 if $::CONN;
2929
2930 $self->SUPER::DESTROY;
2931}
2932
2933sub set_value {
2934 my ($self, $lvl, $exp) = @_;
2935
2936 $self->{lvl} = $lvl;
2937 $self->{exp} = $exp;
2938
2939 my $v = -1;
2940
2941 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2942 my $l0 = $table->[$lvl - 1];
2943 my $l1 = $table->[$lvl];
2944
2945 $self->{nxt} = $l1;
2946
2947 $v = ($exp - $l0) / ($l1 - $l0);
2948 }
2949
2950 $self->SUPER::set_value ($v);
2951}
2952
2953#############################################################################
2954
2210package CFClient::UI::Gauge; 2955package DC::UI::Gauge;
2211 2956
2212our @ISA = CFClient::UI::VBox::; 2957our @ISA = DC::UI::VBox::;
2213 2958
2214sub new { 2959sub new {
2215 my ($class, %arg) = @_; 2960 my ($class, %arg) = @_;
2216 2961
2217 my $self = $class->SUPER::new ( 2962 my $self = $class->SUPER::new (
… …
2219 can_hover => 1, 2964 can_hover => 1,
2220 can_events => 1, 2965 can_events => 1,
2221 %arg, 2966 %arg,
2222 ); 2967 );
2223 2968
2224 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2969 $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); 2970 $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"); 2971 $self->add ($self->{max} = new DC::UI::Label valign => -1, align => 0, template => "999");
2227 2972
2228 $self 2973 $self
2229} 2974}
2230 2975
2231sub set_fontsize { 2976sub set_fontsize {
… …
2252 $self->{value}->set_text ($val); 2997 $self->{value}->set_text ($val);
2253} 2998}
2254 2999
2255############################################################################# 3000#############################################################################
2256 3001
2257package CFClient::UI::Slider; 3002package DC::UI::Slider;
2258 3003
2259use strict; 3004use strict;
2260 3005
2261use CFClient::OpenGL; 3006use DC::OpenGL;
2262 3007
2263our @ISA = CFClient::UI::DrawBG::; 3008our @ISA = DC::UI::DrawBG::;
2264 3009
2265my @tex = 3010my @tex =
2266 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3011 map { new_from_file DC::Texture DC::find_rcfile $_ }
2267 qw(s1_slider.png s1_slider_bg.png); 3012 qw(s1_slider.png s1_slider_bg.png);
2268 3013
2269sub new { 3014sub new {
2270 my $class = shift; 3015 my $class = shift;
2271 3016
… …
2292 $self->update; 3037 $self->update;
2293 3038
2294 $self 3039 $self
2295} 3040}
2296 3041
2297sub changed { }
2298
2299sub set_range { 3042sub set_range {
2300 my ($self, $range) = @_; 3043 my ($self, $range) = @_;
2301 3044
2302 ($range, $self->{range}) = ($self->{range}, $range); 3045 ($range, $self->{range}) = ($self->{range}, $range);
2303 3046
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 3047 if ("@$range" ne "@{$self->{range}}") {
3048 $self->update;
3049 $self->set_value ($self->{range}[0]);
3050 }
2306} 3051}
2307 3052
2308sub set_value { 3053sub set_value {
2309 my ($self, $value) = @_; 3054 my ($self, $value) = @_;
2310 3055
… …
2321 if $unit; 3066 if $unit;
2322 3067
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3068 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 3069
2325 if ($value != $old_value) { 3070 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 3071 $self->emit (changed => $value);
2327 $self->update; 3072 $self->update;
2328 } 3073 }
2329} 3074}
2330 3075
2331sub size_request { 3076sub size_request {
2332 my ($self) = @_; 3077 my ($self) = @_;
2333 3078
2334 ($self->{req_w}, $self->{req_h}) 3079 ($self->{req_w}, $self->{req_h})
2335} 3080}
2336 3081
2337sub button_down { 3082sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 3083 my ($self, $ev, $x, $y) = @_;
2339 3084
2340 $self->SUPER::button_down ($ev, $x, $y); 3085 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 3086
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3087 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 3088
2344 $self->mouse_motion ($ev, $x, $y) 3089 $self->invoke_mouse_motion ($ev, $x, $y);
2345}
2346 3090
3091 1
3092}
3093
2347sub mouse_motion { 3094sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2349 3096
2350 if ($GRAB == $self) { 3097 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3098 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 3099
… …
2356 3103
2357 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3104 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2358 } else { 3105 } else {
2359 return 0; 3106 return 0;
2360 } 3107 }
3108
3109 1
3110}
3111
3112sub invoke_mouse_wheel {
3113 my ($self, $ev) = @_;
3114
3115 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3116
3117 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3118
3119 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2361 3120
2362 1 3121 1
2363} 3122}
2364 3123
2365sub update { 3124sub update {
… …
2416 glDisable GL_TEXTURE_2D; 3175 glDisable GL_TEXTURE_2D;
2417} 3176}
2418 3177
2419############################################################################# 3178#############################################################################
2420 3179
2421package CFClient::UI::ValSlider; 3180package DC::UI::ValSlider;
2422 3181
2423our @ISA = CFClient::UI::HBox::; 3182our @ISA = DC::UI::HBox::;
2424 3183
2425sub new { 3184sub new {
2426 my ($class, %arg) = @_; 3185 my ($class, %arg) = @_;
2427 3186
2428 my $range = delete $arg{range}; 3187 my $range = delete $arg{range};
2429 3188
2430 my $self = $class->SUPER::new ( 3189 my $self = $class->SUPER::new (
2431 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3190 slider => (new DC::UI::Slider expand => 1, range => $range),
2432 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3191 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2433 to_value => sub { shift }, 3192 to_value => sub { shift },
2434 from_value => sub { shift }, 3193 from_value => sub { shift },
2435 %arg, 3194 %arg,
2436 ); 3195 );
2437 3196
… …
2457sub set_range { shift->{slider}->set_range (@_) } 3216sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 3217sub set_value { shift->{slider}->set_value (@_) }
2459 3218
2460############################################################################# 3219#############################################################################
2461 3220
2462package CFClient::UI::TextView; 3221package DC::UI::TextScroller;
2463 3222
2464our @ISA = CFClient::UI::HBox::; 3223our @ISA = DC::UI::HBox::;
2465 3224
2466use CFClient::OpenGL; 3225use DC::OpenGL;
2467 3226
2468sub new { 3227sub new {
2469 my $class = shift; 3228 my $class = shift;
2470 3229
2471 my $self = $class->SUPER::new ( 3230 my $self = $class->SUPER::new (
2472 fontsize => 1, 3231 fontsize => 1,
2473 can_events => 0, 3232 can_events => 1,
3233 indent => 0,
2474 #font => default_font 3234 #font => default_font
2475 @_, 3235 @_,
2476 3236
2477 layout => (new CFClient::Layout 1), 3237 layout => (new DC::Layout),
2478 par => [], 3238 par => [],
3239 max_par => 0,
2479 height => 0, 3240 height => 0,
2480 children => [ 3241 children => [
2481 (new CFClient::UI::Empty expand => 1), 3242 (new DC::UI::Empty expand => 1),
2482 (new CFClient::UI::Slider vertical => 1), 3243 (new DC::UI::Slider vertical => 1),
2483 ], 3244 ],
2484 ); 3245 );
2485 3246
2486 $self->{children}[1]->connect (changed => sub { $self->update }); 3247 $self->{children}[1]->connect (changed => sub { $self->update });
2487 3248
… …
2493 3254
2494 $self->{fontsize} = $fontsize; 3255 $self->{fontsize} = $fontsize;
2495 $self->reflow; 3256 $self->reflow;
2496} 3257}
2497 3258
3259sub size_request {
3260 my ($self) = @_;
3261
3262 my ($empty, $slider) = $self->visible_children;
3263
3264 local $self->{children} = [$empty, $slider];
3265 $self->SUPER::size_request
3266}
3267
2498sub size_allocate { 3268sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 3269 my ($self, $w, $h) = @_;
2500 3270
2501 $self->SUPER::size_allocate ($w, $h); 3271 my ($empty, $slider, @other) = @{ $self->{children} };
3272 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502 3273
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3274 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3275 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $self->{layout}->set_width ($self->{children}[0]{w}); 3276 $self->{layout}->set_width ($empty->{w});
3277 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2506 3278
2507 $self->reflow; 3279 $self->reflow;
2508}
2509 3280
2510sub text_size { 3281 local $self->{children} = [$empty, $slider];
3282 $self->SUPER::invoke_size_allocate ($w, $h)
3283}
3284
3285sub invoke_mouse_wheel {
2511 my ($self, $text, $indent) = @_; 3286 my ($self, $ev) = @_;
3287
3288 return 0 unless $ev->{dy}; # only vertical movements
3289
3290 $self->{children}[1]->emit (mouse_wheel => $ev);
3291
3292 1
3293}
3294
3295sub get_layout {
3296 my ($self, $para) = @_;
2512 3297
2513 my $layout = $self->{layout}; 3298 my $layout = $self->{layout};
2514 3299
3300 $layout->set_font ($self->{font}) if $self->{font};
3301 $layout->set_foreground (@{$para->{fg}});
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3302 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $layout->set_width ($self->{children}[0]{w} - $indent); 3303 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3304 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2517 $layout->set_markup ($text); 3305 $layout->set_markup ($para->{markup});
3306
3307 $layout->set_shapes (
3308 map
3309 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3310 @{$para->{widget}}
2518 3311 );
3312
2519 $layout->size 3313 $layout
2520} 3314}
2521 3315
2522sub reflow { 3316sub reflow {
2523 my ($self) = @_; 3317 my ($self) = @_;
2524 3318
… …
2531 3325
2532 # todo: base offset on lines or so, not on pixels 3326 # todo: base offset on lines or so, not on pixels
2533 $self->{children}[1]->set_value ($offset); 3327 $self->{children}[1]->set_value ($offset);
2534} 3328}
2535 3329
3330sub current_paragraph {
3331 my ($self) = @_;
3332
3333 $self->{top_paragraph} - 1
3334}
3335
3336sub scroll_to {
3337 my ($self, $para) = @_;
3338
3339 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3340
3341 $self->{scroll_to} = $para;
3342 $self->update;
3343}
3344
2536sub clear { 3345sub clear {
2537 my ($self) = @_; 3346 my ($self) = @_;
3347
3348 my (undef, undef, @other) = @{ $self->{children} };
3349 $self->remove ($_) for @other;
2538 3350
2539 $self->{par} = []; 3351 $self->{par} = [];
2540 $self->{height} = 0; 3352 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3353 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542} 3354}
2543 3355
2544sub add_paragraph { 3356sub add_paragraph {
2545 my ($self, $color, $text, $indent) = @_; 3357 my $self = shift;
2546 3358
2547 for my $line (split /\n/, $text) { 3359 for my $para (@_) {
2548 my ($w, $h) = $self->text_size ($line); 3360 $para = {
3361 fg => [1, 1, 1, 1],
3362 indent => 0,
3363 markup => "",
3364 widget => [],
3365 ref $para ? %$para : (markup => $para),
3366 w => 1e10,
3367 wrapped => 1,
3368 };
3369
3370 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3371 push @{$self->{par}}, $para;
3372 }
3373
3374 if (my $max = $self->{max_par}) {
3375 shift @{$self->{par}} while @{$self->{par}} > $max;
3376 }
3377
3378 $self->{need_reflow}++;
3379 $self->update;
3380}
3381
3382sub scroll_to_bottom {
3383 my ($self) = @_;
3384
3385 $self->{scroll_to} = $#{$self->{par}};
3386 $self->update;
3387}
3388
3389sub force_uptodate {
3390 my ($self) = @_;
3391
3392 if (delete $self->{need_reflow}) {
3393 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3394
3395 my $height = 0;
3396
3397 for my $para (@{$self->{par}}) {
3398 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3399 my $layout = $self->get_layout ($para);
3400 my ($w, $h) = $layout->size;
3401
3402 $para->{w} = $w + $para->{indent};
3403 $para->{h} = $h;
3404 $para->{wrapped} = $layout->has_wrapped;
3405 }
3406
3407 $para->{y} = $height;
3408 $height += $para->{h};
3409 }
3410
2549 $self->{height} += $h; 3411 $self->{height} = $height;
2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3412 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2551 }
2552 3413
2553 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3414 delete $self->{texture};
3415 }
3416
3417 if (my $paridx = delete $self->{scroll_to}) {
3418 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3419 }
2554} 3420}
2555 3421
2556sub update { 3422sub update {
2557 my ($self) = @_; 3423 my ($self) = @_;
2558 3424
… …
2560 3426
2561 return unless $self->{h} > 0; 3427 return unless $self->{h} > 0;
2562 3428
2563 delete $self->{texture}; 3429 delete $self->{texture};
2564 3430
2565 $ROOT->on_post_alloc ($self, sub { 3431 $ROOT->on_post_alloc ($self => sub {
3432 $self->force_uptodate;
3433
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3434 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 3435
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 { 3436 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 3437 glClearColor 0, 0, 0, 0;
2596 glClear GL_COLOR_BUFFER_BIT; 3438 glClear GL_COLOR_BUFFER_BIT;
2597 3439
3440 package DC::UI::Base;
3441 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3442 (0, 0, $self->{w}, $self->{h});
3443
3444 my $top = int $self->{children}[1]{range}[0];
3445
3446 my $paridx = 0;
3447 my $top_paragraph;
2598 my $top = int $self->{children}[1]{range}[0]; 3448 my $top = int $self->{children}[1]{range}[0];
2599 3449
2600 my $y0 = $top; 3450 my $y0 = $top;
2601 my $y1 = $top + $H; 3451 my $y1 = $top + $H;
2602 3452
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}}) { 3453 for my $para (@{$self->{par}}) {
2614 my $h = $par->[1]; 3454 my $h = $para->{h};
3455 my $y = $para->{y};
2615 3456
2616 if ($y0 < $y + $h && $y < $y1) { 3457 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] }); 3458 my $layout = $self->get_layout ($para);
2618 $layout->set_width ($W - $par->[3]);
2619 $layout->set_markup ($par->[4]);
2620 3459
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3460 $layout->render ($para->{indent}, $y - $y0);
3461 $layout->draw;
2622 3462
2623 glRasterPos $par->[3], $y - $y0; 3463 if (my @w = @{ $para->{widget} }) {
2624 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3464 my @s = $layout->get_shapes;
3465
3466 for (@w) {
3467 my ($dx, $dy) = splice @s, 0, 2, ();
3468
3469 $_->{x} = $dx + $para->{indent};
3470 $_->{y} = $dy + $y - $y0;
3471
3472 $_->draw;
3473 }
3474 }
2625 } 3475 }
2626 3476
2627 $y += $h; 3477 $paridx++;
3478 $top_paragraph ||= $paridx if $y >= $top;
2628 } 3479 }
2629 3480
2630 glDisable GL_BLEND; 3481 $self->{top_paragraph} = $top_paragraph;
2631 }; 3482 };
2632 }); 3483 });
3484}
3485
3486sub reconfigure {
3487 my ($self) = @_;
3488
3489 $self->SUPER::reconfigure;
3490
3491 $_->{w} = 1e10 for @{ $self->{par} };
3492 $self->reflow;
2633} 3493}
2634 3494
2635sub _draw { 3495sub _draw {
2636 my ($self) = @_; 3496 my ($self) = @_;
2637 3497
… …
2640 glColor 0, 0, 0, 1; 3500 glColor 0, 0, 0, 1;
2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3501 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2642 glDisable GL_TEXTURE_2D; 3502 glDisable GL_TEXTURE_2D;
2643 3503
2644 $self->{children}[1]->draw; 3504 $self->{children}[1]->draw;
2645
2646} 3505}
2647 3506
2648############################################################################# 3507#############################################################################
2649 3508
2650package CFClient::UI::Animator; 3509package DC::UI::Animator;
2651 3510
2652use CFClient::OpenGL; 3511use DC::OpenGL;
2653 3512
2654our @ISA = CFClient::UI::Bin::; 3513our @ISA = DC::UI::Bin::;
2655 3514
2656sub moveto { 3515sub moveto {
2657 my ($self, $x, $y) = @_; 3516 my ($self, $x, $y) = @_;
2658 3517
2659 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3518 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2687 glPopMatrix; 3546 glPopMatrix;
2688} 3547}
2689 3548
2690############################################################################# 3549#############################################################################
2691 3550
2692package CFClient::UI::Flopper; 3551package DC::UI::Flopper;
2693 3552
2694our @ISA = CFClient::UI::Button::; 3553our @ISA = DC::UI::Button::;
2695 3554
2696sub new { 3555sub new {
2697 my $class = shift; 3556 my $class = shift;
2698 3557
2699 my $self = $class->SUPER::new ( 3558 my $self = $class->SUPER::new (
… …
2711 $self->{other}->toggle_visibility; 3570 $self->{other}->toggle_visibility;
2712} 3571}
2713 3572
2714############################################################################# 3573#############################################################################
2715 3574
2716package CFClient::UI::Tooltip; 3575package DC::UI::Tooltip;
2717 3576
2718our @ISA = CFClient::UI::Bin::; 3577our @ISA = DC::UI::Bin::;
2719 3578
2720use CFClient::OpenGL; 3579use DC::OpenGL;
2721 3580
2722sub new { 3581sub new {
2723 my $class = shift; 3582 my $class = shift;
2724 3583
2725 $class->SUPER::new ( 3584 $class->SUPER::new (
… …
2729} 3588}
2730 3589
2731sub set_tooltip_from { 3590sub set_tooltip_from {
2732 my ($self, $widget) = @_; 3591 my ($self, $widget) = @_;
2733 3592
2734 my $tooltip = $widget->{tooltip}; 3593 my $tip = $widget->{tooltip};
3594 $tip = $tip->($widget) if "CODE" eq ref $tip;
3595
3596 $tip = DC::Pod::section_label tooltip => $1
3597 if $tip =~ /^#(.*)$/;
2735 3598
2736 if ($ENV{CFPLUS_DEBUG} & 2) { 3599 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n" 3600 $tip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3601 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 3602 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 3603 . "visible $widget->{visible}";
2741 } 3604 }
2742 3605
3606 $tip =~ s/^\n+//;
3607 $tip =~ s/\n+$//;
3608
2743 $self->add (new CFClient::UI::Label 3609 $self->add (new DC::UI::Label
2744 markup => $tooltip, 3610 markup => $tip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3611 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 3612 fontsize => 0.8,
2747 fg => [0, 0, 0, 1], 3613 style => 1, # FLAG_INVERSE
2748 ellipsise => 0, 3614 ellipsise => 0,
2749 font => ($widget->{tooltip_font} || $::FONT_PROP), 3615 font => ($widget->{tooltip_font} || $::FONT_PROP),
2750 ); 3616 );
2751} 3617}
2752 3618
… …
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3622 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 3623
2758 ($w + 4, $h + 4) 3624 ($w + 4, $h + 4)
2759} 3625}
2760 3626
2761sub size_allocate { 3627sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 3628 my ($self, $w, $h) = @_;
2763 3629
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 3630 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 3631}
2766 3632
2767sub visibility_change { 3633sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 3634 my ($self, $visible) = @_;
2769 3635
2770 return unless $visible; 3636 return unless $visible;
2771 3637
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 3638 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner} 3639 my $widget = $self->{owner}
2774 or return; 3640 or return;
2775 3641
3642 if ($widget->{visible}) {
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3643 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 3644
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3645 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 3646 if $x + $self->{w} > $self->{root}{w};
2780 3647
2781 $self->move_abs ($x, $y); 3648 $self->move_abs ($x, $y);
3649 } else {
3650 $self->hide;
3651 }
2782 }); 3652 });
2783} 3653}
2784 3654
2785sub _draw { 3655sub _draw {
2786 my ($self) = @_; 3656 my ($self) = @_;
2787 3657
2788 glTranslate 0.375, 0.375;
2789
2790 my ($w, $h) = @$self{qw(w h)}; 3658 my ($w, $h) = @$self{qw(w h)};
2791 3659
2792 glColor 1, 0.8, 0.4; 3660 glColor 1, 0.8, 0.4;
2793 glBegin GL_QUADS; 3661 glRect 0, 0, $w, $h;
2794 glVertex 0 , 0;
2795 glVertex 0 , $h;
2796 glVertex $w, $h;
2797 glVertex $w, 0;
2798 glEnd;
2799 3662
2800 glColor 0, 0, 0; 3663 glColor 0, 0, 0;
2801 glBegin GL_LINE_LOOP; 3664 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 3665
2808 glTranslate 2 - 0.375, 2 - 0.375; 3666 glTranslate 2, 2;
2809 3667
2810 $self->SUPER::_draw; 3668 $self->SUPER::_draw;
2811} 3669}
2812 3670
2813############################################################################# 3671#############################################################################
2814 3672
2815package CFClient::UI::Face; 3673package DC::UI::Face;
2816 3674
2817our @ISA = CFClient::UI::Base::; 3675our @ISA = DC::UI::DrawBG::;
2818 3676
2819use CFClient::OpenGL; 3677use DC::OpenGL;
2820 3678
2821sub new { 3679sub new {
2822 my $class = shift; 3680 my $class = shift;
2823 3681
2824 my $self = $class->SUPER::new ( 3682 my $self = $class->SUPER::new (
3683 size_w => 32,
3684 size_h => 8,
2825 aspect => 1, 3685 aspect => 1,
2826 can_events => 0, 3686 can_events => 0,
2827 @_, 3687 @_,
2828 ); 3688 );
2829 3689
2830 if ($self->{anim} && $self->{animspeed}) { 3690 if ($self->{anim} && $self->{animspeed}) {
2831 Scalar::Util::weaken (my $widget = $self); 3691 DC::weaken (my $widget = $self);
2832 3692
2833 $self->{timer} = Event->timer ( 3693 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2834 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3694 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2835 hard => 1, 3695 return unless $::CONN;
2836 interval => $self->{animspeed}, 3696
2837 cb => sub { 3697 my $w = $widget
3698 or return;
3699
2838 ++$widget->{frame}; 3700 ++$w->{frame};
3701 $w->update_face;
3702
3703 # somehow, $widget can go away
2839 $widget->update; 3704 $w->update;
2840 }, 3705 $w->update_timer;
2841 ); 3706 };
3707
3708 $self->update_face;
3709 $self->update_timer;
2842 } 3710 }
2843 3711
2844 $self 3712 $self
2845} 3713}
2846 3714
3715sub update_timer {
3716 my ($self) = @_;
3717
3718 return unless $self->{timer};
3719
3720 if ($self->{visible}) {
3721 $self->{timer}->start;
3722 } else {
3723 $self->{timer}->stop;
3724 }
3725}
3726
3727sub update_face {
3728 my ($self) = @_;
3729
3730 if ($::CONN) {
3731 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3732 if ($anim && @$anim) {
3733 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3734 delete $self->{face_change_cb};
3735
3736 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3737 unless ($tex->{name} || $tex->{loading}) {
3738 $tex->upload (sub { $self->reconfigure });
3739 }
3740 }
3741 }
3742 }
3743 }
3744}
3745
2847sub size_request { 3746sub size_request {
2848 (32, 8) 3747 my ($self) = @_;
3748
3749 if ($::CONN) {
3750 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3751 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3752 if ($tex->{name}) {
3753 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3754 } elsif (!$tex->{loading}) {
3755 $tex->upload (sub { $self->reconfigure });
3756 }
3757 }
3758
3759 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3760 }
3761 }
3762
3763 ($self->{size_w} || 8, $self->{size_h} || 8)
2849} 3764}
2850 3765
2851sub update { 3766sub update {
2852 my ($self) = @_; 3767 my ($self) = @_;
2853 3768
2854 return unless $self->{visible}; 3769 return unless $self->{visible};
2855 3770
2856 $self->SUPER::update; 3771 $self->SUPER::update;
2857} 3772}
2858 3773
3774sub invoke_visibility_change {
3775 my ($self) = @_;
3776
3777 $self->update_timer;
3778
3779 0
3780}
3781
2859sub _draw { 3782sub _draw {
2860 my ($self) = @_; 3783 my ($self) = @_;
2861 3784
2862 return unless $::CONN; 3785 $self->SUPER::_draw;
2863 3786
2864 my $face; 3787 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; 3788 glEnable GL_TEXTURE_2D;
2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2878 glColor 0, 0, 0, 1; 3790 glColor 0, 0, 0, 1;
2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880 glDisable GL_TEXTURE_2D; 3792 glDisable GL_TEXTURE_2D;
2881 } 3793 }
2882} 3794}
2883 3795
2884sub DESTROY { 3796sub destroy {
2885 my ($self) = @_; 3797 my ($self) = @_;
2886 3798
2887 $self->{timer}->cancel 3799 (delete $self->{timer})->cancel
2888 if $self->{timer}; 3800 if $self->{timer};
2889 3801
2890 $self->SUPER::DESTROY; 3802 $self->SUPER::destroy;
2891} 3803}
2892 3804
2893############################################################################# 3805#############################################################################
2894 3806
2895package CFClient::UI::Buttonbar; 3807package DC::UI::Buttonbar;
2896 3808
2897our @ISA = CFClient::UI::HBox::; 3809our @ISA = DC::UI::HBox::;
2898 3810
2899# TODO: should actualyl wrap buttons and other goodies. 3811# TODO: should actually wrap buttons and other goodies.
2900 3812
2901############################################################################# 3813#############################################################################
2902 3814
2903package CFClient::UI::Menu; 3815package DC::UI::Menu;
2904 3816
2905our @ISA = CFClient::UI::FancyFrame::; 3817our @ISA = DC::UI::Toplevel::;
2906 3818
2907use CFClient::OpenGL; 3819use DC::OpenGL;
2908 3820
2909sub new { 3821sub new {
2910 my $class = shift; 3822 my $class = shift;
2911 3823
2912 my $self = $class->SUPER::new ( 3824 my $self = $class->SUPER::new (
2913 items => [], 3825 items => [],
2914 z => 100, 3826 z => 100,
2915 @_, 3827 @_,
2916 ); 3828 );
2917 3829
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3830 $self->add ($self->{vbox} = new DC::UI::VBox);
2919 3831
2920 for my $item (@{ $self->{items} }) { 3832 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 3833 my ($widget, $cb, $tooltip) = @$item;
2922 3834
2923 # handle various types of items, only text for now 3835 # handle various types of items, only text for now
2924 if (!ref $widget) { 3836 if (!ref $widget) {
3837 if ($widget =~ /\t/) {
3838 my ($left, $right) = split /\t/, $widget, 2;
3839
2925 $widget = new CFClient::UI::Label 3840 $widget = new DC::UI::HBox
2926 can_hover => 1, 3841 can_hover => 1,
2927 can_events => 1, 3842 can_events => 1,
3843 tooltip => $tooltip,
3844 children => [
3845 (new DC::UI::Label markup => $left, expand => 1),
3846 (new DC::UI::Label markup => $right, align => +1),
3847 ],
3848 ;
3849
3850 } else {
3851 $widget = new DC::UI::Label
3852 can_hover => 1,
3853 can_events => 1,
2928 text => $widget; 3854 markup => $widget,
3855 tooltip => $tooltip;
3856 }
2929 } 3857 }
2930 3858
2931 $self->{item}{$widget} = $item; 3859 $self->{item}{$widget} = $item;
2932 3860
2933 $self->{vbox}->add ($widget); 3861 $self->{vbox}->add ($widget);
… …
2938 3866
2939# popup given the event (must be a mouse button down event currently) 3867# popup given the event (must be a mouse button down event currently)
2940sub popup { 3868sub popup {
2941 my ($self, $ev) = @_; 3869 my ($self, $ev) = @_;
2942 3870
2943 $self->_emit ("popdown"); 3871 $self->emit ("popdown");
2944 3872
2945 # maybe save $GRAB? must be careful about events... 3873 # maybe save $GRAB? must be careful about events...
2946 $GRAB = $self; 3874 $GRAB = $self;
2947 $self->{button} = $ev->{button}; 3875 $self->{button} = $ev->{button};
2948 3876
2949 $self->show; 3877 $self->show;
2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3878 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2951} 3879}
2952 3880
2953sub mouse_motion { 3881sub invoke_mouse_motion {
2954 my ($self, $ev, $x, $y) = @_; 3882 my ($self, $ev, $x, $y) = @_;
2955 3883
2956 # TODO: should use vbox->find_widget or so 3884 # TODO: should use vbox->find_widget or so
2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3885 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958 $self->{hover} = $self->{item}{$HOVER}; 3886 $self->{hover} = $self->{item}{$HOVER};
2959 3887
2960 0 3888 0
2961} 3889}
2962 3890
2963sub button_up { 3891sub invoke_button_up {
2964 my ($self, $ev, $x, $y) = @_; 3892 my ($self, $ev, $x, $y) = @_;
2965 3893
2966 if ($ev->{button} == $self->{button}) { 3894 if ($ev->{button} == $self->{button}) {
2967 undef $GRAB; 3895 undef $GRAB;
2968 $self->hide; 3896 $self->hide;
2969 3897
2970 $self->_emit ("popdown"); 3898 $self->emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover}; 3899 $self->{hover}[1]->() if $self->{hover};
2972 } else { 3900 } else {
2973 return 0 3901 return 0
2974 } 3902 }
2975 3903
2976 1 3904 1
2977} 3905}
2978 3906
2979############################################################################# 3907#############################################################################
2980 3908
2981package CFClient::UI::Multiplexer; 3909package DC::UI::Multiplexer;
2982 3910
2983our @ISA = CFClient::UI::Container::; 3911our @ISA = DC::UI::Container::;
2984 3912
2985sub new { 3913sub new {
2986 my $class = shift; 3914 my $class = shift;
2987 3915
2988 my $self = $class->SUPER::new ( 3916 my $self = $class->SUPER::new (
… …
3002 3930
3003 $self->{current} = $self->{children}[0] 3931 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} }; 3932 if @{ $self->{children} };
3005} 3933}
3006 3934
3935sub get_current_page {
3936 my ($self) = @_;
3937
3938 $self->{current}
3939}
3940
3007sub set_current_page { 3941sub set_current_page {
3008 my ($self, $page_or_widget) = @_; 3942 my ($self, $page_or_widget) = @_;
3009 3943
3010 my $widget = ref $page_or_widget 3944 my $widget = ref $page_or_widget
3011 ? $page_or_widget 3945 ? $page_or_widget
3012 : $self->{children}[$page_or_widget]; 3946 : $self->{children}[$page_or_widget];
3013 3947
3014 $self->{current} = $widget; 3948 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3949 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016 3950
3017 $self->_emit (page_changed => $self->{current}); 3951 $self->emit (page_changed => $self->{current});
3018 3952
3019 $self->realloc; 3953 $self->realloc;
3020} 3954}
3021 3955
3022sub visible_children { 3956sub visible_children {
… …
3027 my ($self) = @_; 3961 my ($self) = @_;
3028 3962
3029 $self->{current}->size_request 3963 $self->{current}->size_request
3030} 3964}
3031 3965
3032sub size_allocate { 3966sub invoke_size_allocate {
3033 my ($self, $w, $h) = @_; 3967 my ($self, $w, $h) = @_;
3034 3968
3035 $self->{current}->configure (0, 0, $w, $h); 3969 $self->{current}->configure (0, 0, $w, $h);
3970
3971 1
3036} 3972}
3037 3973
3038sub _draw { 3974sub _draw {
3039 my ($self) = @_; 3975 my ($self) = @_;
3040 3976
3041 $self->{current}->draw; 3977 $self->{current}->draw;
3042} 3978}
3043 3979
3044############################################################################# 3980#############################################################################
3045 3981
3046package CFClient::UI::Notebook; 3982package DC::UI::Notebook;
3047 3983
3984use DC::OpenGL;
3985
3048our @ISA = CFClient::UI::VBox::; 3986our @ISA = DC::UI::VBox::;
3049 3987
3050sub new { 3988sub new {
3051 my $class = shift; 3989 my $class = shift;
3052 3990
3053 my $self = $class->SUPER::new ( 3991 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar), 3992 buttonbar => (new DC::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3993 multiplexer => (new DC::UI::Multiplexer expand => 1),
3994 active_outline => [.7, .7, 0.2],
3056 # filter => # will be put between multiplexer and $self 3995 # filter => # will be put between multiplexer and $self
3057 @_, 3996 @_,
3058 ); 3997 );
3059 3998
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3999 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3061 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4000 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3062 4001
4002 {
4003 Scalar::Util::weaken (my $wself = $self);
4004
4005 $self->{multiplexer}->connect (c_add => sub {
4006 my ($mplex, $widgets) = @_;
4007
4008 for my $child (@$widgets) {
4009 Scalar::Util::weaken $child;
4010 $child->{c_tab_} ||= do {
4011 my $tab =
4012 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4013 ? $child->{c_tab}
4014 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4015
4016 $tab->connect (activate => sub {
4017 $wself->set_current_page ($child);
4018 });
4019
4020 $tab
4021 };
4022
4023 $self->{buttonbar}->add ($child->{c_tab_});
4024 }
4025 });
4026
4027 $self->{multiplexer}->connect (c_remove => sub {
4028 my ($mplex, $widgets) = @_;
4029
4030 for my $child (@$widgets) {
4031 $wself->{buttonbar}->remove ($child->{c_tab_});
4032 }
4033 });
4034 }
4035
3063 $self 4036 $self
3064} 4037}
3065 4038
3066sub add { 4039sub add {
4040 my ($self, @widgets) = @_;
4041
4042 $self->{multiplexer}->add (@widgets)
4043}
4044
4045sub remove {
4046 my ($self, @widgets) = @_;
4047
4048 $self->{multiplexer}->remove (@widgets)
4049}
4050
4051sub pages {
4052 my ($self) = @_;
4053 $self->{multiplexer}->children
4054}
4055
4056sub add_tab {
3067 my ($self, $title, $widget, $tooltip) = @_; 4057 my ($self, $title, $widget, $tooltip) = @_;
3068 4058
3069 Scalar::Util::weaken $self; 4059 $title = [$title, $tooltip] unless ref $title;
4060 $widget->{c_tab} = $title;
3070 4061
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); 4062 $self->add ($widget);
4063}
4064
4065sub get_current_page {
4066 my ($self) = @_;
4067
4068 $self->{multiplexer}->get_current_page
3078} 4069}
3079 4070
3080sub set_current_page { 4071sub set_current_page {
3081 my ($self, $page) = @_; 4072 my ($self, $page) = @_;
3082 4073
3083 $self->{multiplexer}->set_current_page ($page); 4074 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current}); 4075 $self->emit (page_changed => $self->{multiplexer}{current});
4076}
4077
4078sub _draw {
4079 my ($self) = @_;
4080
4081 $self->SUPER::_draw ();
4082
4083 if (my $cur = $self->{multiplexer}{current}) {
4084 if ($cur = $cur->{c_tab_}) {
4085 glTranslate $self->{buttonbar}{x} + $cur->{x},
4086 $self->{buttonbar}{y} + $cur->{y};
4087 glLineWidth 3;
4088 #glEnable GL_BLEND;
4089 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4090 glColor @{$self->{active_outline}};
4091 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4092 glLineWidth 1;
4093 #glDisable GL_BLEND;
4094 }
4095 }
3085} 4096}
3086 4097
3087############################################################################# 4098#############################################################################
3088 4099
4100package DC::UI::Selector;
4101
4102use utf8;
4103
4104our @ISA = DC::UI::Button::;
4105
4106sub new {
4107 my $class = shift;
4108
4109 my $self = $class->SUPER::new (
4110 options => [], # [value, title, longdesc], ...
4111 value => undef,
4112 @_,
4113 );
4114
4115 $self->_set_value ($self->{value});
4116
4117 $self
4118}
4119
4120sub invoke_button_down {
4121 my ($self, $ev) = @_;
4122
4123 my @menu_items;
4124
4125 for (@{ $self->{options} }) {
4126 my ($value, $title, $tooltip) = @$_;
4127
4128 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4129 }
4130
4131 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
4132}
4133
4134sub _set_value {
4135 my ($self, $value) = @_;
4136
4137 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4138 $item ||= $self->{options}[0]
4139 or return;
4140
4141 $self->{value} = $item->[0];
4142 $self->set_markup ("$item->[1] ⇓");
4143# $self->set_tooltip ($item->[2]);
4144}
4145
4146sub set_value {
4147 my ($self, $value) = @_;
4148
4149 return unless $self->{value} ne $value;
4150
4151 $self->_set_value ($value);
4152 $self->emit (changed => $value);
4153}
4154
4155sub set_options {
4156 my ($self, $options) = @_;
4157
4158 $self->{options} = $options;
4159 $self->_set_value ($self->{value});
4160}
4161
4162#############################################################################
4163
3089package CFClient::UI::Statusbox; 4164package DC::UI::Statusbox;
3090 4165
3091our @ISA = CFClient::UI::VBox::; 4166our @ISA = DC::UI::VBox::;
3092 4167
3093sub new { 4168sub new {
3094 my $class = shift; 4169 my $class = shift;
3095 4170
3096 my $self = $class->SUPER::new ( 4171 my $self = $class->SUPER::new (
3097 fontsize => 0.8, 4172 fontsize => 0.8,
3098 @_, 4173 @_,
3099 ); 4174 );
3100 4175
3101 Scalar::Util::weaken (my $this = $self); 4176 DC::weaken (my $this = $self);
3102 4177
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4178 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3104 4179
3105 $self 4180 $self
3106} 4181}
3107 4182
3108sub reorder { 4183sub reorder {
3109 my ($self) = @_; 4184 my ($self) = @_;
3110 my $NOW = Time::HiRes::time; 4185 my $NOW = Time::HiRes::time;
3111 4186
3112 # freeze display when hovering over any label 4187 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner} 4188 return if $DC::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4189 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} }; 4190 values %{ $self->{item} };
3116 4191
3117 while (my ($k, $v) = each %{ $self->{item} }) { 4192 while (my ($k, $v) = each %{ $self->{item} }) {
3118 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4193 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3119 } 4194 }
4195
4196 $self->{timer}->set (1, 1);
3120 4197
3121 my @widgets; 4198 my @widgets;
3122 4199
3123 my @items = sort { 4200 my @items = sort {
3124 $a->{pri} <=> $b->{pri} 4201 $a->{pri} <=> $b->{pri}
3125 or $b->{id} <=> $a->{id} 4202 or $b->{id} <=> $a->{id}
3126 } values %{ $self->{item} }; 4203 } values %{ $self->{item} };
3127
3128 $self->{timer}->interval (1);
3129 4204
3130 my $count = 10 + 1; 4205 my $count = 10 + 1;
3131 for my $item (@items) { 4206 for my $item (@items) {
3132 last unless --$count; 4207 last unless --$count;
3133 4208
… …
3140 for ($short) { 4215 for ($short) {
3141 s/^\s+//; 4216 s/^\s+//;
3142 s/\s+/ /g; 4217 s/\s+/ /g;
3143 } 4218 }
3144 4219
3145 new CFClient::UI::Label 4220 new DC::UI::Label
3146 markup => $short, 4221 markup => $short,
3147 tooltip => $item->{tooltip}, 4222 tooltip => $item->{tooltip},
3148 tooltip_font => $::FONT_PROP, 4223 tooltip_font => $::FONT_PROP,
3149 tooltip_width => 0.67, 4224 tooltip_width => 0.67,
3150 fontsize => $item->{fontsize} || $self->{fontsize}, 4225 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4232 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4233 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update; 4234 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff) 4235 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1; 4236 if $diff < 1;
3162 $self->{timer}->interval (1/30); 4237 $self->{timer}->set (1/30, 1/30);
3163 } else { 4238 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1; 4239 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 } 4240 }
3166 4241
3167 push @widgets, $label; 4242 push @widgets, $label;
… …
3188 $item->{count}++; 4263 $item->{count}++;
3189 } else { 4264 } else {
3190 $item->{count} = 1; 4265 $item->{count} = 1;
3191 $item->{text} = $item->{tooltip} = $text; 4266 $item->{text} = $item->{tooltip} = $text;
3192 } 4267 }
3193 $item->{id} = ++$self->{id}; 4268 $item->{id} += 0.2;#d#
3194 $item->{timeout} = $timeout; 4269 $item->{timeout} = $timeout;
3195 delete $item->{label}; 4270 delete $item->{label};
3196 } else { 4271 } else {
3197 $self->{item}{$group} = { 4272 $self->{item}{$group} = {
3198 id => ++$self->{id}, 4273 id => ++$self->{id},
… …
3204 count => 1, 4279 count => 1,
3205 %arg, 4280 %arg,
3206 }; 4281 };
3207 } 4282 }
3208 4283
4284 $ROOT->on_refresh (reorder => sub {
3209 $self->reorder; 4285 $self->reorder;
4286 });
3210} 4287}
3211 4288
3212sub reconfigure { 4289sub reconfigure {
3213 my ($self) = @_; 4290 my ($self) = @_;
3214 4291
… …
3217 4294
3218 $self->reorder; 4295 $self->reorder;
3219 $self->SUPER::reconfigure; 4296 $self->SUPER::reconfigure;
3220} 4297}
3221 4298
3222sub DESTROY { 4299sub destroy {
3223 my ($self) = @_; 4300 my ($self) = @_;
3224 4301
3225 $self->{timer}->cancel; 4302 $self->{timer}->cancel;
3226 4303
3227 $self->SUPER::DESTROY; 4304 $self->SUPER::destroy;
3228} 4305}
3229 4306
3230############################################################################# 4307#############################################################################
3231 4308
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; 4309package DC::UI::Root;
3528 4310
3529our @ISA = CFClient::UI::Container::; 4311our @ISA = DC::UI::Container::;
3530 4312
3531use List::Util qw(min max); 4313use List::Util qw(min max);
3532 4314
3533use CFClient::OpenGL; 4315use DC::OpenGL;
3534 4316
3535sub new { 4317sub new {
3536 my $class = shift; 4318 my $class = shift;
3537 4319
3538 my $self = $class->SUPER::new ( 4320 my $self = $class->SUPER::new (
3539 visible => 1, 4321 visible => 1,
3540 @_, 4322 @_,
3541 ); 4323 );
3542 4324
3543 Scalar::Util::weaken ($self->{root} = $self); 4325 DC::weaken ($self->{root} = $self);
3544 4326
3545 $self 4327 $self
3546} 4328}
3547 4329
3548sub size_request { 4330sub size_request {
… …
3563 $coord = $max - $size if $coord > $max - $size; 4345 $coord = $max - $size if $coord > $max - $size;
3564 4346
3565 int $coord + 0.5 4347 int $coord + 0.5
3566} 4348}
3567 4349
3568sub size_allocate { 4350sub invoke_size_allocate {
3569 my ($self, $w, $h) = @_; 4351 my ($self, $w, $h) = @_;
3570 4352
3571 for my $child ($self->children) { 4353 for my $child ($self->children) {
3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4354 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3573 4355
… …
3577 $X = _to_pixel $X, $W, $self->{w}; 4359 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h}; 4360 $Y = _to_pixel $Y, $H, $self->{h};
3579 4361
3580 $child->configure ($X, $Y, $W, $H); 4362 $child->configure ($X, $Y, $W, $H);
3581 } 4363 }
4364
4365 1
3582} 4366}
3583 4367
3584sub coord2local { 4368sub coord2local {
3585 my ($self, $x, $y) = @_; 4369 my ($self, $x, $y) = @_;
3586 4370
… …
3594} 4378}
3595 4379
3596sub update { 4380sub update {
3597 my ($self) = @_; 4381 my ($self) = @_;
3598 4382
3599 $::WANT_REFRESH++; 4383 $::WANT_REFRESH = 1;
3600} 4384}
3601 4385
3602sub add { 4386sub add {
3603 my ($self, @children) = @_; 4387 my ($self, @children) = @_;
3604 4388
… …
3641 while ($self->{refresh_hook}) { 4425 while ($self->{refresh_hook}) {
3642 $_->() 4426 $_->()
3643 for values %{delete $self->{refresh_hook}}; 4427 for values %{delete $self->{refresh_hook}};
3644 } 4428 }
3645 4429
3646 if ($self->{realloc}) { 4430 while ($self->{realloc}) {
3647 my %queue; 4431 my %queue;
3648 my @queue; 4432 my @queue;
3649 my $widget; 4433 my $widget;
3650 4434
3651 outer: 4435 outer:
… …
3698 } 4482 }
3699 } 4483 }
3700 4484
3701 delete $self->{realloc}{$widget+0}; 4485 delete $self->{realloc}{$widget+0};
3702 } 4486 }
3703 }
3704 4487
3705 while (my $size_alloc = delete $self->{size_alloc}) { 4488 while (my $size_alloc = delete $self->{size_alloc}) {
3706 my @queue = sort { $b->{visible} <=> $a->{visible} } 4489 my @queue = sort { $a->{visible} <=> $b->{visible} }
3707 values %$size_alloc; 4490 values %$size_alloc;
3708 4491
3709 while () { 4492 while () {
3710 my $widget = pop @queue || last; 4493 my $widget = pop @queue || last;
3711 4494
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4495 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713 4496
3714 $w = 0 if $w < 0; 4497 $w = max $widget->{min_w}, $w;
3715 $h = 0 if $h < 0; 4498 $h = max $widget->{min_h}, $h;
3716 4499
4500# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4501# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4502
4503 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4504 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4505
3717 $w = int $w + 0.5; 4506 $w = int $w + 0.5;
3718 $h = int $h + 0.5; 4507 $h = int $h + 0.5;
3719 4508
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4509 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w}; 4510 $widget->{old_w} = $widget->{w};
3722 $widget->{old_h} = $widget->{h}; 4511 $widget->{old_h} = $widget->{h};
3723 4512
3724 $widget->{w} = $w; 4513 $widget->{w} = $w;
3725 $widget->{h} = $h; 4514 $widget->{h} = $h;
3726 4515
3727 $widget->emit (size_allocate => $w, $h); 4516 $widget->emit (size_allocate => $w, $h);
4517 }
3728 } 4518 }
3729 } 4519 }
3730 } 4520 }
3731 4521
3732 while ($self->{post_alloc_hook}) { 4522 while ($self->{post_alloc_hook}) {
3733 $_->() 4523 $_->()
3734 for values %{delete $self->{post_alloc_hook}}; 4524 for values %{delete $self->{post_alloc_hook}};
3735 } 4525 }
3736
3737 4526
3738 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4527 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4528 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3740 glClear GL_COLOR_BUFFER_BIT; 4529 glClear GL_COLOR_BUFFER_BIT;
3741 4530
… …
3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4533 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3745 glMatrixMode GL_MODELVIEW; 4534 glMatrixMode GL_MODELVIEW;
3746 glLoadIdentity; 4535 glLoadIdentity;
3747 4536
3748 { 4537 {
3749 package CFClient::UI::Base; 4538 package DC::UI::Base;
3750 4539
3751 ($draw_x, $draw_y, $draw_w, $draw_h) = 4540 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h}); 4541 (0, 0, $self->{w}, $self->{h});
3753 }
3754 4542
3755 $self->_draw; 4543 $self->_draw;
4544 }
3756} 4545}
3757 4546
3758############################################################################# 4547#############################################################################
3759 4548
3760package CFClient::UI; 4549package DC::UI;
3761 4550
3762$ROOT = new CFClient::UI::Root; 4551$ROOT = new DC::UI::Root;
3763$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4552$TOOLTIP = new DC::UI::Tooltip z => 900;
3764 4553
37651 45541
3766 4555

Diff Legend

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