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.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 UTC

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

Diff Legend

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