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

Diff Legend

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