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.453 by root, Wed Dec 26 20:46:39 2007 UTC

1package CFClient::UI; 1package dc::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFClient; 8use dc;
11use CFClient::Texture; 9use dc::Pod;
10use dc::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 29 $TOOLTIP->hide;
28 30
29 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 33
31 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
32 35
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show; 37 $TOOLTIP->show;
39 } 38 }
40 39
41 return; 40 return;
42 } 41 }
43 } 42 }
44 } 43 }
45 44
46 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48}); 48};
49 49
50sub get_layout { 50sub get_layout {
51 my $layout; 51 my $layout;
52 52
53 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->again;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
90 105
91 $GRAB = $widget; 106 $GRAB = $widget;
92 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
93 108
94 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
95 } 110 }
96 111
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & dc::KMOD_SHIFT;
98 117
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 118 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 119 $ev->{dy} = $shift ? 0 : $delta;
120
121 $GRAB->emit (mouse_wheel => $ev);
122 } else {
123 $GRAB->emit (button_down => $ev)
124 }
125 }
101} 126}
102 127
103sub feed_sdl_button_up_event { 128sub feed_sdl_button_up_event {
104 my ($ev) = @_; 129 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 130
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 131 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 132
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 133 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 134
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 135 $GRAB->emit (button_up => $ev)
112 if $GRAB; 136 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 137
114 if (!$BUTTON_STATE) { 138 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 140 $grab->update if $grab;
117 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
118 142
143 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
120 } 145 }
121} 146}
122 147
123sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
124 my ($ev) = @_; 149 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 150 my ($x, $y) = ($ev->{x}, $ev->{y});
126 151
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 152 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 153
129 if ($widget != $HOVER) { 154 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 155
132 $hover->update if $hover && $hover->{can_hover}; 156 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 157 if $HOVER;
140} 158}
141 159
142# convert position array to integers 160# convert position array to integers
143sub harmonize { 161sub harmonize {
… …
193 reconfigure_widgets; 211 reconfigure_widgets;
194} 212}
195 213
196############################################################################# 214#############################################################################
197 215
216package dc::UI::Event;
217
218sub xy {
219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
220}
221
222#############################################################################
223
198package CFClient::UI::Base; 224package dc::UI::Base;
199 225
200use strict; 226use strict;
201 227
202use CFClient::OpenGL; 228use dc::OpenGL;
203 229
204sub new { 230sub new {
205 my $class = shift; 231 my $class = shift;
206 232
207 my $self = bless { 233 my $self = bless {
… …
212 h => undef, 238 h => undef,
213 can_events => 1, 239 can_events => 1,
214 @_ 240 @_
215 }, $class; 241 }, $class;
216 242
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 243 dc::weaken ($dc::UI::WIDGET{$self+0} = $self);
218 244
219 for (keys %$self) { 245 for (keys %$self) {
220 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
222 } 248 }
223 } 249 }
224 250
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $dc::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $dc::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $dc::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $dc::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $dc::UI::ROOT->{alloc_h} if exists $layout->{h};
230 256
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 259
234 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
239 265
240sub destroy { 266sub destroy {
241 my ($self) = @_; 267 my ($self) = @_;
242 268
243 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
244 %$self = (); 271 %$self = ();
245} 272}
246 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
247sub show { 278sub show {
248 my ($self) = @_; 279 my ($self) = @_;
249 280
250 return if $self->{parent}; 281 return if $self->{parent};
251 282
252 $CFClient::UI::ROOT->add ($self); 283 $dc::UI::ROOT->add ($self);
253} 284}
254 285
255sub set_visible { 286sub set_visible {
256 my ($self) = @_; 287 my ($self) = @_;
257 288
… …
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 return $self->{parent}->get_max_wh
374 if $self->{parent};
375
376 ($::WIDTH, $::HEIGHT)
377}
378
335sub size_request { 379sub size_request {
336 require Carp; 380 require Carp;
337 Carp::confess "size_request is abstract"; 381 Carp::confess "size_request is abstract";
338} 382}
339 383
384sub baseline_shift {
385 0
386}
387
340sub configure { 388sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 389 my ($self, $x, $y, $w, $h) = @_;
342 390
343 if ($self->{aspect}) { 391 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 392 my ($ow, $oh) = ($w, $h);
345 393
346 $w = List::Util::min $w, int $h * $self->{aspect}; 394 $w = List::Util::min $w, dc::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 395 $h = List::Util::min $h, dc::ceil $w / $self->{aspect};
348 396
349 # use alignment to adjust x, y 397 # use alignment to adjust x, y
350 398
351 $x += int 0.5 * ($ow - $w); 399 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 400 $y += int 0.5 * ($oh - $h);
… …
393 441
394 return if $self->{tooltip} eq $tooltip; 442 return if $self->{tooltip} eq $tooltip;
395 443
396 $self->{tooltip} = $tooltip; 444 $self->{tooltip} = $tooltip;
397 445
398 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 446 if ($dc::UI::TOOLTIP->{owner} == $self) {
399 delete $CFClient::UI::TOOLTIP->{owner}; 447 delete $dc::UI::TOOLTIP->{owner};
400 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 448 $dc::UI::TOOLTIP_WATCHER->invoke;
401 } 449 }
402} 450}
403 451
404# translate global coordinates to local coordinate system 452# translate global coordinates to local coordinate system
405sub coord2local { 453sub coord2local {
406 my ($self, $x, $y) = @_; 454 my ($self, $x, $y) = @_;
407 455
456 return (undef, undef) unless $self->{parent};
457
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 458 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 459}
410 460
411# translate local coordinates to global coordinate system 461# translate local coordinates to global coordinate system
412sub coord2global { 462sub coord2global {
413 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
414 464
465 return (undef, undef) unless $self->{parent};
466
415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 467 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416} 468}
417 469
418sub invoke_focus_in { 470sub invoke_focus_in {
419 my ($self) = @_; 471 my ($self) = @_;
420 472
421 return if $FOCUS == $self; 473 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 474 return unless $self->{can_focus};
423 475
424 my $focus = $FOCUS; $FOCUS = $self; 476 $FOCUS = $self;
425 477
426 $focus->update if $focus; 478 $self->update;
427 $FOCUS->update;
428 479
429 0 480 0
430} 481}
431 482
432sub invoke_focus_out { 483sub invoke_focus_out {
433 my ($self) = @_; 484 my ($self) = @_;
434 485
435 return unless $FOCUS == $self; 486 return unless $FOCUS == $self;
436 487
437 my $focus = $FOCUS; undef $FOCUS; 488 undef $FOCUS;
438 489
439 $focus->update if $focus; #? 490 $self->update;
440 491
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 492 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 493 unless $FOCUS;
443 494
444 0 495 0
445} 496}
446 497
447sub grab_focus { 498sub grab_focus {
448 my ($self) = @_; 499 my ($self) = @_;
449 500
501 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 502 $self->emit ("focus_in");
451} 503}
452 504
453sub invoke_mouse_motion { 1 } 505sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 506sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 507sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 508sub invoke_key_up { 0 }
509sub invoke_mouse_wheel { 0 }
457 510
458sub invoke_button_down { 511sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 512 my ($self, $ev, $x, $y) = @_;
460 513
461 $self->grab_focus; 514 $self->grab_focus;
462 515
463 1 516 0
464} 517}
465 518
466sub connect { 519sub connect {
467 my ($self, $signal, $cb) = @_; 520 my ($self, $signal, $cb) = @_;
468 521
469 push @{ $self->{signal_cb}{$signal} }, $cb; 522 push @{ $self->{signal_cb}{$signal} }, $cb;
523
524 defined wantarray and dc::guard {
525 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
526 @{ $self->{signal_cb}{$signal} };
527 }
470} 528}
529
530sub disconnect_all {
531 my ($self, $signal) = @_;
532
533 delete $self->{signal_cb}{$signal};
534}
535
536my %has_coords = (
537 button_down => 1,
538 button_up => 1,
539 mouse_motion => 1,
540 mouse_wheel => 1,
541);
471 542
472sub emit { 543sub emit {
473 my ($self, $signal, @args) = @_; 544 my ($self, $signal, @args) = @_;
474 545
475 #d##TODO# stop propagating at first true, do not use sum 546 # 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 547 # and needlessly verbose code, either.
548 my @append
549 = $has_coords{$signal}
550 ? $args[0]->xy ($self)
551 : ();
552
553 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
554
555 for my $cb (
556 @{$self->{signal_cb}{$signal} || []}, # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 557 ($self->can ("invoke_$signal") || sub { 1 }), # closure
558 ) {
559 return $cb->($self, @args, @append) || next;
560 }
561
562 # parent
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 563 $self->{parent} && $self->{parent}->emit ($signal, @args)
479} 564}
480 565
481sub find_widget { 566#sub find_widget {
482 my ($self, $x, $y) = @_; 567# 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 568
493sub set_parent { 569sub set_parent {
494 my ($self, $parent) = @_; 570 my ($self, $parent) = @_;
495 571
496 Scalar::Util::weaken ($self->{parent} = $parent); 572 dc::weaken ($self->{parent} = $parent);
497 $self->set_visible if $parent->{visible}; 573 $self->set_visible if $parent->{visible};
498} 574}
499 575
500sub realloc { 576sub realloc {
501 my ($self) = @_; 577 my ($self) = @_;
… …
527 603
528# using global variables seems a bit hacky, but passing through all drawing 604# using global variables seems a bit hacky, but passing through all drawing
529# functions seems pointless. 605# functions seems pointless.
530our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 606our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
531 607
532sub draw { 608#sub draw {
533 my ($self) = @_; 609#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 610
581sub _draw { 611sub _draw {
582 my ($self) = @_; 612 my ($self) = @_;
583 613
584 warn "no draw defined for $self\n"; 614 warn "no draw defined for $self\n";
585} 615}
586 616
587sub DESTROY { 617sub DESTROY {
588 my ($self) = @_; 618 my ($self) = @_;
589 619
590 delete $WIDGET{$self+0}; 620 return if dc::in_destruct;
591 621
622 local $@;
592 eval { $self->destroy }; 623 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 624 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
625
626 delete $WIDGET{$self+0};
594} 627}
595 628
596############################################################################# 629#############################################################################
597 630
598package CFClient::UI::DrawBG; 631package dc::UI::DrawBG;
599 632
600our @ISA = CFClient::UI::Base::; 633our @ISA = dc::UI::Base::;
601 634
602use strict; 635use strict;
603use CFClient::OpenGL; 636use dc::OpenGL;
604 637
605sub new { 638sub new {
606 my $class = shift; 639 my $class = shift;
607
608 # range [value, low, high, page]
609 640
610 $class->SUPER::new ( 641 $class->SUPER::new (
611 #bg => [0, 0, 0, 0.2], 642 #bg => [0, 0, 0, 0.2],
612 #active_bg => [1, 1, 1, 0.5], 643 #active_bg => [1, 1, 1, 0.5],
613 @_ 644 @_
… …
625 my ($w, $h) = @$self{qw(w h)}; 656 my ($w, $h) = @$self{qw(w h)};
626 657
627 glEnable GL_BLEND; 658 glEnable GL_BLEND;
628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 659 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
629 glColor_premultiply @$color; 660 glColor_premultiply @$color;
630
631 glBegin GL_QUADS;
632 glVertex 0 , 0;
633 glVertex 0 , $h;
634 glVertex $w, $h; 661 glRect 0, 0, $w, $h;
635 glVertex $w, 0;
636 glEnd;
637
638 glDisable GL_BLEND; 662 glDisable GL_BLEND;
639 } 663 }
640} 664}
641 665
642############################################################################# 666#############################################################################
643 667
644package CFClient::UI::Empty; 668package dc::UI::Empty;
645 669
646our @ISA = CFClient::UI::Base::; 670our @ISA = dc::UI::Base::;
647 671
648sub new { 672sub new {
649 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
650 $class->SUPER::new (can_events => 0, %arg); 674 $class->SUPER::new (can_events => 0, %arg);
651} 675}
… …
658 682
659sub draw { } 683sub draw { }
660 684
661############################################################################# 685#############################################################################
662 686
663package CFClient::UI::Container; 687package dc::UI::Container;
664 688
665our @ISA = CFClient::UI::Base::; 689our @ISA = dc::UI::Base::;
666 690
667sub new { 691sub new {
668 my ($class, %arg) = @_; 692 my ($class, %arg) = @_;
669 693
670 my $children = delete $arg{children}; 694 my $children = delete $arg{children};
… …
674 can_events => 0, 698 can_events => 0,
675 %arg, 699 %arg,
676 ); 700 );
677 701
678 $self->add (@$children) 702 $self->add (@$children)
679 if $children; 703 if $children && @$children;
680 704
681 $self 705 $self
706}
707
708sub realloc {
709 my ($self) = @_;
710
711 $self->{force_realloc} = 1;
712 $self->{force_size_alloc} = 1;
713 $self->SUPER::realloc;
682} 714}
683 715
684sub add { 716sub add {
685 my ($self, @widgets) = @_; 717 my ($self, @widgets) = @_;
686 718
687 $_->set_parent ($self) 719 $_->set_parent ($self)
688 for @widgets; 720 for @widgets;
689 721
722 # TODO: only do this in widgets that need it, e.g. root, fixed
690 use sort 'stable'; 723 use sort 'stable';
691 724
692 $self->{children} = [ 725 $self->{children} = [
693 sort { $a->{z} <=> $b->{z} } 726 sort { $a->{z} <=> $b->{z} }
694 @{$self->{children}}, @widgets 727 @{$self->{children}}, @widgets
695 ]; 728 ];
696 729
697 $self->realloc; 730 $self->realloc;
731
732 $self->emit (c_add => \@widgets);
733
734 map $_+0, @widgets
698} 735}
699 736
700sub children { 737sub children {
701 @{ $_[0]{children} } 738 @{ $_[0]{children} }
702} 739}
703 740
704sub remove { 741sub remove {
705 my ($self, $child) = @_; 742 my ($self, @widgets) = @_;
706 743
744 $self->emit (c_remove => \@widgets);
745
746 for my $child (@widgets) {
707 delete $child->{parent}; 747 delete $child->{parent};
708 $child->hide; 748 $child->hide;
709
710 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 749 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
750 }
711 751
712 $self->realloc; 752 $self->realloc;
713} 753}
714 754
715sub clear { 755sub clear {
716 my ($self) = @_; 756 my ($self) = @_;
717 757
718 my $children = delete $self->{children}; 758 my $children = $self->{children};
719 $self->{children} = []; 759 $self->{children} = [];
720 760
721 for (@$children) { 761 for (@$children) {
722 delete $_->{parent}; 762 delete $_->{parent};
723 $_->hide; 763 $_->hide;
… …
743} 783}
744 784
745sub _draw { 785sub _draw {
746 my ($self) = @_; 786 my ($self) = @_;
747 787
748 $_->draw for @{$self->{children}}; 788 $_->draw for $self->visible_children;
749} 789}
750 790
751############################################################################# 791#############################################################################
752 792
753package CFClient::UI::Bin; 793package dc::UI::Bin;
754 794
755our @ISA = CFClient::UI::Container::; 795our @ISA = dc::UI::Container::;
756 796
757sub new { 797sub new {
758 my ($class, %arg) = @_; 798 my ($class, %arg) = @_;
759 799
760 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 800 my $child = (delete $arg{child}) || new dc::UI::Empty::;
761 801
762 $class->SUPER::new (children => [$child], %arg) 802 $class->SUPER::new (children => [$child], %arg)
763} 803}
764 804
765sub add { 805sub add {
766 my ($self, $child) = @_; 806 my ($self, $child) = @_;
767 807
768 $self->SUPER::remove ($_) for @{ $self->{children} }; 808 $self->clear;
769 $self->SUPER::add ($child); 809 $self->SUPER::add ($child);
770} 810}
771 811
772sub remove { 812sub remove {
773 my ($self, $widget) = @_; 813 my ($self, $widget) = @_;
774 814
775 $self->SUPER::remove ($widget); 815 $self->SUPER::remove ($widget);
776 816
777 $self->{children} = [new CFClient::UI::Empty] 817 $self->{children} = [new dc::UI::Empty]
778 unless @{$self->{children}}; 818 unless @{$self->{children}};
779} 819}
780 820
781sub child { $_[0]->{children}[0] } 821sub child { $_[0]->{children}[0] }
782 822
… …
791 831
792 1 832 1
793} 833}
794 834
795############################################################################# 835#############################################################################
796
797# back-buffered drawing area 836# back-buffered drawing area
798 837
799package CFClient::UI::Window; 838package dc::UI::Window;
800 839
801our @ISA = CFClient::UI::Bin::; 840our @ISA = dc::UI::Bin::;
802 841
803use CFClient::OpenGL; 842use dc::OpenGL;
804 843
805sub new { 844sub new {
806 my ($class, %arg) = @_; 845 my ($class, %arg) = @_;
807 846
808 my $self = $class->SUPER::new (%arg); 847 my $self = $class->SUPER::new (%arg);
… …
830} 869}
831 870
832sub render_child { 871sub render_child {
833 my ($self) = @_; 872 my ($self) = @_;
834 873
835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 874 $self->{texture} = new_from_opengl dc::Texture $self->{w}, $self->{h}, sub {
836 glClearColor 0, 0, 0, 0; 875 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT; 876 glClear GL_COLOR_BUFFER_BIT;
838 877
839 { 878 {
840 package CFClient::UI::Base; 879 package dc::UI::Base;
841 880
842 ($draw_x, $draw_y, $draw_w, $draw_h) = 881 local ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h}); 882 (0, 0, $self->{w}, $self->{h});
883
884 $self->_render;
844 } 885 }
845
846 $self->_render;
847 }; 886 };
848} 887}
849 888
850sub _draw { 889sub _draw {
851 my ($self) = @_; 890 my ($self) = @_;
852
853 my ($w, $h) = @$self{qw(w h)};
854 891
855 my $tex = $self->{texture} 892 my $tex = $self->{texture}
856 or return; 893 or return;
857 894
858 glEnable GL_TEXTURE_2D; 895 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 896 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glColor 0, 0, 0, 1; 897 glColor 0, 0, 0, 1;
861 898
862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 899 $tex->draw_quad_alpha_premultiplied (0, 0);
863 900
864 glDisable GL_TEXTURE_2D; 901 glDisable GL_TEXTURE_2D;
865} 902}
866 903
867############################################################################# 904#############################################################################
868 905
869package CFClient::UI::ViewPort; 906package dc::UI::ViewPort;
870 907
908use List::Util qw(min max);
909
871our @ISA = CFClient::UI::Window::; 910our @ISA = dc::UI::Window::;
872 911
873sub new { 912sub new {
874 my $class = shift; 913 my $class = shift;
875 914
876 $class->SUPER::new ( 915 $class->SUPER::new (
… …
883sub size_request { 922sub size_request {
884 my ($self) = @_; 923 my ($self) = @_;
885 924
886 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 925 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
887 926
888 $w = 10 if $self->{scroll_x}; 927 $w = 1 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y}; 928 $h = 1 if $self->{scroll_y};
890 929
891 ($w, $h) 930 ($w, $h)
892} 931}
893 932
894sub invoke_size_allocate { 933sub invoke_size_allocate {
… …
906} 945}
907 946
908sub set_offset { 947sub set_offset {
909 my ($self, $x, $y) = @_; 948 my ($self, $x, $y) = @_;
910 949
950 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
951 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
952
953 if ($x != $self->{view_x} or $y != $self->{view_y}) {
911 $self->{view_x} = int $x; 954 $self->{view_x} = $x;
912 $self->{view_y} = int $y; 955 $self->{view_y} = $y;
913 956
957 $self->emit (changed => $x, $y);
914 $self->update; 958 $self->update;
959 }
960}
961
962sub set_center {
963 my ($self, $x, $y) = @_;
964
965 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
966}
967
968sub make_visible {
969 my ($self, $x, $y, $border) = @_;
970
971 if ( $x < $self->{view_x} + $self->{w} * $border
972 || $x > $self->{view_x} + $self->{w} * (1 - $border)
973 || $y < $self->{view_y} + $self->{h} * $border
974 || $y > $self->{view_y} + $self->{h} * (1 - $border)
975 ) {
976 $self->set_center ($x, $y);
977 }
915} 978}
916 979
917# hmm, this does not work for topleft of $self... but we should not ask for that 980# hmm, this does not work for topleft of $self... but we should not ask for that
918sub coord2local { 981sub coord2local {
919 my ($self, $x, $y) = @_; 982 my ($self, $x, $y) = @_;
… …
934 my ($self, $x, $y) = @_; 997 my ($self, $x, $y) = @_;
935 998
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 999 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1000 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 1001 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1002 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 1003 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1004 $self->dc::UI::Base::find_widget ($x, $y)
942 } 1005 }
943} 1006}
944 1007
945sub _render { 1008sub _render {
946 my ($self) = @_; 1009 my ($self) = @_;
947 1010
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1011 local $dc::UI::Base::draw_x = $dc::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1012 local $dc::UI::Base::draw_y = $dc::UI::Base::draw_y - $self->{view_y};
950 1013
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1014 dc::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1015
953 $self->SUPER::_render; 1016 $self->SUPER::_render;
954} 1017}
955 1018
956############################################################################# 1019#############################################################################
957 1020
958package CFClient::UI::ScrolledWindow; 1021package dc::UI::ScrolledWindow;
959 1022
960our @ISA = CFClient::UI::HBox::; 1023our @ISA = dc::UI::Table::;
961 1024
962sub new { 1025sub new {
963 my ($class, %arg) = @_; 1026 my ($class, %arg) = @_;
964 1027
965 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
966 1029
967 my $self; 1030 my $self;
968 1031
969 my $slider = new CFClient::UI::Slider 1032 my $hslider = new dc::UI::Slider
1033 c_col => 0,
1034 c_row => 1,
1035 vertical => 0,
1036 range => [0, 0, 1, 0.01], # HACK fix
1037 on_changed => sub {
1038 $self->{hpos} = $_[1];
1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 },
1041 ;
1042
1043 my $vslider = new dc::UI::Slider
1044 c_col => 1,
1045 c_row => 0,
970 vertical => 1, 1046 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1048 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1049 $self->{vpos} = $_[1];
1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974 }, 1051 },
975 ; 1052 ;
976 1053
977 $self = $class->SUPER::new ( 1054 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1055 scroll_x => 0,
1056 scroll_y => 1,
1057 can_events => 1,
979 slider => $slider, 1058 hslider => $hslider,
1059 vslider => $vslider,
1060 col_expand => [1, 0],
1061 row_expand => [1, 0],
980 %arg, 1062 %arg,
981 ); 1063 );
982 1064
1065 $self->{vp} = new dc::UI::ViewPort
1066 c_col => 0,
1067 c_row => 0,
1068 expand => 1,
1069 scroll_x => $self->{scroll_x},
1070 scroll_y => $self->{scroll_y},
1071 on_changed => sub {
1072 my ($vp, $x, $y) = @_;
1073
1074 $vp->{parent}{hslider}->set_value ($x);
1075 $vp->{parent}{vslider}->set_value ($y);
1076
1077 0
1078 },
1079 on_size_allocate => sub {
1080 my ($vp, $w, $h) = @_;
1081 $vp->{parent}->update_slider;
1082 0
1083 },
1084 ;
1085
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1086 $self->SUPER::add ($self->{vp});
1087
984 $self->add ($child) if $child; 1088 $self->add ($child) if $child;
985 1089
986 $self 1090 $self
987} 1091}
988 1092
… …
990 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
991 1095
992 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
993} 1097}
994 1098
1099sub set_offset { shift->{vp}->set_offset (@_) }
1100sub set_center { shift->{vp}->set_center (@_) }
1101sub make_visible { shift->{vp}->make_visible (@_) }
1102
995sub update { 1103sub update_slider {
1104 my ($self) = @_;
1105
1106 my $child = ($self->{vp} or return)->child;
1107
1108 if ($self->{scroll_x}) {
1109 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider_visible}) {
1114 $self->{hslider_visible} = $visible;
1115 $visible ? $self->SUPER::add ($self->{hslider})
1116 : $self->SUPER::remove ($self->{hslider});
1117 }
1118 }
1119
1120 if ($self->{scroll_y}) {
1121 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider_visible}) {
1126 $self->{vslider_visible} = $visible;
1127 $visible ? $self->SUPER::add ($self->{vslider})
1128 : $self->SUPER::remove ($self->{vslider});
1129 }
1130 }
1131}
1132
1133sub start_dragging {
996 my ($self) = @_; 1134 my ($self, $ev) = @_;
997 1135
998 $self->SUPER::update; 1136 $self->grab_focus;
999 1137
1000 # todo: overwrite size_allocate of child 1138 my $ox = $self->{vp}{view_x};
1001 my $child = $self->{vp}->child; 1139 my $oy = $self->{vp}{view_y};
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1140
1141 $self->{motion} = sub {
1142 my ($ev, $x, $y) = @_;
1143
1144 $ox -= $ev->{xrel};
1145 $oy -= $ev->{yrel};
1146
1147 $self->{vp}->set_offset ($ox, $oy);
1148 };
1149}
1150
1151sub invoke_mouse_wheel {
1152 my ($self, $ev) = @_;
1153
1154 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1155 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1156
1157 1
1158}
1159
1160sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_;
1162
1163 if ($ev->{button} == 2) {
1164 $self->start_dragging ($ev);
1165 return 1;
1166 }
1167
1168 0
1169}
1170
1171sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_;
1173
1174 if (delete $self->{motion}) {
1175 return 1;
1176 }
1177
1178 0
1179}
1180
1181sub invoke_mouse_motion {
1182 my ($self, $ev, $x, $y) = @_;
1183
1184 if ($self->{motion}) {
1185 $self->{motion}->($ev, $x, $y);
1186 return 1;
1187 }
1188
1189 0
1003} 1190}
1004 1191
1005sub invoke_size_allocate { 1192sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1007 1194
1008 my $child = $self->{vp}->child; 1195 $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) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1197}
1013 1198
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016
1017############################################################################# 1199#############################################################################
1018 1200
1019package CFClient::UI::Frame; 1201package dc::UI::Frame;
1020 1202
1021our @ISA = CFClient::UI::Bin::; 1203our @ISA = dc::UI::Bin::;
1022 1204
1023use CFClient::OpenGL; 1205use dc::OpenGL;
1024 1206
1025sub new { 1207sub new {
1026 my $class = shift; 1208 my $class = shift;
1027 1209
1028 $class->SUPER::new ( 1210 $class->SUPER::new (
… …
1038 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1039 1221
1040 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1042 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1043
1044 glBegin GL_QUADS;
1045 glVertex 0 , 0;
1046 glVertex 0 , $h;
1047 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1048 glVertex $w, 0;
1049 glEnd;
1050
1051 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1052 } 1227 }
1053 1228
1054 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1055} 1230}
1056 1231
1057############################################################################# 1232#############################################################################
1058 1233
1059package CFClient::UI::FancyFrame; 1234package dc::UI::FancyFrame;
1060 1235
1061our @ISA = CFClient::UI::Bin::; 1236our @ISA = dc::UI::Bin::;
1062 1237
1063use CFClient::OpenGL; 1238use dc::OpenGL;
1239
1240sub new {
1241 my ($class, %arg) = @_;
1242
1243 if ((exists $arg{label}) && !ref $arg{label}) {
1244 $arg{label} = new dc::UI::Label
1245 align => 1,
1246 valign => 0,
1247 text => $arg{label},
1248 fontsize => ($arg{border} || 0.8) * 0.75;
1249 }
1250
1251 my $self = $class->SUPER::new (
1252 # label => "",
1253 fg => [0.6, 0.3, 0.1],
1254 border => 0.8,
1255 style => 'single',
1256 %arg,
1257 );
1258
1259 $self
1260}
1261
1262sub add {
1263 my ($self, @widgets) = @_;
1264
1265 $self->SUPER::add (@widgets);
1266 $self->dc::UI::Container::add ($self->{label}) if $self->{label};
1267}
1268
1269sub border {
1270 int $_[0]{border} * $::FONTSIZE
1271}
1272
1273sub size_request {
1274 my ($self) = @_;
1275
1276 ($self->{label_w}, undef) = $self->{label}->size_request
1277 if $self->{label};
1278
1279 my ($w, $h) = $self->SUPER::size_request;
1280
1281 (
1282 $w + $self->border * 2,
1283 $h + $self->border * 2,
1284 )
1285}
1286
1287sub invoke_size_allocate {
1288 my ($self, $w, $h) = @_;
1289
1290 my $border = $self->border;
1291
1292 $w -= List::Util::max 0, $border * 2;
1293 $h -= List::Util::max 0, $border * 2;
1294
1295 if (my $label = $self->{label}) {
1296 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1297 $label->{h} = List::Util::min $h, $border;
1298 $label->invoke_size_allocate ($label->{w}, $label->{h});
1299 }
1300
1301 $self->child->configure ($border, $border, $w, $h);
1302
1303 1
1304}
1305
1306sub _draw {
1307 my ($self) = @_;
1308
1309 my $child = $self->{children}[0];
1310
1311 my $border = $self->border;
1312 my ($w, $h) = ($self->{w}, $self->{h});
1313
1314 $child->draw;
1315
1316 glColor @{$self->{fg}};
1317 glBegin GL_LINE_STRIP;
1318 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1319 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1320 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1321 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1322 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1324 glEnd;
1325
1326 if ($self->{label}) {
1327 glTranslate $border * 2, 0;
1328 $self->{label}->_draw;
1329 }
1330}
1331
1332#############################################################################
1333
1334package dc::UI::Toplevel;
1335
1336our @ISA = dc::UI::Bin::;
1337
1338use dc::OpenGL;
1064 1339
1065my $bg = 1340my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1341 new_from_file dc::Texture dc::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1; 1342 mipmap => 1, wrap => 1;
1068 1343
1069my @border = 1344my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1345 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1346 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1347
1348my @icon =
1349 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1350 qw(x1_move.png x1_resize.png);
1072 1351
1073sub new { 1352sub new {
1074 my ($class, %arg) = @_; 1353 my ($class, %arg) = @_;
1075 1354
1076 my $self = $class->SUPER::new ( 1355 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1356 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1357 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1358 border => 0.6,
1080 can_events => 1, 1359 can_events => 1,
1081 min_w => 16, 1360 min_w => 64,
1082 min_h => 16, 1361 min_h => 32,
1083 %arg, 1362 %arg,
1084 ); 1363 );
1085 1364
1086 $self->{title_widget} = new CFClient::UI::Label 1365 $self->{title_widget} = new dc::UI::Label
1087 align => 0, 1366 align => 0,
1088 valign => 1, 1367 valign => 1,
1089 text => $self->{title}, 1368 text => $self->{title},
1090 fontsize => $self->{border}, 1369 fontsize => $self->{border},
1091 if exists $self->{title}; 1370 if exists $self->{title};
1092 1371
1093 if ($self->{has_close_button}) { 1372 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1373 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1374 new dc::UI::ImageButton
1096 path => 'x1_close.png', 1375 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1376 on_activate => sub { $self->emit ("delete") };
1098 1377
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1378 $self->dc::UI::Container::add ($self->{close_button});
1100 } 1379 }
1101 1380
1102 $self 1381 $self
1103} 1382}
1104 1383
1105sub add { 1384sub add {
1106 my ($self, @widgets) = @_; 1385 my ($self, @widgets) = @_;
1107 1386
1108 $self->SUPER::add (@widgets); 1387 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1388 $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}; 1389 $self->dc::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111} 1390}
1112 1391
1113sub border { 1392sub border {
1114 int $_[0]{border} * $::FONTSIZE 1393 int $_[0]{border} * $::FONTSIZE
1394}
1395
1396sub get_max_wh {
1397 my ($self) = @_;
1398
1399 return ($self->{w}, $self->{h})
1400 if $self->{visible} && $self->{w};
1401
1402 $self->SUPER::get_max_wh
1115} 1403}
1116 1404
1117sub size_request { 1405sub size_request {
1118 my ($self) = @_; 1406 my ($self) = @_;
1119 1407
… …
1148 $self->child->configure ($border, $border, $w, $h); 1436 $self->child->configure ($border, $border, $w, $h);
1149 1437
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1438 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1439 if $self->{close_button};
1152 1440
1441 1
1442}
1443
1444sub invoke_delete {
1445 my ($self) = @_;
1446
1447 $self->hide;
1448
1153 1 1449 1
1154} 1450}
1155 1451
1156sub invoke_button_down { 1452sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1453 my ($self, $ev, $x, $y) = @_;
… …
1215 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1511 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216 1512
1217 ! ! $self->{motion} 1513 ! ! $self->{motion}
1218} 1514}
1219 1515
1516sub invoke_visibility_change {
1517 my ($self, $visible) = @_;
1518
1519 delete $self->{motion} unless $visible;
1520
1521 0
1522}
1523
1220sub _draw { 1524sub _draw {
1221 my ($self) = @_; 1525 my ($self) = @_;
1222 1526
1223 my $child = $self->{children}[0]; 1527 my $child = $self->{children}[0];
1224 1528
… …
1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1230 1534
1231 my $border = $self->border; 1535 my $border = $self->border;
1232 1536
1233 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1234 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1238 1556
1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1240 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1241 1559
1242 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1261 if $self->{close_button}; 1579 if $self->{close_button};
1262} 1580}
1263 1581
1264############################################################################# 1582#############################################################################
1265 1583
1266package CFClient::UI::Table; 1584package dc::UI::Table;
1267 1585
1268our @ISA = CFClient::UI::Base::; 1586our @ISA = dc::UI::Container::;
1269 1587
1270use List::Util qw(max sum); 1588use List::Util qw(max sum);
1271 1589
1272use CFClient::OpenGL; 1590use dc::OpenGL;
1273 1591
1274sub new { 1592sub new {
1275 my $class = shift; 1593 my $class = shift;
1276 1594
1277 $class->SUPER::new ( 1595 $class->SUPER::new (
1278 col_expand => [], 1596 col_expand => [],
1597 row_expand => [],
1279 @_, 1598 @_,
1280 ) 1599 )
1281} 1600}
1282 1601
1283sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285}
1286
1287sub add { 1602sub add {
1288 my ($self, $x, $y, $child) = @_; 1603 my ($self, @widgets) = @_;
1289 1604
1290 $child->set_parent ($self); 1605 for my $child (@widgets) {
1291 $self->{children}[$y][$x] = $child; 1606 $child->{c_rowspan} ||= 1;
1607 $child->{c_colspan} ||= 1;
1608 }
1292 1609
1293 $self->realloc; 1610 $self->SUPER::add (@widgets);
1294} 1611}
1295 1612
1296sub remove { 1613sub add_at {
1614 my $self = shift;
1615
1616 my @widgets;
1617
1618 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1621 $child->{c_row} = $row;
1622 $child->{c_col} = $col;
1623
1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1297 my ($self, $child) = @_; 1631 my ($self) = @_;
1298 1632
1299 # TODO: not yet implemented 1633 my (@w, @h);
1300}
1301
1302# TODO: move to container class maybe? send children a signal on removal?
1303sub clear {
1304 my ($self) = @_;
1305 1634
1306 my @children = $self->children; 1635 my @children = $self->children;
1307 delete $self->{children}; 1636
1637 # first pass, columns
1638 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1640
1641 my $sw = sum @w[$c .. $c + $cs - 1];
1642
1643 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645 }
1308 1646 }
1309 for (@children) {
1310 delete $_->{parent};
1311 $_->hide;
1312 }
1313 1647
1314 $self->realloc; 1648 # second pass, rows
1315} 1649 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)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1330 1651
1331 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1332 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1333 } 1656 }
1334 } 1657 }
1335 1658
1336 (\@w, \@h) 1659 (\@w, \@h)
1337} 1660}
… …
1353 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1354 1677
1355 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1356 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1357 1680
1358 # TODO: nicer code && do row_expand 1681 # now linearly scale the rows/columns to the allocated size
1359 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1360 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1361 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1362 1685
1363 # linearly scale sizes
1364 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366 1687
1367 CFClient::UI::harmonize $ws; 1688 dc::UI::harmonize $ws;
1689
1690 my @row_expand = @{$self->{row_expand}};
1691 @row_expand = (1) x @$ws unless @row_expand;
1692 my $row_expand = (sum @row_expand) || 1;
1693
1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1695
1368 CFClient::UI::harmonize $hs; 1696 dc::UI::harmonize $hs;
1369 1697
1370 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1371 1700
1372 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1373 my $row = $self->{children}[$r] 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1374 or next;
1375 1703
1376 my $x = 0; 1704 $widget->configure (
1377 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1378 1707 );
1379 for my $c (0 .. $#$row) { 1708 }
1380 my $col_w = $ws->[$c];
1381 1709
1382 if (my $widget = $row->[$c]) { 1710 1
1383 $widget->configure ($x, $y, $col_w, $row_h); 1711}
1384 }
1385 1712
1386 $x += $col_w; 1713#############################################################################
1714
1715package dc::UI::Fixed;
1716
1717use List::Util qw(min max);
1718
1719our @ISA = dc::UI::Container::;
1720
1721sub _scale($$$) {
1722 my ($rel, $val, $max) = @_;
1723
1724 $rel ? $val * $max : $val
1725}
1726
1727sub size_request {
1728 my ($self) = @_;
1729
1730 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1731
1732 # determine overall size by querying abs widgets
1733 for my $child ($self->visible_children) {
1734 unless ($child->{c_rel}) {
1735 my $x = $child->{c_x};
1736 my $y = $child->{c_y};
1737
1738 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1739 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1387 } 1740 }
1741 }
1388 1742
1389 $y += $row_h; 1743 my $W = $x2 - $x1;
1744 my $H = $y2 - $y1;
1745
1746 # now layout remaining widgets
1747 for my $child ($self->visible_children) {
1748 if ($child->{c_rel}) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1751
1752 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1753 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1754 }
1755 }
1756
1757 my $W = $x2 - $x1;
1758 my $H = $y2 - $y1;
1759
1760 ($W, $H)
1761}
1762
1763sub invoke_size_allocate {
1764 my ($self, $W, $H) = @_;
1765
1766 for my $child ($self->visible_children) {
1767 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1768 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1769
1770 $x += $child->{c_halign} * $child->{req_w};
1771 $y += $child->{c_valign} * $child->{req_h};
1772
1773 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1390 } 1774 }
1391 1775
1392 1 1776 1
1393} 1777}
1394 1778
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############################################################################# 1779#############################################################################
1420 1780
1421package CFClient::UI::Box; 1781package dc::UI::Box;
1422 1782
1423our @ISA = CFClient::UI::Container::; 1783our @ISA = dc::UI::Container::;
1424 1784
1425sub size_request { 1785sub size_request {
1426 my ($self) = @_; 1786 my ($self) = @_;
1787
1788 my @children = $self->visible_children;
1427 1789
1428 $self->{vertical} 1790 $self->{vertical}
1429 ? ( 1791 ? (
1430 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::max map $_->{req_w}, @children),
1431 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_h}, @children),
1432 ) 1794 )
1433 : ( 1795 : (
1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1796 (List::Util::sum map $_->{req_w}, @children),
1435 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1797 (List::Util::max map $_->{req_h}, @children),
1436 ) 1798 )
1437} 1799}
1438 1800
1439sub invoke_size_allocate { 1801sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 1802 my ($self, $w, $h) = @_;
… …
1461 $req[$_] += $space * $children[$_]{expand} 1823 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#children; 1824 for 0 .. $#children;
1463 } 1825 }
1464 } 1826 }
1465 1827
1466 CFClient::UI::harmonize \@req; 1828 dc::UI::harmonize \@req;
1467 1829
1468 my $pos = 0; 1830 my $pos = 0;
1469 for (0 .. $#children) { 1831 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1832 my $alloc = $req[$_];
1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1833 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1476 1 1838 1
1477} 1839}
1478 1840
1479############################################################################# 1841#############################################################################
1480 1842
1481package CFClient::UI::HBox; 1843package dc::UI::HBox;
1482 1844
1483our @ISA = CFClient::UI::Box::; 1845our @ISA = dc::UI::Box::;
1484 1846
1485sub new { 1847sub new {
1486 my $class = shift; 1848 my $class = shift;
1487 1849
1488 $class->SUPER::new ( 1850 $class->SUPER::new (
… …
1491 ) 1853 )
1492} 1854}
1493 1855
1494############################################################################# 1856#############################################################################
1495 1857
1496package CFClient::UI::VBox; 1858package dc::UI::VBox;
1497 1859
1498our @ISA = CFClient::UI::Box::; 1860our @ISA = dc::UI::Box::;
1499 1861
1500sub new { 1862sub new {
1501 my $class = shift; 1863 my $class = shift;
1502 1864
1503 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1506 ) 1868 )
1507} 1869}
1508 1870
1509############################################################################# 1871#############################################################################
1510 1872
1511package CFClient::UI::Label; 1873package dc::UI::Label;
1512 1874
1513our @ISA = CFClient::UI::DrawBG::; 1875our @ISA = dc::UI::DrawBG::;
1514 1876
1515use CFClient::OpenGL; 1877use dc::OpenGL;
1516 1878
1517sub new { 1879sub new {
1518 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1519 1881
1520 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
… …
1523 #active_bg => none 1885 #active_bg => none
1524 #font => default_font 1886 #font => default_font
1525 #text => initial text 1887 #text => initial text
1526 #markup => initial narkup 1888 #markup => initial narkup
1527 #max_w => maximum pixel width 1889 #max_w => maximum pixel width
1890 #style => 0, # render flags
1528 ellipsise => 3, # end 1891 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 1892 layout => (new dc::Layout),
1530 fontsize => 1, 1893 fontsize => 1,
1531 align => -1, 1894 align => -1,
1532 valign => -1, 1895 valign => -1,
1533 padding_x => 2, 1896 padding_x => 2,
1534 padding_y => 2, 1897 padding_y => 2,
1535 can_events => 0, 1898 can_events => 0,
1536 %arg 1899 %arg
1537 ); 1900 );
1538 1901
1539 if (exists $self->{template}) { 1902 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 1903 my $layout = new dc::Layout;
1541 $layout->set_text (delete $self->{template}); 1904 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 1905 $self->{template} = $layout;
1543 } 1906 }
1544 1907
1545 if (exists $self->{markup}) { 1908 if (exists $self->{markup}) {
… …
1549 } 1912 }
1550 1913
1551 $self 1914 $self
1552} 1915}
1553 1916
1554sub escape($) {
1555 local $_ = $_[0];
1556
1557 s/&/&amp;/g;
1558 s/>/&gt;/g;
1559 s/</&lt;/g;
1560
1561 $_
1562}
1563
1564sub update { 1917sub update {
1565 my ($self) = @_; 1918 my ($self) = @_;
1566 1919
1567 delete $self->{texture}; 1920 delete $self->{texture};
1568 $self->SUPER::update; 1921 $self->SUPER::update;
… …
1573 1926
1574 delete $self->{ox}; 1927 delete $self->{ox};
1575 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1576} 1929}
1577 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1578sub set_text { 1937sub set_text {
1579 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1580 1939
1581 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
1583 1942
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1943 $self->{layout}->set_text ($text);
1586 1944
1587 delete $self->{size_req}; 1945 delete $self->{size_req};
1588 $self->realloc; 1946 $self->realloc;
1589 $self->update; 1947 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1953 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1954 $self->{text} = "M$markup";
1597 1955
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1956 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1957
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1958 $self->{layout}->set_markup ($markup);
1602 1959
1603 delete $self->{size_req}; 1960 delete $self->{size_req};
1604 $self->realloc; 1961 $self->realloc;
1605 $self->update; 1962 $self->update;
… …
1607 1964
1608sub size_request { 1965sub size_request {
1609 my ($self) = @_; 1966 my ($self) = @_;
1610 1967
1611 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1612 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1613 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1614 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1617 1976
1618 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
1619 1978
1620 if (exists $self->{template}) { 1979 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1980 $self->{template}->set_font ($self->{font}) if $self->{font};
1981 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1982 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1983
1624 my ($w2, $h2) = $self->{template}->size; 1984 my ($w2, $h2) = $self->{template}->size;
1625 1985
1626 $w = List::Util::max $w, $w2; 1986 $w = List::Util::max $w, $w2;
… …
1631 }; 1991 };
1632 1992
1633 @{ $self->{size_req} } 1993 @{ $self->{size_req} }
1634} 1994}
1635 1995
1996sub baseline_shift {
1997 $_[0]{layout}->descent
1998}
1999
1636sub invoke_size_allocate { 2000sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 2001 my ($self, $w, $h) = @_;
1638 2002
1639 delete $self->{ox}; 2003 delete $self->{ox};
1640 2004
… …
1646 2010
1647sub set_fontsize { 2011sub set_fontsize {
1648 my ($self, $fontsize) = @_; 2012 my ($self, $fontsize) = @_;
1649 2013
1650 $self->{fontsize} = $fontsize; 2014 $self->{fontsize} = $fontsize;
2015 delete $self->{size_req};
1651 delete $self->{texture}; 2016 delete $self->{texture};
1652 2017
1653 $self->realloc; 2018 $self->realloc;
1654} 2019}
1655 2020
1656sub reconfigure { 2021sub reconfigure {
1657 my ($self) = @_; 2022 my ($self) = @_;
1658 2023
1659 delete $self->{size_req}; 2024 delete $self->{size_req};
2025 delete $self->{texture};
1660 2026
1661 $self->SUPER::reconfigure; 2027 $self->SUPER::reconfigure;
1662} 2028}
1663 2029
1664sub _draw { 2030sub _draw {
1665 my ($self) = @_; 2031 my ($self) = @_;
1666 2032
1667 $self->SUPER::_draw; # draw background, if applicable 2033 $self->SUPER::_draw; # draw background, if applicable
1668 2034
1669 my $tex = $self->{texture} ||= do { 2035 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 2036 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2037 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 2038 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2039 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2040 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2041 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 2042
1677 new_from_layout CFClient::Texture $self->{layout} 2043 [$self->{layout}->size]
1678 }; 2044 };
1679 2045
1680 unless (exists $self->{ox}) { 2046 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2047 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2048 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
1684 2050
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1688 }; 2056 };
1689 2057
1690 glEnable GL_TEXTURE_2D; 2058# unless ($self->{list}) {
1691 2059# $self->{list} = dc::OpenGL::glGenList;
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2060# dc::OpenGL::glNewList $self->{list};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2061# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1694 2062# 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 } 2063# }
2064#
2065# dc::OpenGL::glCallList $self->{list};
1703 2066
1704 glDisable GL_TEXTURE_2D; 2067 $self->{layout}->draw;
1705} 2068}
2069
2070#sub destroy {
2071# my ($self) = @_;
2072#
2073# dc::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2074#
2075# $self->SUPER::destroy;
2076#}
1706 2077
1707############################################################################# 2078#############################################################################
1708 2079
1709package CFClient::UI::EntryBase; 2080package dc::UI::EntryBase;
1710 2081
1711our @ISA = CFClient::UI::Label::; 2082our @ISA = dc::UI::Label::;
1712 2083
1713use CFClient::OpenGL; 2084use dc::OpenGL;
1714 2085
1715sub new { 2086sub new {
1716 my $class = shift; 2087 my $class = shift;
1717 2088
1718 $class->SUPER::new ( 2089 $class->SUPER::new (
1719 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
1720 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
1721 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
1722 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
1723 can_hover => 1, 2096 can_hover => 1,
1724 can_focus => 1, 2097 can_focus => 1,
1725 valign => 0, 2098 valign => 0,
1726 can_events => 1, 2099 can_events => 1,
2100 ellipsise => 0,
1727 #text => ... 2101 #text => ...
1728 #hidden => "*", 2102 #hidden => "*",
1729 @_ 2103 @_
1730 ) 2104 )
1731} 2105}
… …
1776 my $sym = $ev->{sym}; 2150 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 2151 my $uni = $ev->{unicode};
1778 2152
1779 my $text = $self->get_text; 2153 my $text = $self->get_text;
1780 2154
2155 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2156
1781 if ($uni == 8) { 2157 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2158 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 2159 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 2160 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 2161 } elsif ($sym == dc::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 2162 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 2163 } elsif ($sym == dc::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2164 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 2165 } elsif ($sym == dc::SDLK_HOME) {
2166 # what a hack
2167 $self->{cursor} =
2168 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2169 ? length $1
2170 : 0;
2171 } elsif ($sym == dc::SDLK_END) {
2172 # uh, again
2173 $self->{cursor} =
2174 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2175 ? $self->{cursor} + length $1
2176 : length $self->{text};
2177 } elsif ($uni == 21) { # ctrl-u
2178 $text = "";
1790 $self->{cursor} = 0; 2179 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 2180 } elsif ($uni == 27) {
1794 $self->emit ('escape'); 2181 $self->emit ('escape');
1795 } elsif ($uni) { 2182 } elsif ($uni == 0x0d) {
2183 substr $text, $self->{cursor}++, 0, "\012";
2184 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2185 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2186 } else {
1798 return 0; 2187 return 0;
1799 } 2188 }
1800 2189
1801 $self->_set_text ($text); 2190 $self->_set_text ($text);
1802 2191
1803 $self->realloc; 2192 $self->realloc;
2193 $self->update;
1804 2194
1805 1 2195 1
1806} 2196}
1807 2197
1808sub invoke_focus_in { 2198sub invoke_focus_in {
… …
1820 2210
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2211 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2212
1823 # byte-index to char-index 2213 # byte-index to char-index
1824 my $text = $self->{text}; 2214 my $text = $self->{text};
1825 utf8::encode $text; 2215 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2216 $self->{cursor} = length $text;
1827 2217
1828 $self->_set_text ($self->{text}); 2218 $self->_set_text ($self->{text});
1829 $self->update; 2219 $self->update;
1830 2220
1831 1 2221 1
… …
1850 glColor_premultiply @{$self->{bg}}; 2240 glColor_premultiply @{$self->{bg}};
1851 } 2241 }
1852 2242
1853 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2244 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}; 2245 glRect 0, 0, $self->{w}, $self->{h};
1859 glVertex $self->{w}, 0;
1860 glEnd;
1861 glDisable GL_BLEND; 2246 glDisable GL_BLEND;
1862 2247
1863 $self->SUPER::_draw; 2248 $self->SUPER::_draw;
1864 2249
1865 #TODO: force update every cursor change :( 2250 #TODO: force update every cursor change :(
… …
1867 2252
1868 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
1869 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
1870 utf8::encode $text; 2255 utf8::encode $text;
1871 2256
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1873 } 2258 }
1874 2259
1875 glColor @{$self->{fg}}; 2260 glColor_premultiply @{$self->{active_fg}};
1876 glBegin GL_LINES; 2261 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 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}; 2263 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2264 glEnd;
1880 }
1881}
1882 2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2269 glLineWidth 1;
2270
2271 } else {
2272 glColor @{$self->{outline}};
2273 glBegin GL_LINE_STRIP;
2274 glVertex .5, $self->{h} * .5;
2275 glVertex .5, $self->{h} - 2.5;
2276 glVertex $self->{w} - .5, $self->{h} - 2.5;
2277 glVertex $self->{w} - .5, $self->{h} * .5;
2278 glEnd;
2279 }
2280}
2281
2282#############################################################################
2283
1883package CFClient::UI::Entry; 2284package dc::UI::Entry;
1884 2285
1885our @ISA = CFClient::UI::EntryBase::; 2286our @ISA = dc::UI::EntryBase::;
1886 2287
1887use CFClient::OpenGL; 2288use dc::OpenGL;
1888 2289
1889sub invoke_key_down { 2290sub invoke_key_down {
1890 my ($self, $ev) = @_; 2291 my ($self, $ev) = @_;
1891 2292
1892 my $sym = $ev->{sym}; 2293 my $sym = $ev->{sym};
1893 2294
1894 if ($sym == 13) { 2295 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2296 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2297 my $txt = $self->get_text;
1897 2298
1898 $self->{history_pointer} = -1; 2299 $self->{history_pointer} = -1;
1899 $self->{history_saveback} = ''; 2300 $self->{history_saveback} = '';
1900 $self->emit (activate => $txt); 2301 $self->emit (activate => $txt);
1901 $self->update; 2302 $self->update;
1902 2303
1903 } elsif ($sym == CFClient::SDLK_UP) { 2304 } elsif ($sym == dc::SDLK_UP) {
1904 if ($self->{history_pointer} < 0) { 2305 if ($self->{history_pointer} < 0) {
1905 $self->{history_saveback} = $self->get_text; 2306 $self->{history_saveback} = $self->get_text;
1906 } 2307 }
1907 if (@{$self->{history} || []} > 0) { 2308 if (@{$self->{history} || []} > 0) {
1908 $self->{history_pointer}++; 2309 $self->{history_pointer}++;
… …
1910 $self->{history_pointer} = @{$self->{history} || []} - 1; 2311 $self->{history_pointer} = @{$self->{history} || []} - 1;
1911 } 2312 }
1912 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1913 } 2314 }
1914 2315
1915 } elsif ($sym == CFClient::SDLK_DOWN) { 2316 } elsif ($sym == dc::SDLK_DOWN) {
1916 $self->{history_pointer}--; 2317 $self->{history_pointer}--;
1917 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2318 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918 2319
1919 if ($self->{history_pointer} >= 0) { 2320 if ($self->{history_pointer} >= 0) {
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2321 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1929 1 2330 1
1930} 2331}
1931 2332
1932############################################################################# 2333#############################################################################
1933 2334
2335package dc::UI::TextEdit;
2336
2337our @ISA = dc::UI::EntryBase::;
2338
2339use dc::OpenGL;
2340
2341sub move_cursor_ver {
2342 my ($self, $dy) = @_;
2343
2344 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2345
2346 $y += $dy;
2347
2348 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2349 $self->{cursor} = $index;
2350 delete $self->{cur_h};
2351 $self->update;
2352 return;
2353 }
2354}
2355
2356sub invoke_key_down {
2357 my ($self, $ev) = @_;
2358
2359 my $sym = $ev->{sym};
2360
2361 if ($sym == dc::SDLK_UP) {
2362 $self->move_cursor_ver (-1);
2363 } elsif ($sym == dc::SDLK_DOWN) {
2364 $self->move_cursor_ver (+1);
2365 } else {
2366 return $self->SUPER::invoke_key_down ($ev)
2367 }
2368
2369 1
2370}
2371
2372#############################################################################
2373
1934package CFClient::UI::Button; 2374package dc::UI::ButtonBin;
1935 2375
1936our @ISA = CFClient::UI::Label::; 2376our @ISA = dc::UI::Bin::;
1937 2377
1938use CFClient::OpenGL; 2378use dc::OpenGL;
1939 2379
1940my @tex = 2380my @tex =
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2381 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1942 qw(b1_button_active.png); 2382 qw(b1_button_inactive.png b1_button_active.png);
1943 2383
1944sub new { 2384sub new {
1945 my $class = shift; 2385 my $class = shift;
1946 2386
1947 $class->SUPER::new ( 2387 $class->SUPER::new (
1948 padding_x => 4,
1949 padding_y => 4,
1950 fg => [1, 1, 1],
1951 active_fg => [0, 0, 1],
1952 can_hover => 1, 2388 can_hover => 1,
1953 align => 0, 2389 align => 0,
1954 valign => 0, 2390 valign => 0,
1955 can_events => 1, 2391 can_events => 1,
1956 @_ 2392 @_
… …
1968} 2404}
1969 2405
1970sub _draw { 2406sub _draw {
1971 my ($self) = @_; 2407 my ($self) = @_;
1972 2408
1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1974
1975 glEnable GL_TEXTURE_2D; 2409 glEnable GL_TEXTURE_2D;
1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1977 glColor 0, 0, 0, 1; 2411 glColor 0, 0, 0, 1;
1978 2412
2413 my $tex = $tex[$GRAB == $self];
1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2414 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1980 2415
1981 glDisable GL_TEXTURE_2D; 2416 glDisable GL_TEXTURE_2D;
1982 2417
1983 $self->SUPER::_draw; 2418 $self->SUPER::_draw;
1984} 2419}
1985 2420
1986############################################################################# 2421#############################################################################
1987 2422
2423package dc::UI::Button;
2424
2425our @ISA = dc::UI::Label::;
2426
2427use dc::OpenGL;
2428
2429my @tex =
2430 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2431 qw(b1_button_inactive.png b1_button_active.png);
2432
2433sub new {
2434 my $class = shift;
2435
2436 $class->SUPER::new (
2437 padding_x => 4,
2438 padding_y => 4,
2439 fg => [1.0, 1.0, 1.0],
2440 active_fg => [0.8, 0.8, 0.8],
2441 can_hover => 1,
2442 align => 0,
2443 valign => 0,
2444 can_events => 1,
2445 @_
2446 )
2447}
2448
2449sub invoke_button_up {
2450 my ($self, $ev, $x, $y) = @_;
2451
2452 $self->emit ("activate")
2453 if $x >= 0 && $x < $self->{w}
2454 && $y >= 0 && $y < $self->{h};
2455
2456 1
2457}
2458
2459sub _draw {
2460 my ($self) = @_;
2461
2462 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2463
2464 glEnable GL_TEXTURE_2D;
2465 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2466 glColor 0, 0, 0, 1;
2467
2468 my $tex = $tex[$GRAB == $self];
2469 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470
2471 glDisable GL_TEXTURE_2D;
2472
2473 $self->SUPER::_draw;
2474}
2475
2476#############################################################################
2477
2478package dc::UI::CheckBox;
2479
2480our @ISA = dc::UI::DrawBG::;
2481
2482my @tex =
2483 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2484 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2485
2486use dc::OpenGL;
2487
2488sub new {
2489 my $class = shift;
2490
2491 $class->SUPER::new (
2492 padding_x => 2,
2493 padding_y => 2,
2494 fg => [1, 1, 1],
2495 active_fg => [1, 1, 0],
2496 bg => [0, 0, 0, 0.2],
2497 active_bg => [1, 1, 1, 0.5],
2498 state => 0,
2499 can_hover => 1,
2500 @_
2501 )
2502}
2503
2504sub size_request {
2505 my ($self) = @_;
2506
2507 (6) x 2
2508}
2509
2510sub toggle {
2511 my ($self) = @_;
2512
2513 $self->{state} = !$self->{state};
2514 $self->emit (changed => $self->{state});
2515 $self->update;
2516}
2517
2518sub invoke_button_down {
2519 my ($self, $ev, $x, $y) = @_;
2520
2521 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2522 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2523 $self->toggle;
2524 } else {
2525 return 0
2526 }
2527
2528 1
2529}
2530
2531sub _draw {
2532 my ($self) = @_;
2533
2534 $self->SUPER::_draw;
2535
2536 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2537
2538 my ($w, $h) = @$self{qw(w h)};
2539
2540 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2541
2542 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2543
2544 my $tex = $self->{state} ? $tex[1] : $tex[0];
2545
2546 glEnable GL_TEXTURE_2D;
2547 $tex->draw_quad_alpha (0, 0, $s, $s);
2548 glDisable GL_TEXTURE_2D;
2549}
2550
2551#############################################################################
2552
2553package dc::UI::Image;
2554
2555our @ISA = dc::UI::Base::;
2556
2557use dc::OpenGL;
2558
2559our %texture_cache;
2560
2561sub new {
2562 my $class = shift;
2563
2564 my $self = $class->SUPER::new (
2565 can_events => 0,
2566 scale => 1,
2567 @_,
2568 );
2569
2570 $self->{path} || $self->{tex}
2571 or Carp::croak "'path' or 'tex' attributes required";
2572
2573 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2574 new_from_file dc::Texture dc::find_rcfile $self->{path}, mipmap => 1;
2575
2576 dc::weaken $texture_cache{$self->{path}};
2577
2578 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2579
2580 $self
2581}
2582
2583sub STORABLE_freeze {
2584 my ($self, $cloning) = @_;
2585
2586 $self->{path}
2587 or die "cannot serialise dc::UI::Image on non-loadable images\n";
2588
2589 $self->{path}
2590}
2591
2592sub STORABLE_attach {
2593 my ($self, $cloning, $path) = @_;
2594
2595 $self->new (path => $path)
2596}
2597
2598sub size_request {
2599 my ($self) = @_;
2600
2601 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2602}
2603
2604sub _draw {
2605 my ($self) = @_;
2606
2607 my $tex = $self->{tex};
2608
2609 my ($w, $h) = ($self->{w}, $self->{h});
2610
2611 if ($self->{rot90}) {
2612 glRotate 90, 0, 0, 1;
2613 glTranslate 0, -$self->{w}, 0;
2614
2615 ($w, $h) = ($h, $w);
2616 }
2617
2618 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620
2621 $tex->draw_quad_alpha (0, 0, $w, $h);
2622
2623 glDisable GL_TEXTURE_2D;
2624}
2625
2626#############################################################################
2627
1988package CFClient::UI::ImageButton; 2628package dc::UI::ImageButton;
1989 2629
1990our @ISA = CFClient::UI::Image::; 2630our @ISA = dc::UI::Image::;
1991 2631
1992use CFClient::OpenGL; 2632use dc::OpenGL;
1993 2633
1994my %textures; 2634my %textures;
1995 2635
1996sub new { 2636sub new {
1997 my $class = shift; 2637 my $class = shift;
… …
2007 can_events => 1, 2647 can_events => 1,
2008 @_ 2648 @_
2009 ); 2649 );
2010} 2650}
2011 2651
2652sub invoke_button_down {
2653 my ($self, $ev, $x, $y) = @_;
2654
2655 1
2656}
2657
2012sub invoke_button_up { 2658sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_; 2659 my ($self, $ev, $x, $y) = @_;
2014 2660
2015 $self->emit ("activate") 2661 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w} 2662 if $x >= 0 && $x < $self->{w}
… …
2019 1 2665 1
2020} 2666}
2021 2667
2022############################################################################# 2668#############################################################################
2023 2669
2024package CFClient::UI::CheckBox; 2670package dc::UI::VGauge;
2025 2671
2026our @ISA = CFClient::UI::DrawBG::;
2027
2028my @tex =
2029 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032use CFClient::OpenGL;
2033
2034sub new {
2035 my $class = shift;
2036
2037 $class->SUPER::new (
2038 padding_x => 2,
2039 padding_y => 2,
2040 fg => [1, 1, 1],
2041 active_fg => [1, 1, 0],
2042 bg => [0, 0, 0, 0.2],
2043 active_bg => [1, 1, 1, 0.5],
2044 state => 0,
2045 can_hover => 1,
2046 @_
2047 )
2048}
2049
2050sub size_request {
2051 my ($self) = @_;
2052
2053 (6) x 2
2054}
2055
2056sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_;
2058
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state};
2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
2067 1
2068}
2069
2070sub _draw {
2071 my ($self) = @_;
2072
2073 $self->SUPER::_draw;
2074
2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077 my ($w, $h) = @$self{qw(w h)};
2078
2079 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085 glEnable GL_TEXTURE_2D;
2086 $tex->draw_quad_alpha (0, 0, $s, $s);
2087 glDisable GL_TEXTURE_2D;
2088}
2089
2090#############################################################################
2091
2092package CFClient::UI::Image;
2093
2094our @ISA = CFClient::UI::Base::; 2672our @ISA = dc::UI::Base::;
2095
2096use CFClient::OpenGL;
2097
2098our %texture_cache;
2099
2100sub new {
2101 my $class = shift;
2102
2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
2107
2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
2110
2111 $self->{tex} = $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113
2114 Scalar::Util::weaken $texture_cache{$self->{path}};
2115
2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self
2119}
2120
2121sub size_request {
2122 my ($self) = @_;
2123
2124 ($self->{tex}{w}, $self->{tex}{h})
2125}
2126
2127sub _draw {
2128 my ($self) = @_;
2129
2130 my $tex = $self->{tex};
2131
2132 my ($w, $h) = ($self->{w}, $self->{h});
2133
2134 if ($self->{rot90}) {
2135 glRotate 90, 0, 0, 1;
2136 glTranslate 0, -$self->{w}, 0;
2137
2138 ($w, $h) = ($h, $w);
2139 }
2140
2141 glEnable GL_TEXTURE_2D;
2142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2143
2144 $tex->draw_quad_alpha (0, 0, $w, $h);
2145
2146 glDisable GL_TEXTURE_2D;
2147}
2148
2149#############################################################################
2150
2151package CFClient::UI::VGauge;
2152
2153our @ISA = CFClient::UI::Base::;
2154 2673
2155use List::Util qw(min max); 2674use List::Util qw(min max);
2156 2675
2157use CFClient::OpenGL; 2676use dc::OpenGL;
2158 2677
2159my %tex = ( 2678my %tex = (
2160 food => [ 2679 food => [
2161 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2162 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2681 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2163 ], 2682 ],
2164 grace => [ 2683 grace => [
2165 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2166 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2685 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2167 ], 2686 ],
2168 hp => [ 2687 hp => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2688 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2170 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2689 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2171 ], 2690 ],
2172 mana => [ 2691 mana => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2692 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2174 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2693 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2175 ], 2694 ],
2176); 2695);
2177 2696
2178# eg. VGauge->new (gauge => 'food'), default gauge: food 2697# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2238 my $ycut1 = max 0, min 1, $ycut; 2757 my $ycut1 = max 0, min 1, $ycut;
2239 my $ycut2 = max 0, min 1, $ycut - 1; 2758 my $ycut2 = max 0, min 1, $ycut - 1;
2240 2759
2241 my $h1 = $self->{h} * (1 - $ycut1); 2760 my $h1 = $self->{h} * (1 - $ycut1);
2242 my $h2 = $self->{h} * (1 - $ycut2); 2761 my $h2 = $self->{h} * (1 - $ycut2);
2762 my $h3 = $self->{h};
2763
2764 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243 2765
2244 glEnable GL_BLEND; 2766 glEnable GL_BLEND;
2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2767 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2768 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glEnable GL_TEXTURE_2D; 2769 glEnable GL_TEXTURE_2D;
… …
2266 2788
2267 if ($t3) { 2789 if ($t3) {
2268 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2790 glBindTexture GL_TEXTURE_2D, $t3->{name};
2269 glBegin GL_QUADS; 2791 glBegin GL_QUADS;
2270 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2792 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2793 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2794 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2795 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274 glEnd; 2796 glEnd;
2275 } 2797 }
2276 2798
2277 glDisable GL_BLEND; 2799 glDisable GL_BLEND;
2278 glDisable GL_TEXTURE_2D; 2800 glDisable GL_TEXTURE_2D;
2279} 2801}
2280 2802
2281############################################################################# 2803#############################################################################
2282 2804
2805package dc::UI::Progress;
2806
2807our @ISA = dc::UI::Label::;
2808
2809use dc::OpenGL;
2810
2811sub new {
2812 my ($class, %arg) = @_;
2813
2814 my $self = $class->SUPER::new (
2815 fg => [1, 1, 1],
2816 bg => [0, 0, 1, 0.2],
2817 bar => [0.7, 0.5, 0.1, 0.8],
2818 outline => [0.4, 0.3, 0],
2819 fontsize => 0.9,
2820 valign => 0,
2821 align => 0,
2822 can_events => 1,
2823 ellipsise => 1,
2824 label => "%d%%",
2825 %arg,
2826 );
2827
2828 $self->set_value ($arg{value} || -1);
2829
2830 $self
2831}
2832
2833sub set_label {
2834 my ($self, $label) = @_;
2835
2836 return if $self->{label} eq $label;
2837 $self->{label} = $label;
2838
2839 $self->dc::UI::Progress::set_value (0 + delete $self->{value});
2840}
2841
2842sub set_value {
2843 my ($self, $value) = @_;
2844
2845 if ($self->{value} ne $value) {
2846 $self->{value} = $value;
2847
2848 if ($value < 0) {
2849 $self->set_text ("-");
2850 } else {
2851 $self->set_text (sprintf $self->{label}, $value * 100);
2852 }
2853
2854 $self->update;
2855 }
2856}
2857
2858sub _draw {
2859 my ($self) = @_;
2860
2861 glEnable GL_BLEND;
2862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2863
2864 if ($self->{value} >= 0) {
2865 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2866
2867 glColor_premultiply @{$self->{bar}};
2868 glRect 2, 2, $s, $self->{h} - 2;
2869 glColor_premultiply @{$self->{bg}};
2870 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2871 }
2872
2873 glColor_premultiply @{$self->{outline}};
2874 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2875
2876 glDisable GL_BLEND;
2877
2878 {
2879 local $self->{bg}; # do not draw background
2880 $self->SUPER::_draw;
2881 }
2882}
2883
2884#############################################################################
2885
2886package dc::UI::ExperienceProgress;
2887
2888our @ISA = dc::UI::Progress::;
2889
2890sub new {
2891 my ($class, %arg) = @_;
2892
2893 my $self = $class->SUPER::new (
2894 tooltip => sub {
2895 my ($self) = @_;
2896
2897 sprintf "level %d\n%s points\n%s next level\n%s to go",
2898 $self->{lvl},
2899 ::formsep ($self->{exp}),
2900 ::formsep ($self->{nxt}),
2901 ::formsep ($self->{nxt} - $self->{exp}),
2902 },
2903 %arg
2904 );
2905
2906 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2907 if $::CONN;
2908
2909 $self
2910}
2911
2912sub DESTROY {
2913 my ($self) = @_;
2914
2915 delete $::CONN->{on_exp_update}{$self+0}
2916 if $::CONN;
2917
2918 $self->SUPER::DESTROY;
2919}
2920
2921sub set_value {
2922 my ($self, $lvl, $exp) = @_;
2923
2924 $self->{lvl} = $lvl;
2925 $self->{exp} = $exp;
2926
2927 my $v = -1;
2928
2929 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2930 my $l0 = $table->[$lvl - 1];
2931 my $l1 = $table->[$lvl];
2932
2933 $self->{nxt} = $l1;
2934
2935 $v = ($exp - $l0) / ($l1 - $l0);
2936 }
2937
2938 $self->SUPER::set_value ($v);
2939}
2940
2941#############################################################################
2942
2283package CFClient::UI::Gauge; 2943package dc::UI::Gauge;
2284 2944
2285our @ISA = CFClient::UI::VBox::; 2945our @ISA = dc::UI::VBox::;
2286 2946
2287sub new { 2947sub new {
2288 my ($class, %arg) = @_; 2948 my ($class, %arg) = @_;
2289 2949
2290 my $self = $class->SUPER::new ( 2950 my $self = $class->SUPER::new (
… …
2292 can_hover => 1, 2952 can_hover => 1,
2293 can_events => 1, 2953 can_events => 1,
2294 %arg, 2954 %arg,
2295 ); 2955 );
2296 2956
2297 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2957 $self->add ($self->{value} = new dc::UI::Label valign => +1, align => 0, template => "999");
2298 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2958 $self->add ($self->{gauge} = new dc::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2299 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2959 $self->add ($self->{max} = new dc::UI::Label valign => -1, align => 0, template => "999");
2300 2960
2301 $self 2961 $self
2302} 2962}
2303 2963
2304sub set_fontsize { 2964sub set_fontsize {
… …
2325 $self->{value}->set_text ($val); 2985 $self->{value}->set_text ($val);
2326} 2986}
2327 2987
2328############################################################################# 2988#############################################################################
2329 2989
2330package CFClient::UI::Slider; 2990package dc::UI::Slider;
2331 2991
2332use strict; 2992use strict;
2333 2993
2334use CFClient::OpenGL; 2994use dc::OpenGL;
2335 2995
2336our @ISA = CFClient::UI::DrawBG::; 2996our @ISA = dc::UI::DrawBG::;
2337 2997
2338my @tex = 2998my @tex =
2339 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2999 map { new_from_file dc::Texture dc::find_rcfile $_ }
2340 qw(s1_slider.png s1_slider_bg.png); 3000 qw(s1_slider.png s1_slider_bg.png);
2341 3001
2342sub new { 3002sub new {
2343 my $class = shift; 3003 my $class = shift;
2344 3004
… …
2412 3072
2413 $self->SUPER::invoke_button_down ($ev, $x, $y); 3073 $self->SUPER::invoke_button_down ($ev, $x, $y);
2414 3074
2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3075 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2416 3076
2417 $self->invoke_mouse_motion ($ev, $x, $y) 3077 $self->invoke_mouse_motion ($ev, $x, $y);
3078
3079 1
2418} 3080}
2419 3081
2420sub invoke_mouse_motion { 3082sub invoke_mouse_motion {
2421 my ($self, $ev, $x, $y) = @_; 3083 my ($self, $ev, $x, $y) = @_;
2422 3084
… …
2429 3091
2430 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3092 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2431 } else { 3093 } else {
2432 return 0; 3094 return 0;
2433 } 3095 }
3096
3097 1
3098}
3099
3100sub invoke_mouse_wheel {
3101 my ($self, $ev) = @_;
3102
3103 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3104
3105 my $pagepart = $ev->{mod} & dc::KMOD_SHIFT ? 1 : 0.2;
3106
3107 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2434 3108
2435 1 3109 1
2436} 3110}
2437 3111
2438sub update { 3112sub update {
… …
2489 glDisable GL_TEXTURE_2D; 3163 glDisable GL_TEXTURE_2D;
2490} 3164}
2491 3165
2492############################################################################# 3166#############################################################################
2493 3167
2494package CFClient::UI::ValSlider; 3168package dc::UI::ValSlider;
2495 3169
2496our @ISA = CFClient::UI::HBox::; 3170our @ISA = dc::UI::HBox::;
2497 3171
2498sub new { 3172sub new {
2499 my ($class, %arg) = @_; 3173 my ($class, %arg) = @_;
2500 3174
2501 my $range = delete $arg{range}; 3175 my $range = delete $arg{range};
2502 3176
2503 my $self = $class->SUPER::new ( 3177 my $self = $class->SUPER::new (
2504 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3178 slider => (new dc::UI::Slider expand => 1, range => $range),
2505 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3179 entry => (new dc::UI::Label text => "", template => delete $arg{template}),
2506 to_value => sub { shift }, 3180 to_value => sub { shift },
2507 from_value => sub { shift }, 3181 from_value => sub { shift },
2508 %arg, 3182 %arg,
2509 ); 3183 );
2510 3184
… …
2530sub set_range { shift->{slider}->set_range (@_) } 3204sub set_range { shift->{slider}->set_range (@_) }
2531sub set_value { shift->{slider}->set_value (@_) } 3205sub set_value { shift->{slider}->set_value (@_) }
2532 3206
2533############################################################################# 3207#############################################################################
2534 3208
2535package CFClient::UI::TextScroller; 3209package dc::UI::TextScroller;
2536 3210
2537our @ISA = CFClient::UI::HBox::; 3211our @ISA = dc::UI::HBox::;
2538 3212
2539use CFClient::OpenGL; 3213use dc::OpenGL;
2540 3214
2541sub new { 3215sub new {
2542 my $class = shift; 3216 my $class = shift;
2543 3217
2544 my $self = $class->SUPER::new ( 3218 my $self = $class->SUPER::new (
2545 fontsize => 1, 3219 fontsize => 1,
2546 can_events => 0, 3220 can_events => 1,
2547 indent => 0, 3221 indent => 0,
2548 #font => default_font 3222 #font => default_font
2549 @_, 3223 @_,
2550 3224
2551 layout => (new CFClient::Layout 1), 3225 layout => (new dc::Layout),
2552 par => [], 3226 par => [],
3227 max_par => 0,
2553 height => 0, 3228 height => 0,
2554 children => [ 3229 children => [
2555 (new CFClient::UI::Empty expand => 1), 3230 (new dc::UI::Empty expand => 1),
2556 (new CFClient::UI::Slider vertical => 1), 3231 (new dc::UI::Slider vertical => 1),
2557 ], 3232 ],
2558 ); 3233 );
2559 3234
2560 $self->{children}[1]->connect (changed => sub { $self->update }); 3235 $self->{children}[1]->connect (changed => sub { $self->update });
2561 3236
… …
2567 3242
2568 $self->{fontsize} = $fontsize; 3243 $self->{fontsize} = $fontsize;
2569 $self->reflow; 3244 $self->reflow;
2570} 3245}
2571 3246
2572sub visible_children { 3247sub size_request {
2573 my ($self) = @_; 3248 my ($self) = @_;
2574 3249
2575 @{$self->{children}}[0,1] 3250 my ($empty, $slider) = $self->visible_children;
3251
3252 local $self->{children} = [$empty, $slider];
3253 $self->SUPER::size_request
2576} 3254}
2577 3255
2578sub invoke_size_allocate { 3256sub invoke_size_allocate {
2579 my ($self, $w, $h) = @_; 3257 my ($self, $w, $h) = @_;
2580 3258
2581 my (undef, undef, @other) = @{ $self->{children} }; 3259 my ($empty, $slider, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other; 3260 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583 3261
2584 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3262 $self->{layout}->set_font ($self->{font}) if $self->{font};
2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586 $self->{layout}->set_width ($self->{children}[0]{w}); 3264 $self->{layout}->set_width ($empty->{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3265 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588 3266
2589 $self->reflow; 3267 $self->reflow;
2590 3268
3269 local $self->{children} = [$empty, $slider];
2591 $self->SUPER::invoke_size_allocate ($w, $h) 3270 $self->SUPER::invoke_size_allocate ($w, $h)
3271}
3272
3273sub invoke_mouse_wheel {
3274 my ($self, $ev) = @_;
3275
3276 return 0 unless $ev->{dy}; # only vertical movements
3277
3278 $self->{children}[1]->emit (mouse_wheel => $ev);
3279
3280 1
2592} 3281}
2593 3282
2594sub get_layout { 3283sub get_layout {
2595 my ($self, $para) = @_; 3284 my ($self, $para) = @_;
2596 3285
2597 my $layout = $self->{layout}; 3286 my $layout = $self->{layout};
2598 3287
2599 $layout->set_font ($self->{font}) if $self->{font}; 3288 $layout->set_font ($self->{font}) if $self->{font};
3289 $layout->set_foreground (@{$para->{fg}});
2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3290 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent}); 3291 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3292 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603 $layout->set_markup ($para->{markup}); 3293 $layout->set_markup ($para->{markup});
2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}}); 3294
3295 $layout->set_shapes (
3296 map
3297 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3298 @{$para->{widget}}
3299 );
2605 3300
2606 $layout 3301 $layout
2607} 3302}
2608 3303
2609sub reflow { 3304sub reflow {
… …
2616sub set_offset { 3311sub set_offset {
2617 my ($self, $offset) = @_; 3312 my ($self, $offset) = @_;
2618 3313
2619 # todo: base offset on lines or so, not on pixels 3314 # todo: base offset on lines or so, not on pixels
2620 $self->{children}[1]->set_value ($offset); 3315 $self->{children}[1]->set_value ($offset);
3316}
3317
3318sub current_paragraph {
3319 my ($self) = @_;
3320
3321 $self->{top_paragraph} - 1
3322}
3323
3324sub scroll_to {
3325 my ($self, $para) = @_;
3326
3327 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3328
3329 $self->{scroll_to} = $para;
3330 $self->update;
2621} 3331}
2622 3332
2623sub clear { 3333sub clear {
2624 my ($self) = @_; 3334 my ($self) = @_;
2625 3335
… …
2630 $self->{height} = 0; 3340 $self->{height} = 0;
2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3341 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2632} 3342}
2633 3343
2634sub add_paragraph { 3344sub add_paragraph {
2635 my ($self, $color, $para, $indent) = @_; 3345 my $self = shift;
2636 3346
2637 my ($text, @w) = ref $para ? @$para : $para; 3347 for my $para (@_) {
2638
2639 $para = { 3348 $para = {
3349 fg => [1, 1, 1, 1],
3350 indent => 0,
3351 markup => "",
3352 widget => [],
3353 ref $para ? %$para : (markup => $para),
2640 w => 1e10, 3354 w => 1e10,
2641 wrapped => 1, 3355 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2646 }; 3356 };
2647 3357
2648 $self->add (@w) if @w; 3358 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2649 push @{$self->{par}}, $para; 3359 push @{$self->{par}}, $para;
3360 }
3361
3362 if (my $max = $self->{max_par}) {
3363 shift @{$self->{par}} while @{$self->{par}} > $max;
3364 }
2650 3365
2651 $self->{need_reflow}++; 3366 $self->{need_reflow}++;
2652 $self->update; 3367 $self->update;
2653} 3368}
2654 3369
2655sub scroll_to_bottom { 3370sub scroll_to_bottom {
2656 my ($self) = @_; 3371 my ($self) = @_;
2657 3372
2658 $self->{scroll_to_bottom} = 1; 3373 $self->{scroll_to} = $#{$self->{par}};
2659 $self->update; 3374 $self->update;
2660} 3375}
2661 3376
3377sub force_uptodate {
3378 my ($self) = @_;
3379
3380 if (delete $self->{need_reflow}) {
3381 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3382
3383 my $height = 0;
3384
3385 for my $para (@{$self->{par}}) {
3386 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3387 my $layout = $self->get_layout ($para);
3388 my ($w, $h) = $layout->size;
3389
3390 $para->{w} = $w + $para->{indent};
3391 $para->{h} = $h;
3392 $para->{wrapped} = $layout->has_wrapped;
3393 }
3394
3395 $para->{y} = $height;
3396 $height += $para->{h};
3397 }
3398
3399 $self->{height} = $height;
3400 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3401
3402 delete $self->{texture};
3403 }
3404
3405 if (my $paridx = delete $self->{scroll_to}) {
3406 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3407 }
3408}
3409
2662sub update { 3410sub update {
2663 my ($self) = @_; 3411 my ($self) = @_;
2664 3412
2665 $self->SUPER::update; 3413 $self->SUPER::update;
2666 3414
2667 return unless $self->{h} > 0; 3415 return unless $self->{h} > 0;
2668 3416
2669 delete $self->{texture}; 3417 delete $self->{texture};
2670 3418
2671 $ROOT->on_post_alloc ($self => sub { 3419 $ROOT->on_post_alloc ($self => sub {
3420 $self->force_uptodate;
3421
2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3422 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2673 3423
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 { 3424 $self->{texture} ||= new_from_opengl dc::Texture $W, $H, sub {
2702 glClearColor 0, 0, 0, 0; 3425 glClearColor 0, 0, 0, 0;
2703 glClear GL_COLOR_BUFFER_BIT; 3426 glClear GL_COLOR_BUFFER_BIT;
2704 3427
3428 package dc::UI::Base;
3429 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3430 (0, 0, $self->{w}, $self->{h});
3431
3432 my $top = int $self->{children}[1]{range}[0];
3433
3434 my $paridx = 0;
3435 my $top_paragraph;
2705 my $top = int $self->{children}[1]{range}[0]; 3436 my $top = int $self->{children}[1]{range}[0];
2706 3437
2707 my $y0 = $top; 3438 my $y0 = $top;
2708 my $y1 = $top + $H; 3439 my $y1 = $top + $H;
2709 3440
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}}) { 3441 for my $para (@{$self->{par}}) {
2717 my $h = $para->{h}; 3442 my $h = $para->{h};
3443 my $y = $para->{y};
2718 3444
2719 if ($y0 < $y + $h && $y < $y1) { 3445 if ($y0 < $y + $h && $y < $y1) {
2720
2721 my $layout = $self->get_layout ($para); 3446 my $layout = $self->get_layout ($para);
2722 3447
2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725 glRasterPos $para->{indent}, $y - $y0; 3448 $layout->render ($para->{indent}, $y - $y0);
2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3449 $layout->draw;
2727 3450
2728 if (my @w = @{ $para->{widget} }) { 3451 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes; 3452 my @s = $layout->get_shapes;
2730 3453
2731 for (@w) { 3454 for (@w) {
… …
2737 $_->draw; 3460 $_->draw;
2738 } 3461 }
2739 } 3462 }
2740 } 3463 }
2741 3464
2742 $y += $h; 3465 $paridx++;
3466 $top_paragraph ||= $paridx if $y >= $top;
2743 } 3467 }
2744 3468
2745 glDisable GL_BLEND; 3469 $self->{top_paragraph} = $top_paragraph;
2746 }; 3470 };
2747 }); 3471 });
2748} 3472}
2749 3473
2750sub reconfigure { 3474sub reconfigure {
… …
2768 $self->{children}[1]->draw; 3492 $self->{children}[1]->draw;
2769} 3493}
2770 3494
2771############################################################################# 3495#############################################################################
2772 3496
2773package CFClient::UI::Animator; 3497package dc::UI::Animator;
2774 3498
2775use CFClient::OpenGL; 3499use dc::OpenGL;
2776 3500
2777our @ISA = CFClient::UI::Bin::; 3501our @ISA = dc::UI::Bin::;
2778 3502
2779sub moveto { 3503sub moveto {
2780 my ($self, $x, $y) = @_; 3504 my ($self, $x, $y) = @_;
2781 3505
2782 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3506 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2810 glPopMatrix; 3534 glPopMatrix;
2811} 3535}
2812 3536
2813############################################################################# 3537#############################################################################
2814 3538
2815package CFClient::UI::Flopper; 3539package dc::UI::Flopper;
2816 3540
2817our @ISA = CFClient::UI::Button::; 3541our @ISA = dc::UI::Button::;
2818 3542
2819sub new { 3543sub new {
2820 my $class = shift; 3544 my $class = shift;
2821 3545
2822 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
… …
2834 $self->{other}->toggle_visibility; 3558 $self->{other}->toggle_visibility;
2835} 3559}
2836 3560
2837############################################################################# 3561#############################################################################
2838 3562
2839package CFClient::UI::Tooltip; 3563package dc::UI::Tooltip;
2840 3564
2841our @ISA = CFClient::UI::Bin::; 3565our @ISA = dc::UI::Bin::;
2842 3566
2843use CFClient::OpenGL; 3567use dc::OpenGL;
2844 3568
2845sub new { 3569sub new {
2846 my $class = shift; 3570 my $class = shift;
2847 3571
2848 $class->SUPER::new ( 3572 $class->SUPER::new (
… …
2852} 3576}
2853 3577
2854sub set_tooltip_from { 3578sub set_tooltip_from {
2855 my ($self, $widget) = @_; 3579 my ($self, $widget) = @_;
2856 3580
2857 my $tooltip = $widget->{tooltip}; 3581 my $tip = $widget->{tooltip};
3582 $tip = $tip->($widget) if "CODE" eq ref $tip;
3583
3584 $tip = dc::Pod::section_label tooltip => $1
3585 if $tip =~ /^#(.*)$/;
2858 3586
2859 if ($ENV{CFPLUS_DEBUG} & 2) { 3587 if ($ENV{CFPLUS_DEBUG} & 2) {
2860 $tooltip .= "\n\n" . (ref $widget) . "\n" 3588 $tip .= "\n\n" . (ref $widget) . "\n"
2861 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3589 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2862 . "req $widget->{req_w} $widget->{req_h}\n" 3590 . "req $widget->{req_w} $widget->{req_h}\n"
2863 . "visible $widget->{visible}"; 3591 . "visible $widget->{visible}";
2864 } 3592 }
2865 3593
2866 $tooltip =~ s/^\n+//; 3594 $tip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//; 3595 $tip =~ s/\n+$//;
2868 3596
2869 $self->add (new CFClient::UI::Label 3597 $self->add (new dc::UI::Label
2870 markup => $tooltip, 3598 markup => $tip,
2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2872 fontsize => 0.8, 3600 fontsize => 0.8,
2873 fg => [0, 0, 0, 1], 3601 style => 1, # FLAG_INVERSE
2874 ellipsise => 0, 3602 ellipsise => 0,
2875 font => ($widget->{tooltip_font} || $::FONT_PROP), 3603 font => ($widget->{tooltip_font} || $::FONT_PROP),
2876 ); 3604 );
2877} 3605}
2878 3606
… …
2897 3625
2898 $self->{root}->on_post_alloc ("move_$self" => sub { 3626 $self->{root}->on_post_alloc ("move_$self" => sub {
2899 my $widget = $self->{owner} 3627 my $widget = $self->{owner}
2900 or return; 3628 or return;
2901 3629
3630 if ($widget->{visible}) {
2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3631 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903 3632
2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3633 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905 if $x + $self->{w} > $self->{root}{w}; 3634 if $x + $self->{w} > $self->{root}{w};
2906 3635
2907 $self->move_abs ($x, $y); 3636 $self->move_abs ($x, $y);
3637 } else {
3638 $self->hide;
3639 }
2908 }); 3640 });
2909} 3641}
2910 3642
2911sub _draw { 3643sub _draw {
2912 my ($self) = @_; 3644 my ($self) = @_;
2913 3645
2914 glTranslate 0.375, 0.375;
2915
2916 my ($w, $h) = @$self{qw(w h)}; 3646 my ($w, $h) = @$self{qw(w h)};
2917 3647
2918 glColor 1, 0.8, 0.4; 3648 glColor 1, 0.8, 0.4;
2919 glBegin GL_QUADS; 3649 glRect 0, 0, $w, $h;
2920 glVertex 0 , 0;
2921 glVertex 0 , $h;
2922 glVertex $w, $h;
2923 glVertex $w, 0;
2924 glEnd;
2925 3650
2926 glColor 0, 0, 0; 3651 glColor 0, 0, 0;
2927 glBegin GL_LINE_LOOP; 3652 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 3653
2934 glTranslate 2 - 0.375, 2 - 0.375; 3654 glTranslate 2, 2;
2935 3655
2936 $self->SUPER::_draw; 3656 $self->SUPER::_draw;
2937} 3657}
2938 3658
2939############################################################################# 3659#############################################################################
2940 3660
2941package CFClient::UI::Face; 3661package dc::UI::Face;
2942 3662
2943our @ISA = CFClient::UI::Base::; 3663our @ISA = dc::UI::DrawBG::;
2944 3664
2945use CFClient::OpenGL; 3665use dc::OpenGL;
2946 3666
2947sub new { 3667sub new {
2948 my $class = shift; 3668 my $class = shift;
2949 3669
2950 my $self = $class->SUPER::new ( 3670 my $self = $class->SUPER::new (
3671 size_w => 32,
3672 size_h => 8,
2951 aspect => 1, 3673 aspect => 1,
2952 can_events => 0, 3674 can_events => 0,
2953 @_, 3675 @_,
2954 ); 3676 );
2955 3677
2956 if ($self->{anim} && $self->{animspeed}) { 3678 if ($self->{anim} && $self->{animspeed}) {
2957 Scalar::Util::weaken (my $widget = $self); 3679 dc::weaken (my $widget = $self);
2958 3680
2959 $self->{timer} = Event->timer ( 3681 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2960 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3682 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2961 hard => 1, 3683 return unless $::CONN;
2962 interval => $self->{animspeed}, 3684
2963 cb => sub { 3685 my $w = $widget
3686 or return;
3687
2964 ++$widget->{frame}; 3688 ++$w->{frame};
3689 $w->update_face;
3690
3691 # somehow, $widget can go away
2965 $widget->update; 3692 $w->update;
2966 }, 3693 $w->update_timer;
2967 ); 3694 };
3695
3696 $self->update_face;
3697 $self->update_timer;
2968 } 3698 }
2969 3699
2970 $self 3700 $self
2971} 3701}
2972 3702
3703sub update_timer {
3704 my ($self) = @_;
3705
3706 return unless $self->{timer};
3707
3708 if ($self->{visible}) {
3709 $self->{timer}->start;
3710 } else {
3711 $self->{timer}->stop;
3712 }
3713}
3714
3715sub update_face {
3716 my ($self) = @_;
3717
3718 if ($::CONN) {
3719 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3720 if ($anim && @$anim) {
3721 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3722 delete $self->{face_change_cb};
3723
3724 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3725 unless ($tex->{name} || $tex->{loading}) {
3726 $tex->upload (sub { $self->reconfigure });
3727 }
3728 }
3729 }
3730 }
3731 }
3732}
3733
2973sub size_request { 3734sub size_request {
2974 (32, 8) 3735 my ($self) = @_;
3736
3737 if ($::CONN) {
3738 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3739 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3740 if ($tex->{name}) {
3741 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3742 } elsif (!$tex->{loading}) {
3743 $tex->upload (sub { $self->reconfigure });
3744 }
3745 }
3746
3747 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3748 }
3749 }
3750
3751 ($self->{size_w} || 8, $self->{size_h} || 8)
2975} 3752}
2976 3753
2977sub update { 3754sub update {
2978 my ($self) = @_; 3755 my ($self) = @_;
2979 3756
2980 return unless $self->{visible}; 3757 return unless $self->{visible};
2981 3758
2982 $self->SUPER::update; 3759 $self->SUPER::update;
2983} 3760}
2984 3761
3762sub invoke_visibility_change {
3763 my ($self) = @_;
3764
3765 $self->update_timer;
3766
3767 0
3768}
3769
2985sub _draw { 3770sub _draw {
2986 my ($self) = @_; 3771 my ($self) = @_;
2987 3772
2988 return unless $::CONN; 3773 $self->SUPER::_draw;
2989 3774
2990 my $face; 3775 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; 3776 glEnable GL_TEXTURE_2D;
3003 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3004 glColor 0, 0, 0, 1; 3778 glColor 0, 0, 0, 1;
3005 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3779 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3006 glDisable GL_TEXTURE_2D; 3780 glDisable GL_TEXTURE_2D;
… …
3008} 3782}
3009 3783
3010sub destroy { 3784sub destroy {
3011 my ($self) = @_; 3785 my ($self) = @_;
3012 3786
3013 $self->{timer}->cancel 3787 (delete $self->{timer})->cancel
3014 if $self->{timer}; 3788 if $self->{timer};
3015 3789
3016 $self->SUPER::destroy; 3790 $self->SUPER::destroy;
3017} 3791}
3018 3792
3019############################################################################# 3793#############################################################################
3020 3794
3021package CFClient::UI::Buttonbar; 3795package dc::UI::Buttonbar;
3022 3796
3023our @ISA = CFClient::UI::HBox::; 3797our @ISA = dc::UI::HBox::;
3024 3798
3025# TODO: should actualyl wrap buttons and other goodies. 3799# TODO: should actually wrap buttons and other goodies.
3026 3800
3027############################################################################# 3801#############################################################################
3028 3802
3029package CFClient::UI::Menu; 3803package dc::UI::Menu;
3030 3804
3031our @ISA = CFClient::UI::FancyFrame::; 3805our @ISA = dc::UI::Toplevel::;
3032 3806
3033use CFClient::OpenGL; 3807use dc::OpenGL;
3034 3808
3035sub new { 3809sub new {
3036 my $class = shift; 3810 my $class = shift;
3037 3811
3038 my $self = $class->SUPER::new ( 3812 my $self = $class->SUPER::new (
3039 items => [], 3813 items => [],
3040 z => 100, 3814 z => 100,
3041 @_, 3815 @_,
3042 ); 3816 );
3043 3817
3044 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3818 $self->add ($self->{vbox} = new dc::UI::VBox);
3045 3819
3046 for my $item (@{ $self->{items} }) { 3820 for my $item (@{ $self->{items} }) {
3047 my ($widget, $cb, $tooltip) = @$item; 3821 my ($widget, $cb, $tooltip) = @$item;
3048 3822
3049 # handle various types of items, only text for now 3823 # handle various types of items, only text for now
3050 if (!ref $widget) { 3824 if (!ref $widget) {
3051 $widget = new CFClient::UI::Label 3825 if ($widget =~ /\t/) {
3826 my ($left, $right) = split /\t/, $widget, 2;
3827
3828 $widget = new dc::UI::HBox
3052 can_hover => 1, 3829 can_hover => 1,
3053 can_events => 1, 3830 can_events => 1,
3831 tooltip => $tooltip,
3832 children => [
3833 (new dc::UI::Label markup => $left, expand => 1),
3834 (new dc::UI::Label markup => $right, align => +1),
3835 ],
3836 ;
3837
3838 } else {
3839 $widget = new dc::UI::Label
3840 can_hover => 1,
3841 can_events => 1,
3054 markup => $widget, 3842 markup => $widget,
3055 tooltip => $tooltip 3843 tooltip => $tooltip;
3844 }
3056 } 3845 }
3057 3846
3058 $self->{item}{$widget} = $item; 3847 $self->{item}{$widget} = $item;
3059 3848
3060 $self->{vbox}->add ($widget); 3849 $self->{vbox}->add ($widget);
… …
3103 1 3892 1
3104} 3893}
3105 3894
3106############################################################################# 3895#############################################################################
3107 3896
3108package CFClient::UI::Multiplexer; 3897package dc::UI::Multiplexer;
3109 3898
3110our @ISA = CFClient::UI::Container::; 3899our @ISA = dc::UI::Container::;
3111 3900
3112sub new { 3901sub new {
3113 my $class = shift; 3902 my $class = shift;
3114 3903
3115 my $self = $class->SUPER::new ( 3904 my $self = $class->SUPER::new (
… …
3129 3918
3130 $self->{current} = $self->{children}[0] 3919 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} }; 3920 if @{ $self->{children} };
3132} 3921}
3133 3922
3923sub get_current_page {
3924 my ($self) = @_;
3925
3926 $self->{current}
3927}
3928
3134sub set_current_page { 3929sub set_current_page {
3135 my ($self, $page_or_widget) = @_; 3930 my ($self, $page_or_widget) = @_;
3136 3931
3137 my $widget = ref $page_or_widget 3932 my $widget = ref $page_or_widget
3138 ? $page_or_widget 3933 ? $page_or_widget
… …
3170 $self->{current}->draw; 3965 $self->{current}->draw;
3171} 3966}
3172 3967
3173############################################################################# 3968#############################################################################
3174 3969
3175package CFClient::UI::Notebook; 3970package dc::UI::Notebook;
3176 3971
3972use dc::OpenGL;
3973
3177our @ISA = CFClient::UI::VBox::; 3974our @ISA = dc::UI::VBox::;
3178 3975
3179sub new { 3976sub new {
3180 my $class = shift; 3977 my $class = shift;
3181 3978
3182 my $self = $class->SUPER::new ( 3979 my $self = $class->SUPER::new (
3183 buttonbar => (new CFClient::UI::Buttonbar), 3980 buttonbar => (new dc::UI::Buttonbar),
3184 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3981 multiplexer => (new dc::UI::Multiplexer expand => 1),
3982 active_outline => [.7, .7, 0.2],
3185 # filter => # will be put between multiplexer and $self 3983 # filter => # will be put between multiplexer and $self
3186 @_, 3984 @_,
3187 ); 3985 );
3188 3986
3189 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3987 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3190 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3988 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3191 3989
3990 {
3991 Scalar::Util::weaken (my $wself = $self);
3992
3993 $self->{multiplexer}->connect (c_add => sub {
3994 my ($mplex, $widgets) = @_;
3995
3996 for my $child (@$widgets) {
3997 Scalar::Util::weaken $child;
3998 $child->{c_tab_} ||= do {
3999 my $tab =
4000 (UNIVERSAL::isa $child->{c_tab}, "dc::UI::Base")
4001 ? $child->{c_tab}
4002 : new dc::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4003
4004 $tab->connect (activate => sub {
4005 $wself->set_current_page ($child);
4006 });
4007
4008 $tab
4009 };
4010
4011 $self->{buttonbar}->add ($child->{c_tab_});
4012 }
4013 });
4014
4015 $self->{multiplexer}->connect (c_remove => sub {
4016 my ($mplex, $widgets) = @_;
4017
4018 for my $child (@$widgets) {
4019 $wself->{buttonbar}->remove ($child->{c_tab_});
4020 }
4021 });
4022 }
4023
3192 $self 4024 $self
3193} 4025}
3194 4026
3195sub add { 4027sub add {
4028 my ($self, @widgets) = @_;
4029
4030 $self->{multiplexer}->add (@widgets)
4031}
4032
4033sub remove {
4034 my ($self, @widgets) = @_;
4035
4036 $self->{multiplexer}->remove (@widgets)
4037}
4038
4039sub pages {
4040 my ($self) = @_;
4041 $self->{multiplexer}->children
4042}
4043
4044sub add_tab {
3196 my ($self, $title, $widget, $tooltip) = @_; 4045 my ($self, $title, $widget, $tooltip) = @_;
3197 4046
3198 Scalar::Util::weaken $self; 4047 $title = [$title, $tooltip] unless ref $title;
4048 $widget->{c_tab} = $title;
3199 4049
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); 4050 $self->add ($widget);
4051}
4052
4053sub get_current_page {
4054 my ($self) = @_;
4055
4056 $self->{multiplexer}->get_current_page
3207} 4057}
3208 4058
3209sub set_current_page { 4059sub set_current_page {
3210 my ($self, $page) = @_; 4060 my ($self, $page) = @_;
3211 4061
3212 $self->{multiplexer}->set_current_page ($page); 4062 $self->{multiplexer}->set_current_page ($page);
3213 $self->emit (page_changed => $self->{multiplexer}{current}); 4063 $self->emit (page_changed => $self->{multiplexer}{current});
3214} 4064}
3215 4065
4066sub _draw {
4067 my ($self) = @_;
4068
4069 $self->SUPER::_draw ();
4070
4071 if (my $cur = $self->{multiplexer}{current}) {
4072 if ($cur = $cur->{c_tab_}) {
4073 glTranslate $self->{buttonbar}{x} + $cur->{x},
4074 $self->{buttonbar}{y} + $cur->{y};
4075 glLineWidth 3;
4076 #glEnable GL_BLEND;
4077 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4078 glColor @{$self->{active_outline}};
4079 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4080 glLineWidth 1;
4081 #glDisable GL_BLEND;
4082 }
4083 }
4084}
4085
3216############################################################################# 4086#############################################################################
3217 4087
3218package CFClient::UI::Combobox; 4088package dc::UI::Selector;
3219 4089
3220use utf8; 4090use utf8;
3221 4091
3222our @ISA = CFClient::UI::Button::; 4092our @ISA = dc::UI::Button::;
3223 4093
3224sub new { 4094sub new {
3225 my $class = shift; 4095 my $class = shift;
3226 4096
3227 my $self = $class->SUPER::new ( 4097 my $self = $class->SUPER::new (
… …
3244 my ($value, $title, $tooltip) = @$_; 4114 my ($value, $title, $tooltip) = @$_;
3245 4115
3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4116 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247 } 4117 }
3248 4118
3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4119 dc::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250} 4120}
3251 4121
3252sub _set_value { 4122sub _set_value {
3253 my ($self, $value) = @_; 4123 my ($self, $value) = @_;
3254 4124
3255 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4125 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4126 $item ||= $self->{options}[0]
3256 or return; 4127 or return;
3257 4128
3258 $self->{value} = $item->[0]; 4129 $self->{value} = $item->[0];
3259 $self->set_markup ("$item->[1] ⇓"); 4130 $self->set_markup ("$item->[1] ⇓");
3260 $self->set_tooltip ($item->[2]); 4131# $self->set_tooltip ($item->[2]);
3261} 4132}
3262 4133
3263sub set_value { 4134sub set_value {
3264 my ($self, $value) = @_; 4135 my ($self, $value) = @_;
3265 4136
… …
3267 4138
3268 $self->_set_value ($value); 4139 $self->_set_value ($value);
3269 $self->emit (changed => $value); 4140 $self->emit (changed => $value);
3270} 4141}
3271 4142
4143sub set_options {
4144 my ($self, $options) = @_;
4145
4146 $self->{options} = $options;
4147 $self->_set_value ($self->{value});
4148}
4149
3272############################################################################# 4150#############################################################################
3273 4151
3274package CFClient::UI::Statusbox; 4152package dc::UI::Statusbox;
3275 4153
3276our @ISA = CFClient::UI::VBox::; 4154our @ISA = dc::UI::VBox::;
3277 4155
3278sub new { 4156sub new {
3279 my $class = shift; 4157 my $class = shift;
3280 4158
3281 my $self = $class->SUPER::new ( 4159 my $self = $class->SUPER::new (
3282 fontsize => 0.8, 4160 fontsize => 0.8,
3283 @_, 4161 @_,
3284 ); 4162 );
3285 4163
3286 Scalar::Util::weaken (my $this = $self); 4164 dc::weaken (my $this = $self);
3287 4165
3288 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4166 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3289 4167
3290 $self 4168 $self
3291} 4169}
3292 4170
3293sub reorder { 4171sub reorder {
3294 my ($self) = @_; 4172 my ($self) = @_;
3295 my $NOW = Time::HiRes::time; 4173 my $NOW = Time::HiRes::time;
3296 4174
3297 # freeze display when hovering over any label 4175 # freeze display when hovering over any label
3298 return if $CFClient::UI::TOOLTIP->{owner} 4176 return if $dc::UI::TOOLTIP->{owner}
3299 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4177 && grep $dc::UI::TOOLTIP->{owner} == $_->{label},
3300 values %{ $self->{item} }; 4178 values %{ $self->{item} };
3301 4179
3302 while (my ($k, $v) = each %{ $self->{item} }) { 4180 while (my ($k, $v) = each %{ $self->{item} }) {
3303 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4181 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3304 } 4182 }
4183
4184 $self->{timer}->set (1, 1);
3305 4185
3306 my @widgets; 4186 my @widgets;
3307 4187
3308 my @items = sort { 4188 my @items = sort {
3309 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
3310 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
3311 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
3312
3313 $self->{timer}->interval (1);
3314 4192
3315 my $count = 10 + 1; 4193 my $count = 10 + 1;
3316 for my $item (@items) { 4194 for my $item (@items) {
3317 last unless --$count; 4195 last unless --$count;
3318 4196
… …
3325 for ($short) { 4203 for ($short) {
3326 s/^\s+//; 4204 s/^\s+//;
3327 s/\s+/ /g; 4205 s/\s+/ /g;
3328 } 4206 }
3329 4207
3330 new CFClient::UI::Label 4208 new dc::UI::Label
3331 markup => $short, 4209 markup => $short,
3332 tooltip => $item->{tooltip}, 4210 tooltip => $item->{tooltip},
3333 tooltip_font => $::FONT_PROP, 4211 tooltip_font => $::FONT_PROP,
3334 tooltip_width => 0.67, 4212 tooltip_width => 0.67,
3335 fontsize => $item->{fontsize} || $self->{fontsize}, 4213 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3342 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3343 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3344 $label->update; 4222 $label->update;
3345 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
3346 if $diff < 1; 4224 if $diff < 1;
3347 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
3348 } else { 4226 } else {
3349 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
3350 } 4228 }
3351 4229
3352 push @widgets, $label; 4230 push @widgets, $label;
… …
3389 count => 1, 4267 count => 1,
3390 %arg, 4268 %arg,
3391 }; 4269 };
3392 } 4270 }
3393 4271
4272 $ROOT->on_refresh (reorder => sub {
3394 $self->reorder; 4273 $self->reorder;
4274 });
3395} 4275}
3396 4276
3397sub reconfigure { 4277sub reconfigure {
3398 my ($self) = @_; 4278 my ($self) = @_;
3399 4279
… …
3412 $self->SUPER::destroy; 4292 $self->SUPER::destroy;
3413} 4293}
3414 4294
3415############################################################################# 4295#############################################################################
3416 4296
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; 4297package dc::UI::Root;
3790 4298
3791our @ISA = CFClient::UI::Container::; 4299our @ISA = dc::UI::Container::;
3792 4300
3793use List::Util qw(min max); 4301use List::Util qw(min max);
3794 4302
3795use CFClient::OpenGL; 4303use dc::OpenGL;
3796 4304
3797sub new { 4305sub new {
3798 my $class = shift; 4306 my $class = shift;
3799 4307
3800 my $self = $class->SUPER::new ( 4308 my $self = $class->SUPER::new (
3801 visible => 1, 4309 visible => 1,
3802 @_, 4310 @_,
3803 ); 4311 );
3804 4312
3805 Scalar::Util::weaken ($self->{root} = $self); 4313 dc::weaken ($self->{root} = $self);
3806 4314
3807 $self 4315 $self
3808} 4316}
3809 4317
3810sub size_request { 4318sub size_request {
… …
3858} 4366}
3859 4367
3860sub update { 4368sub update {
3861 my ($self) = @_; 4369 my ($self) = @_;
3862 4370
3863 $::WANT_REFRESH++; 4371 $::WANT_REFRESH = 1;
3864} 4372}
3865 4373
3866sub add { 4374sub add {
3867 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
3868 4376
… …
3905 while ($self->{refresh_hook}) { 4413 while ($self->{refresh_hook}) {
3906 $_->() 4414 $_->()
3907 for values %{delete $self->{refresh_hook}}; 4415 for values %{delete $self->{refresh_hook}};
3908 } 4416 }
3909 4417
3910 if ($self->{realloc}) { 4418 while ($self->{realloc}) {
3911 my %queue; 4419 my %queue;
3912 my @queue; 4420 my @queue;
3913 my $widget; 4421 my $widget;
3914 4422
3915 outer: 4423 outer:
… …
3962 } 4470 }
3963 } 4471 }
3964 4472
3965 delete $self->{realloc}{$widget+0}; 4473 delete $self->{realloc}{$widget+0};
3966 } 4474 }
3967 }
3968 4475
3969 while (my $size_alloc = delete $self->{size_alloc}) { 4476 while (my $size_alloc = delete $self->{size_alloc}) {
3970 my @queue = sort { $b->{visible} <=> $a->{visible} } 4477 my @queue = sort { $a->{visible} <=> $b->{visible} }
3971 values %$size_alloc; 4478 values %$size_alloc;
3972 4479
3973 while () { 4480 while () {
3974 my $widget = pop @queue || last; 4481 my $widget = pop @queue || last;
3975 4482
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4483 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 4484
3978 $w = 0 if $w < 0; 4485 $w = max $widget->{min_w}, $w;
3979 $h = 0 if $h < 0; 4486 $h = max $widget->{min_h}, $h;
3980 4487
4488# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4489# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4490
4491 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4492 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4493
3981 $w = int $w + 0.5; 4494 $w = int $w + 0.5;
3982 $h = int $h + 0.5; 4495 $h = int $h + 0.5;
3983 4496
3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4497 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w}; 4498 $widget->{old_w} = $widget->{w};
3986 $widget->{old_h} = $widget->{h}; 4499 $widget->{old_h} = $widget->{h};
3987 4500
3988 $widget->{w} = $w; 4501 $widget->{w} = $w;
3989 $widget->{h} = $h; 4502 $widget->{h} = $h;
3990 4503
3991 $widget->emit (size_allocate => $w, $h); 4504 $widget->emit (size_allocate => $w, $h);
4505 }
3992 } 4506 }
3993 } 4507 }
3994 } 4508 }
3995 4509
3996 while ($self->{post_alloc_hook}) { 4510 while ($self->{post_alloc_hook}) {
3997 $_->() 4511 $_->()
3998 for values %{delete $self->{post_alloc_hook}}; 4512 for values %{delete $self->{post_alloc_hook}};
3999 } 4513 }
4000
4001 4514
4002 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4515 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4003 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4516 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4004 glClear GL_COLOR_BUFFER_BIT; 4517 glClear GL_COLOR_BUFFER_BIT;
4005 4518
… …
4008 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4521 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4009 glMatrixMode GL_MODELVIEW; 4522 glMatrixMode GL_MODELVIEW;
4010 glLoadIdentity; 4523 glLoadIdentity;
4011 4524
4012 { 4525 {
4013 package CFClient::UI::Base; 4526 package dc::UI::Base;
4014 4527
4015 ($draw_x, $draw_y, $draw_w, $draw_h) = 4528 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4016 (0, 0, $self->{w}, $self->{h}); 4529 (0, 0, $self->{w}, $self->{h});
4017 }
4018 4530
4019 $self->_draw; 4531 $self->_draw;
4532 }
4020} 4533}
4021 4534
4022############################################################################# 4535#############################################################################
4023 4536
4024package CFClient::UI; 4537package dc::UI;
4025 4538
4026$ROOT = new CFClient::UI::Root; 4539$ROOT = new dc::UI::Root;
4027$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4540$TOOLTIP = new dc::UI::Tooltip z => 900;
4028 4541
40291 45421
4030 4543

Diff Legend

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