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

Diff Legend

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