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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.460 by elmex, Sun Jan 6 16:28:49 2008 UTC

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

Diff Legend

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