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.313 by root, Sat Jun 24 00:24:09 2006 UTC vs.
Revision 1.456 by root, Fri Dec 28 11:44:02 2007 UTC

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

Diff Legend

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