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

Diff Legend

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