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.315 by root, Wed Jun 28 21:17:01 2006 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 UTC

1package CFClient::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFClient; 8use DC;
9use DC::Pod;
11use CFClient::Texture; 10use DC::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 29 $TOOLTIP->hide;
28 30
29 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 33
31 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
32 35
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show; 37 $TOOLTIP->show;
39 } 38 }
40 39
41 return; 40 return;
42 } 41 }
43 } 42 }
44 } 43 }
45 44
46 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48}); 48};
49 49
50sub get_layout { 50sub get_layout {
51 my $layout; 51 my $layout;
52 52
53 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->again;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
90 105
91 $GRAB = $widget; 106 $GRAB = $widget;
92 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
93 108
94 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
95 } 110 }
96 111
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
98 117
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 118 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 119 $ev->{dy} = $shift ? 0 : $delta;
120
121 $GRAB->emit (mouse_wheel => $ev);
122 } else {
123 $GRAB->emit (button_down => $ev)
124 }
125 }
101} 126}
102 127
103sub feed_sdl_button_up_event { 128sub feed_sdl_button_up_event {
104 my ($ev) = @_; 129 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 130
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 131 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 132
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 133 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 134
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 135 $GRAB->emit (button_up => $ev)
112 if $GRAB; 136 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 137
114 if (!$BUTTON_STATE) { 138 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 140 $grab->update if $grab;
117 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
118 142
143 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
120 } 145 }
121} 146}
122 147
123sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
124 my ($ev) = @_; 149 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 150 my ($x, $y) = ($ev->{x}, $ev->{y});
126 151
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 152 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 153
129 if ($widget != $HOVER) { 154 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 155
132 $hover->update if $hover && $hover->{can_hover}; 156 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 157 if $HOVER;
140} 158}
141 159
142# convert position array to integers 160# convert position array to integers
143sub harmonize { 161sub harmonize {
… …
193 reconfigure_widgets; 211 reconfigure_widgets;
194} 212}
195 213
196############################################################################# 214#############################################################################
197 215
216package DC::UI::Event;
217
218sub xy {
219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
220}
221
222#############################################################################
223
198package CFClient::UI::Base; 224package DC::UI::Base;
199 225
200use strict; 226use strict;
201 227
202use CFClient::OpenGL; 228use DC::OpenGL;
203 229
204sub new { 230sub new {
205 my $class = shift; 231 my $class = shift;
206 232
207 my $self = bless { 233 my $self = bless {
… …
212 h => undef, 238 h => undef,
213 can_events => 1, 239 can_events => 1,
214 @_ 240 @_
215 }, $class; 241 }, $class;
216 242
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
218 244
219 for (keys %$self) { 245 for (keys %$self) {
220 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
222 } 248 }
223 } 249 }
224 250
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
230 256
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 259
234 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
239 265
240sub destroy { 266sub destroy {
241 my ($self) = @_; 267 my ($self) = @_;
242 268
243 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
244 %$self = (); 271 %$self = ();
245} 272}
246 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
247sub show { 278sub show {
248 my ($self) = @_; 279 my ($self) = @_;
249 280
250 return if $self->{parent}; 281 return if $self->{parent};
251 282
252 $CFClient::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
253} 284}
254 285
255sub set_visible { 286sub set_visible {
256 my ($self) = @_; 287 my ($self) = @_;
257 288
… …
278 delete $self->{root}; 309 delete $self->{root};
279 310
280 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
282 313
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
284 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
285 316
286 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
288} 319}
… …
290sub set_visibility { 321sub set_visibility {
291 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
292 323
293 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
294 325
295 $visible ? $self->hide 326 $visible ? $self->show
296 : $self->show; 327 : $self->hide;
297} 328}
298 329
299sub toggle_visibility { 330sub toggle_visibility {
300 my ($self) = @_; 331 my ($self) = @_;
301 332
… …
307sub hide { 338sub hide {
308 my ($self) = @_; 339 my ($self) = @_;
309 340
310 $self->set_invisible; 341 $self->set_invisible;
311 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
312 $self->{parent}->remove ($self) 346 $parent->remove ($self);
313 if $self->{parent}; 347 }
314} 348}
315 349
316sub move_abs { 350sub move_abs {
317 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
318 352
… …
330 $self->{force_h} = $h; 364 $self->{force_h} = $h;
331 365
332 $self->realloc; 366 $self->realloc;
333} 367}
334 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 my ($w, $h) = @$self{qw(max_w max_h)};
374
375 if ($w <= 0 || $h <= 0) {
376 my ($mw, $mh) = $self->{parent}
377 ? $self->{parent}->get_max_wh
378 : ($::WIDTH, $::HEIGHT);
379
380 $w = $mw if $w <= 0;
381 $h = $mh if $h <= 0;
382 }
383
384 ($w, $h)
385}
386
335sub size_request { 387sub size_request {
336 require Carp; 388 require Carp;
337 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
338} 390}
339 391
… …
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
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549 glPushMatrix;
550 glTranslate $self->{x}, $self->{y}, 0;
551
552 if ($self == $HOVER && $self->{can_hover}) {
553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554 glEnable GL_BLEND;
555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556 glBegin GL_QUADS;
557 glVertex 0 , 0;
558 glVertex $self->{w}, 0;
559 glVertex $self->{w}, $self->{h};
560 glVertex 0 , $self->{h};
561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
575 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 }
578
579 $self->_draw;
580 glPopMatrix;
581}
582 618
583sub _draw { 619sub _draw {
584 my ($self) = @_; 620 my ($self) = @_;
585 621
586 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
587} 623}
588 624
589sub DESTROY { 625sub DESTROY {
590 my ($self) = @_; 626 my ($self) = @_;
591 627
592 delete $WIDGET{$self+0}; 628 return if DC::in_destruct;
593 629
630 local $@;
594 eval { $self->destroy }; 631 eval { $self->destroy };
595 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};
596} 635}
597 636
598############################################################################# 637#############################################################################
599 638
600package CFClient::UI::DrawBG; 639package DC::UI::DrawBG;
601 640
602our @ISA = CFClient::UI::Base::; 641our @ISA = DC::UI::Base::;
603 642
604use strict; 643use strict;
605use CFClient::OpenGL; 644use DC::OpenGL;
606 645
607sub new { 646sub new {
608 my $class = shift; 647 my $class = shift;
609
610 # range [value, low, high, page]
611 648
612 $class->SUPER::new ( 649 $class->SUPER::new (
613 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
614 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
615 @_ 652 @_
… …
627 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
628 665
629 glEnable GL_BLEND; 666 glEnable GL_BLEND;
630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
631 glColor_premultiply @$color; 668 glColor_premultiply @$color;
632
633 glBegin GL_QUADS;
634 glVertex 0 , 0;
635 glVertex 0 , $h;
636 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
637 glVertex $w, 0;
638 glEnd;
639
640 glDisable GL_BLEND; 670 glDisable GL_BLEND;
641 } 671 }
642} 672}
643 673
644############################################################################# 674#############################################################################
645 675
646package CFClient::UI::Empty; 676package DC::UI::Empty;
647 677
648our @ISA = CFClient::UI::Base::; 678our @ISA = DC::UI::Base::;
649 679
650sub new { 680sub new {
651 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
653} 683}
… …
660 690
661sub draw { } 691sub draw { }
662 692
663############################################################################# 693#############################################################################
664 694
665package CFClient::UI::Container; 695package DC::UI::Container;
666 696
667our @ISA = CFClient::UI::Base::; 697our @ISA = DC::UI::Base::;
668 698
669sub new { 699sub new {
670 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
671 701
672 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
… …
676 can_events => 0, 706 can_events => 0,
677 %arg, 707 %arg,
678 ); 708 );
679 709
680 $self->add (@$children) 710 $self->add (@$children)
681 if $children; 711 if $children && @$children;
682 712
683 $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;
684} 722}
685 723
686sub add { 724sub add {
687 my ($self, @widgets) = @_; 725 my ($self, @widgets) = @_;
688 726
689 $_->set_parent ($self) 727 $_->set_parent ($self)
690 for @widgets; 728 for @widgets;
691 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
692 use sort 'stable'; 731 use sort 'stable';
693 732
694 $self->{children} = [ 733 $self->{children} = [
695 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
696 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
697 ]; 736 ];
698 737
699 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
700} 743}
701 744
702sub children { 745sub children {
703 @{ $_[0]{children} } 746 @{ $_[0]{children} }
704} 747}
705 748
706sub remove { 749sub remove {
707 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
708 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
709 delete $child->{parent}; 755 delete $child->{parent};
710 $child->hide; 756 $child->hide;
711
712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
713 759
714 $self->realloc; 760 $self->realloc;
715} 761}
716 762
717sub clear { 763sub clear {
718 my ($self) = @_; 764 my ($self) = @_;
719 765
720 my $children = delete $self->{children}; 766 my $children = $self->{children};
721 $self->{children} = []; 767 $self->{children} = [];
722 768
723 for (@$children) { 769 for (@$children) {
724 delete $_->{parent}; 770 delete $_->{parent};
725 $_->hide; 771 $_->hide;
… …
745} 791}
746 792
747sub _draw { 793sub _draw {
748 my ($self) = @_; 794 my ($self) = @_;
749 795
750 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
751} 797}
752 798
753############################################################################# 799#############################################################################
754 800
755package CFClient::UI::Bin; 801package DC::UI::Bin;
756 802
757our @ISA = CFClient::UI::Container::; 803our @ISA = DC::UI::Container::;
758 804
759sub new { 805sub new {
760 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
761 807
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
763 809
764 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
765} 811}
766 812
767sub add { 813sub add {
768 my ($self, $child) = @_; 814 my ($self, $child) = @_;
769 815
770 $self->SUPER::remove ($_) for @{ $self->{children} }; 816 $self->clear;
771 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
772} 818}
773 819
774sub remove { 820sub remove {
775 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
776 822
777 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
778 824
779 $self->{children} = [new CFClient::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
780 unless @{$self->{children}}; 826 unless @{$self->{children}};
781} 827}
782 828
783sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
784 830
… …
793 839
794 1 840 1
795} 841}
796 842
797############################################################################# 843#############################################################################
798
799# back-buffered drawing area 844# back-buffered drawing area
800 845
801package CFClient::UI::Window; 846package DC::UI::Window;
802 847
803our @ISA = CFClient::UI::Bin::; 848our @ISA = DC::UI::Bin::;
804 849
805use CFClient::OpenGL; 850use DC::OpenGL;
806 851
807sub new { 852sub new {
808 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
809 854
810 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
… …
832} 877}
833 878
834sub render_child { 879sub render_child {
835 my ($self) = @_; 880 my ($self) = @_;
836 881
837 $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 {
838 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
840 885
841 { 886 {
842 package CFClient::UI::Base; 887 package DC::UI::Base;
843 888
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
891
892 $self->_render;
846 } 893 }
847
848 $self->_render;
849 }; 894 };
850} 895}
851 896
852sub _draw { 897sub _draw {
853 my ($self) = @_; 898 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 899
857 my $tex = $self->{texture} 900 my $tex = $self->{texture}
858 or return; 901 or return;
859 902
860 glEnable GL_TEXTURE_2D; 903 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 904 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 905 glColor 0, 0, 0, 1;
863 906
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 907 $tex->draw_quad_alpha_premultiplied (0, 0);
865 908
866 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
867} 910}
868 911
869############################################################################# 912#############################################################################
870 913
871package CFClient::UI::ViewPort; 914package DC::UI::ViewPort;
872 915
916use List::Util qw(min max);
917
873our @ISA = CFClient::UI::Window::; 918our @ISA = DC::UI::Window::;
874 919
875sub new { 920sub new {
876 my $class = shift; 921 my $class = shift;
877 922
878 $class->SUPER::new ( 923 $class->SUPER::new (
… …
885sub size_request { 930sub size_request {
886 my ($self) = @_; 931 my ($self) = @_;
887 932
888 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 933 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889 934
890 $w = 10 if $self->{scroll_x}; 935 $w = 1 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y}; 936 $h = 1 if $self->{scroll_y};
892 937
893 ($w, $h) 938 ($w, $h)
894} 939}
895 940
896sub invoke_size_allocate { 941sub invoke_size_allocate {
… …
908} 953}
909 954
910sub set_offset { 955sub set_offset {
911 my ($self, $x, $y) = @_; 956 my ($self, $x, $y) = @_;
912 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}) {
913 $self->{view_x} = int $x; 962 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 963 $self->{view_y} = $y;
915 964
965 $self->emit (changed => $x, $y);
916 $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 }
917} 986}
918 987
919# 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
920sub coord2local { 989sub coord2local {
921 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
937 1006
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1009 ) {
941 $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})
942 } else { 1011 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
944 } 1013 }
945} 1014}
946 1015
947sub _render { 1016sub _render {
948 my ($self) = @_; 1017 my ($self) = @_;
949 1018
950 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};
951 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};
952 1021
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1023
955 $self->SUPER::_render; 1024 $self->SUPER::_render;
956} 1025}
957 1026
958############################################################################# 1027#############################################################################
959 1028
960package CFClient::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
961 1030
962our @ISA = CFClient::UI::HBox::; 1031our @ISA = DC::UI::Table::;
963 1032
964sub new { 1033sub new {
965 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
966 1035
967 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
968 1037
969 my $self; 1038 my $self;
970 1039
971 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,
972 vertical => 1, 1054 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1056 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1057 $self->{vpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1059 },
977 ; 1060 ;
978 1061
979 $self = $class->SUPER::new ( 1062 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1063 scroll_x => 0,
1064 scroll_y => 1,
1065 can_events => 1,
981 slider => $slider, 1066 hslider => $hslider,
1067 vslider => $vslider,
1068 col_expand => [1, 0],
1069 row_expand => [1, 0],
982 %arg, 1070 %arg,
983 ); 1071 );
984 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
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1094 $self->SUPER::add ($self->{vp});
1095
986 $self->add ($child) if $child; 1096 $self->add ($child) if $child;
987 1097
988 $self 1098 $self
989} 1099}
990
991#TODO# update range on size_allocate depending on child
992 1100
993sub add { 1101sub add {
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_slider { 1111sub update_slider {
1000 my ($self) = @_; 1112 my ($self) = @_;
1001 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});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1118 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003}
1004 1119
1005sub update { 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 {
1006 my ($self) = @_; 1142 my ($self, $ev) = @_;
1007 1143
1008 $self->SUPER::update; 1144 $self->grab_focus;
1009 1145
1010 $self->update_slider; 1146 my $ox = $self->{vp}{view_x};
1147 my $oy = $self->{vp}{view_y};
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
1011} 1198}
1012 1199
1013sub invoke_size_allocate { 1200sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1015 1202
1016 $self->update_slider; 1203 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1205}
1020 1206
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 => [0.6, 0.3, 0.1],
1262 border => 0.8,
1263 style => 'single',
1264 %arg,
1265 );
1266
1267 $self
1268}
1269
1270sub add {
1271 my ($self, @widgets) = @_;
1272
1273 $self->SUPER::add (@widgets);
1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1275}
1276
1277sub border {
1278 int $_[0]{border} * $::FONTSIZE
1279}
1280
1281sub size_request {
1282 my ($self) = @_;
1283
1284 ($self->{label_w}, undef) = $self->{label}->size_request
1285 if $self->{label};
1286
1287 my ($w, $h) = $self->SUPER::size_request;
1288
1289 (
1290 $w + $self->border * 2,
1291 $h + $self->border * 2,
1292 )
1293}
1294
1295sub invoke_size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 my $border = $self->border;
1299
1300 $w -= List::Util::max 0, $border * 2;
1301 $h -= List::Util::max 0, $border * 2;
1302
1303 if (my $label = $self->{label}) {
1304 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1305 $label->{h} = List::Util::min $h, $border;
1306 $label->invoke_size_allocate ($label->{w}, $label->{h});
1307 }
1308
1309 $self->child->configure ($border, $border, $w, $h);
1310
1311 1
1312}
1313
1314sub _draw {
1315 my ($self) = @_;
1316
1317 my $child = $self->{children}[0];
1318
1319 my $border = $self->border;
1320 my ($w, $h) = ($self->{w}, $self->{h});
1321
1322 $child->draw;
1323
1324 glColor @{$self->{fg}};
1325 glBegin GL_LINE_STRIP;
1326 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1327 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1329 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1330 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1331 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1332 glEnd;
1333
1334 if ($self->{label}) {
1335 glTranslate $border * 2, 0;
1336 $self->{label}->_draw;
1337 }
1338}
1339
1340#############################################################################
1341
1342package DC::UI::Toplevel;
1343
1344our @ISA = DC::UI::Bin::;
1345
1346use DC::OpenGL;
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 => [0.6, 0.3, 0.1],
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}};
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
… …
2578} 3272}
2579 3273
2580sub size_request { 3274sub size_request {
2581 my ($self) = @_; 3275 my ($self) = @_;
2582 3276
2583 my ($empty, $slider) = @{ $self->{children} }; 3277 my ($empty, $slider) = $self->visible_children;
2584 3278
2585 local $self->{children} = [$empty, $slider]; 3279 local $self->{children} = [$empty, $slider];
2586 $self->SUPER::size_request 3280 $self->SUPER::size_request
2587} 3281}
2588 3282
… …
2599 3293
2600 $self->reflow; 3294 $self->reflow;
2601 3295
2602 local $self->{children} = [$empty, $slider]; 3296 local $self->{children} = [$empty, $slider];
2603 $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
2604} 3308}
2605 3309
2606sub get_layout { 3310sub get_layout {
2607 my ($self, $para) = @_; 3311 my ($self, $para) = @_;
2608 3312
… …
2615 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3319 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2616 $layout->set_markup ($para->{markup}); 3320 $layout->set_markup ($para->{markup});
2617 3321
2618 $layout->set_shapes ( 3322 $layout->set_shapes (
2619 map 3323 map
2620 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3324 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2621 @{$para->{widget}} 3325 @{$para->{widget}}
2622 ); 3326 );
2623 3327
2624 $layout 3328 $layout
2625} 3329}
… …
2634sub set_offset { 3338sub set_offset {
2635 my ($self, $offset) = @_; 3339 my ($self, $offset) = @_;
2636 3340
2637 # todo: base offset on lines or so, not on pixels 3341 # todo: base offset on lines or so, not on pixels
2638 $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;
2639} 3358}
2640 3359
2641sub clear { 3360sub clear {
2642 my ($self) = @_; 3361 my ($self) = @_;
2643 3362
… …
2648 $self->{height} = 0; 3367 $self->{height} = 0;
2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3368 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650} 3369}
2651 3370
2652sub add_paragraph { 3371sub add_paragraph {
2653 my ($self, $color, $para, $indent) = @_; 3372 my $self = shift;
2654 3373
2655 my ($text, @w) = ref $para ? @$para : $para; 3374 for my $para (@_) {
2656
2657 $para = { 3375 $para = {
3376 fg => [1, 1, 1, 1],
3377 indent => 0,
3378 markup => "",
3379 widget => [],
3380 ref $para ? %$para : (markup => $para),
2658 w => 1e10, 3381 w => 1e10,
2659 wrapped => 1, 3382 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2664 }; 3383 };
2665 3384
2666 $self->add (@w) if @w; 3385 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667 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 }
2668 3392
2669 $self->{need_reflow}++; 3393 $self->{need_reflow}++;
2670 $self->update; 3394 $self->update;
2671} 3395}
2672 3396
2673sub scroll_to_bottom { 3397sub scroll_to_bottom {
2674 my ($self) = @_; 3398 my ($self) = @_;
2675 3399
2676 $self->{scroll_to_bottom} = 1; 3400 $self->{scroll_to} = $#{$self->{par}};
2677 $self->update; 3401 $self->update;
2678} 3402}
2679 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
2680sub update { 3437sub update {
2681 my ($self) = @_; 3438 my ($self) = @_;
2682 3439
2683 $self->SUPER::update; 3440 $self->SUPER::update;
2684 3441
2685 return unless $self->{h} > 0; 3442 return unless $self->{h} > 0;
2686 3443
2687 delete $self->{texture}; 3444 delete $self->{texture};
2688 3445
2689 $ROOT->on_post_alloc ($self => sub { 3446 $ROOT->on_post_alloc ($self => sub {
3447 $self->force_uptodate;
3448
2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3449 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2691 3450
2692 if (delete $self->{need_reflow}) {
2693 my $height = 0;
2694
2695 for my $para (@{$self->{par}}) {
2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2697 my $layout = $self->get_layout ($para);
2698 my ($w, $h) = $layout->size;
2699
2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2703 }
2704
2705 $height += $para->{h};
2706 }
2707
2708 $self->{height} = $height;
2709
2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2711
2712 delete $self->{texture};
2713 }
2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3451 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2720 glClearColor 0, 0, 0, 0; 3452 glClearColor 0, 0, 0, 0;
2721 glClear GL_COLOR_BUFFER_BIT; 3453 glClear GL_COLOR_BUFFER_BIT;
2722 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;
2723 my $top = int $self->{children}[1]{range}[0]; 3463 my $top = int $self->{children}[1]{range}[0];
2724 3464
2725 my $y0 = $top; 3465 my $y0 = $top;
2726 my $y1 = $top + $H; 3466 my $y1 = $top + $H;
2727 3467
2728 my $y = 0;
2729
2730 glEnable GL_BLEND;
2731 #TODO# not correct in windows where rgba is forced off
2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734 for my $para (@{$self->{par}}) { 3468 for my $para (@{$self->{par}}) {
2735 my $h = $para->{h}; 3469 my $h = $para->{h};
3470 my $y = $para->{y};
2736 3471
2737 if ($y0 < $y + $h && $y < $y1) { 3472 if ($y0 < $y + $h && $y < $y1) {
2738
2739 my $layout = $self->get_layout ($para); 3473 my $layout = $self->get_layout ($para);
2740 3474
2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743 glRasterPos $para->{indent}, $y - $y0; 3475 $layout->render ($para->{indent}, $y - $y0);
2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3476 $layout->draw;
2745 3477
2746 if (my @w = @{ $para->{widget} }) { 3478 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes; 3479 my @s = $layout->get_shapes;
2748 3480
2749 glDisable GL_BLEND;
2750 for (@w) { 3481 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, (); 3482 my ($dx, $dy) = splice @s, 0, 2, ();
2752 3483
2753 $_->{x} = $dx + $para->{indent}; 3484 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0; 3485 $_->{y} = $dy + $y - $y0;
2755 3486
2756 $_->draw; 3487 $_->draw;
2757 } 3488 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 } 3489 }
2761 } 3490 }
2762 3491
2763 $y += $h; 3492 $paridx++;
3493 $top_paragraph ||= $paridx if $y >= $top;
2764 } 3494 }
2765 3495
2766 glDisable GL_BLEND; 3496 $self->{top_paragraph} = $top_paragraph;
2767 }; 3497 };
2768 }); 3498 });
2769} 3499}
2770 3500
2771sub reconfigure { 3501sub reconfigure {
… …
2789 $self->{children}[1]->draw; 3519 $self->{children}[1]->draw;
2790} 3520}
2791 3521
2792############################################################################# 3522#############################################################################
2793 3523
2794package CFClient::UI::Animator; 3524package DC::UI::Animator;
2795 3525
2796use CFClient::OpenGL; 3526use DC::OpenGL;
2797 3527
2798our @ISA = CFClient::UI::Bin::; 3528our @ISA = DC::UI::Bin::;
2799 3529
2800sub moveto { 3530sub moveto {
2801 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
2802 3532
2803 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3533 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2831 glPopMatrix; 3561 glPopMatrix;
2832} 3562}
2833 3563
2834############################################################################# 3564#############################################################################
2835 3565
2836package CFClient::UI::Flopper; 3566package DC::UI::Flopper;
2837 3567
2838our @ISA = CFClient::UI::Button::; 3568our @ISA = DC::UI::Button::;
2839 3569
2840sub new { 3570sub new {
2841 my $class = shift; 3571 my $class = shift;
2842 3572
2843 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
… …
2855 $self->{other}->toggle_visibility; 3585 $self->{other}->toggle_visibility;
2856} 3586}
2857 3587
2858############################################################################# 3588#############################################################################
2859 3589
2860package CFClient::UI::Tooltip; 3590package DC::UI::Tooltip;
2861 3591
2862our @ISA = CFClient::UI::Bin::; 3592our @ISA = DC::UI::Bin::;
2863 3593
2864use CFClient::OpenGL; 3594use DC::OpenGL;
2865 3595
2866sub new { 3596sub new {
2867 my $class = shift; 3597 my $class = shift;
2868 3598
2869 $class->SUPER::new ( 3599 $class->SUPER::new (
… …
2873} 3603}
2874 3604
2875sub set_tooltip_from { 3605sub set_tooltip_from {
2876 my ($self, $widget) = @_; 3606 my ($self, $widget) = @_;
2877 3607
2878 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 =~ /^#(.*)$/;
2879 3613
2880 if ($ENV{CFPLUS_DEBUG} & 2) { 3614 if ($ENV{CFPLUS_DEBUG} & 2) {
2881 $tooltip .= "\n\n" . (ref $widget) . "\n" 3615 $tip .= "\n\n" . (ref $widget) . "\n"
2882 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3616 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2883 . "req $widget->{req_w} $widget->{req_h}\n" 3617 . "req $widget->{req_w} $widget->{req_h}\n"
2884 . "visible $widget->{visible}"; 3618 . "visible $widget->{visible}";
2885 } 3619 }
2886 3620
2887 $tooltip =~ s/^\n+//; 3621 $tip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//; 3622 $tip =~ s/\n+$//;
2889 3623
2890 $self->add (new CFClient::UI::Label 3624 $self->add (new DC::UI::Label
2891 markup => $tooltip, 3625 markup => $tip,
2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3627 align => 0,
2893 fontsize => 0.8, 3628 fontsize => 0.8,
2894 fg => [0, 0, 0, 1], 3629 style => 1, # FLAG_INVERSE
2895 ellipsise => 0, 3630 ellipsise => 0,
2896 font => ($widget->{tooltip_font} || $::FONT_PROP), 3631 font => ($widget->{tooltip_font} || $::FONT_PROP),
2897 ); 3632 );
2898} 3633}
2899 3634
… …
2918 3653
2919 $self->{root}->on_post_alloc ("move_$self" => sub { 3654 $self->{root}->on_post_alloc ("move_$self" => sub {
2920 my $widget = $self->{owner} 3655 my $widget = $self->{owner}
2921 or return; 3656 or return;
2922 3657
3658 if ($widget->{visible}) {
2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924 3660
2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926 if $x + $self->{w} > $self->{root}{w}; 3662 if $x + $self->{w} > $self->{root}{w};
2927 3663
2928 $self->move_abs ($x, $y); 3664 $self->move_abs ($x, $y);
3665 } else {
3666 $self->hide;
3667 }
2929 }); 3668 });
2930} 3669}
2931 3670
2932sub _draw { 3671sub _draw {
2933 my ($self) = @_; 3672 my ($self) = @_;
2934 3673
2935 glTranslate 0.375, 0.375;
2936
2937 my ($w, $h) = @$self{qw(w h)}; 3674 my ($w, $h) = @$self{qw(w h)};
2938 3675
2939 glColor 1, 0.8, 0.4; 3676 glColor 1, 0.8, 0.4;
2940 glBegin GL_QUADS; 3677 glRect 0, 0, $w, $h;
2941 glVertex 0 , 0;
2942 glVertex 0 , $h;
2943 glVertex $w, $h;
2944 glVertex $w, 0;
2945 glEnd;
2946 3678
2947 glColor 0, 0, 0; 3679 glColor 0, 0, 0;
2948 glBegin GL_LINE_LOOP; 3680 glRect_lineloop .5, .5, $w + .5, $h + .5;
2949 glVertex 0 , 0;
2950 glVertex 0 , $h;
2951 glVertex $w, $h;
2952 glVertex $w, 0;
2953 glEnd;
2954 3681
2955 glTranslate 2 - 0.375, 2 - 0.375; 3682 glTranslate 2, 2;
2956 3683
2957 $self->SUPER::_draw; 3684 $self->SUPER::_draw;
2958} 3685}
2959 3686
2960############################################################################# 3687#############################################################################
2961 3688
2962package CFClient::UI::Face; 3689package DC::UI::Face;
2963 3690
2964our @ISA = CFClient::UI::Base::; 3691our @ISA = DC::UI::DrawBG::;
2965 3692
2966use CFClient::OpenGL; 3693use DC::OpenGL;
2967 3694
2968sub new { 3695sub new {
2969 my $class = shift; 3696 my $class = shift;
2970 3697
2971 my $self = $class->SUPER::new ( 3698 my $self = $class->SUPER::new (
3699 size_w => 32,
3700 size_h => 8,
2972 aspect => 1, 3701 aspect => 1,
2973 can_events => 0, 3702 can_events => 0,
2974 @_, 3703 @_,
2975 ); 3704 );
2976 3705
2977 if ($self->{anim} && $self->{animspeed}) { 3706 if ($self->{anim} && $self->{animspeed}) {
2978 Scalar::Util::weaken (my $widget = $self); 3707 DC::weaken (my $widget = $self);
2979 3708
2980 $self->{timer} = Event->timer ( 3709 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2981 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3710 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2982 hard => 1, 3711 return unless $::CONN;
2983 interval => $self->{animspeed}, 3712
2984 cb => sub { 3713 my $w = $widget
3714 or return;
3715
2985 ++$widget->{frame}; 3716 ++$w->{frame};
3717 $w->update_face;
3718
3719 # somehow, $widget can go away
2986 $widget->update; 3720 $w->update;
2987 }, 3721 $w->update_timer;
2988 ); 3722 };
3723
3724 $self->update_face;
3725 $self->update_timer;
2989 } 3726 }
2990 3727
2991 $self 3728 $self
2992} 3729}
2993 3730
3731sub update_timer {
3732 my ($self) = @_;
3733
3734 return unless $self->{timer};
3735
3736 if ($self->{visible}) {
3737 $self->{timer}->start;
3738 } else {
3739 $self->{timer}->stop;
3740 }
3741}
3742
3743sub update_face {
3744 my ($self) = @_;
3745
3746 if ($::CONN) {
3747 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3748 if ($anim && @$anim) {
3749 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3750 delete $self->{face_change_cb};
3751
3752 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3753 unless ($tex->{name} || $tex->{loading}) {
3754 $tex->upload (sub { $self->reconfigure });
3755 }
3756 }
3757 }
3758 }
3759 }
3760}
3761
2994sub size_request { 3762sub size_request {
2995 (32, 8) 3763 my ($self) = @_;
3764
3765 if ($::CONN) {
3766 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3767 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3768 if ($tex->{name}) {
3769 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3770 } elsif (!$tex->{loading}) {
3771 $tex->upload (sub { $self->reconfigure });
3772 }
3773 }
3774
3775 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3776 }
3777 }
3778
3779 ($self->{size_w} || 8, $self->{size_h} || 8)
2996} 3780}
2997 3781
2998sub update { 3782sub update {
2999 my ($self) = @_; 3783 my ($self) = @_;
3000 3784
3001 return unless $self->{visible}; 3785 return unless $self->{visible};
3002 3786
3003 $self->SUPER::update; 3787 $self->SUPER::update;
3004} 3788}
3005 3789
3790sub invoke_visibility_change {
3791 my ($self) = @_;
3792
3793 $self->update_timer;
3794
3795 0
3796}
3797
3006sub _draw { 3798sub _draw {
3007 my ($self) = @_; 3799 my ($self) = @_;
3008 3800
3009 return unless $::CONN; 3801 $self->SUPER::_draw;
3010 3802
3011 my $face; 3803 if (my $tex = $self->{tex}) {
3012
3013 if ($self->{frame}) {
3014 my $anim = $::CONN->{anim}[$self->{anim}];
3015
3016 $face = $anim->[ $self->{frame} % @$anim ]
3017 if $anim && @$anim;
3018 }
3019
3020 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3021
3022 if ($tex) {
3023 glEnable GL_TEXTURE_2D; 3804 glEnable GL_TEXTURE_2D;
3024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3805 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3025 glColor 0, 0, 0, 1; 3806 glColor 0, 0, 0, 1;
3026 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3807 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3027 glDisable GL_TEXTURE_2D; 3808 glDisable GL_TEXTURE_2D;
… …
3029} 3810}
3030 3811
3031sub destroy { 3812sub destroy {
3032 my ($self) = @_; 3813 my ($self) = @_;
3033 3814
3034 $self->{timer}->cancel 3815 (delete $self->{timer})->cancel
3035 if $self->{timer}; 3816 if $self->{timer};
3036 3817
3037 $self->SUPER::destroy; 3818 $self->SUPER::destroy;
3038} 3819}
3039 3820
3040############################################################################# 3821#############################################################################
3041 3822
3042package CFClient::UI::Buttonbar; 3823package DC::UI::Buttonbar;
3043 3824
3044our @ISA = CFClient::UI::HBox::; 3825our @ISA = DC::UI::HBox::;
3045 3826
3046# TODO: should actualyl wrap buttons and other goodies. 3827# TODO: should actually wrap buttons and other goodies.
3047 3828
3048############################################################################# 3829#############################################################################
3049 3830
3050package CFClient::UI::Menu; 3831package DC::UI::Menu;
3051 3832
3052our @ISA = CFClient::UI::FancyFrame::; 3833our @ISA = DC::UI::Toplevel::;
3053 3834
3054use CFClient::OpenGL; 3835use DC::OpenGL;
3055 3836
3056sub new { 3837sub new {
3057 my $class = shift; 3838 my $class = shift;
3058 3839
3059 my $self = $class->SUPER::new ( 3840 my $self = $class->SUPER::new (
3060 items => [], 3841 items => [],
3061 z => 100, 3842 z => 100,
3062 @_, 3843 @_,
3063 ); 3844 );
3064 3845
3065 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3846 $self->add ($self->{vbox} = new DC::UI::VBox);
3066 3847
3067 for my $item (@{ $self->{items} }) { 3848 for my $item (@{ $self->{items} }) {
3068 my ($widget, $cb, $tooltip) = @$item; 3849 my ($widget, $cb, $tooltip) = @$item;
3069 3850
3070 # handle various types of items, only text for now 3851 # handle various types of items, only text for now
3071 if (!ref $widget) { 3852 if (!ref $widget) {
3853 if ($widget =~ /\t/) {
3854 my ($left, $right) = split /\t/, $widget, 2;
3855
3072 $widget = new CFClient::UI::Label 3856 $widget = new DC::UI::HBox
3073 can_hover => 1, 3857 can_hover => 1,
3074 can_events => 1, 3858 can_events => 1,
3859 tooltip => $tooltip,
3860 children => [
3861 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3862 (new DC::UI::Label markup => $right, align => 1),
3863 ],
3864 ;
3865
3866 } else {
3867 $widget = new DC::UI::Label
3868 can_hover => 1,
3869 can_events => 1,
3870 align => 0,
3075 markup => $widget, 3871 markup => $widget,
3076 tooltip => $tooltip 3872 tooltip => $tooltip;
3873 }
3077 } 3874 }
3078 3875
3079 $self->{item}{$widget} = $item; 3876 $self->{item}{$widget} = $item;
3080 3877
3081 $self->{vbox}->add ($widget); 3878 $self->{vbox}->add ($widget);
… …
3124 1 3921 1
3125} 3922}
3126 3923
3127############################################################################# 3924#############################################################################
3128 3925
3129package CFClient::UI::Multiplexer; 3926package DC::UI::Multiplexer;
3130 3927
3131our @ISA = CFClient::UI::Container::; 3928our @ISA = DC::UI::Container::;
3132 3929
3133sub new { 3930sub new {
3134 my $class = shift; 3931 my $class = shift;
3135 3932
3136 my $self = $class->SUPER::new ( 3933 my $self = $class->SUPER::new (
… …
3150 3947
3151 $self->{current} = $self->{children}[0] 3948 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} }; 3949 if @{ $self->{children} };
3153} 3950}
3154 3951
3952sub get_current_page {
3953 my ($self) = @_;
3954
3955 $self->{current}
3956}
3957
3155sub set_current_page { 3958sub set_current_page {
3156 my ($self, $page_or_widget) = @_; 3959 my ($self, $page_or_widget) = @_;
3157 3960
3158 my $widget = ref $page_or_widget 3961 my $widget = ref $page_or_widget
3159 ? $page_or_widget 3962 ? $page_or_widget
… …
3191 $self->{current}->draw; 3994 $self->{current}->draw;
3192} 3995}
3193 3996
3194############################################################################# 3997#############################################################################
3195 3998
3196package CFClient::UI::Notebook; 3999package DC::UI::Notebook;
3197 4000
4001use DC::OpenGL;
4002
3198our @ISA = CFClient::UI::VBox::; 4003our @ISA = DC::UI::VBox::;
3199 4004
3200sub new { 4005sub new {
3201 my $class = shift; 4006 my $class = shift;
3202 4007
3203 my $self = $class->SUPER::new ( 4008 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar), 4009 buttonbar => (new DC::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 4010 multiplexer => (new DC::UI::Multiplexer expand => 1),
4011 active_outline => [.7, .7, 0.2],
3206 # filter => # will be put between multiplexer and $self 4012 # filter => # will be put between multiplexer and $self
3207 @_, 4013 @_,
3208 ); 4014 );
3209 4015
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4016 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3211 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4017 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3212 4018
4019 {
4020 Scalar::Util::weaken (my $wself = $self);
4021
4022 $self->{multiplexer}->connect (c_add => sub {
4023 my ($mplex, $widgets) = @_;
4024
4025 for my $child (@$widgets) {
4026 Scalar::Util::weaken $child;
4027 $child->{c_tab_} ||= do {
4028 my $tab =
4029 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4030 ? $child->{c_tab}
4031 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4032
4033 $tab->connect (activate => sub {
4034 $wself->set_current_page ($child);
4035 });
4036
4037 $tab
4038 };
4039
4040 $self->{buttonbar}->add ($child->{c_tab_});
4041 }
4042 });
4043
4044 $self->{multiplexer}->connect (c_remove => sub {
4045 my ($mplex, $widgets) = @_;
4046
4047 for my $child (@$widgets) {
4048 $wself->{buttonbar}->remove ($child->{c_tab_});
4049 }
4050 });
4051 }
4052
3213 $self 4053 $self
3214} 4054}
3215 4055
3216sub add { 4056sub add {
4057 my ($self, @widgets) = @_;
4058
4059 $self->{multiplexer}->add (@widgets)
4060}
4061
4062sub remove {
4063 my ($self, @widgets) = @_;
4064
4065 $self->{multiplexer}->remove (@widgets)
4066}
4067
4068sub pages {
4069 my ($self) = @_;
4070 $self->{multiplexer}->children
4071}
4072
4073sub page_index {
4074 my ($self, $widget) = @_;
4075
4076 my $i = 0;
4077 for ($self->pages) {
4078 if ($_ eq $widget) { return $i };
4079 $i++;
4080 }
4081
4082 undef
4083}
4084
4085sub add_tab {
3217 my ($self, $title, $widget, $tooltip) = @_; 4086 my ($self, $title, $widget, $tooltip) = @_;
3218 4087
3219 Scalar::Util::weaken $self; 4088 $title = [$title, $tooltip] unless ref $title;
4089 $widget->{c_tab} = $title;
3220 4090
3221 $self->{buttonbar}->add (new CFClient::UI::Button
3222 markup => $title,
3223 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) },
3225 );
3226
3227 $self->{multiplexer}->add ($widget); 4091 $self->add ($widget);
4092}
4093
4094sub get_current_page {
4095 my ($self) = @_;
4096
4097 $self->{multiplexer}->get_current_page
3228} 4098}
3229 4099
3230sub set_current_page { 4100sub set_current_page {
3231 my ($self, $page) = @_; 4101 my ($self, $page) = @_;
3232 4102
3233 $self->{multiplexer}->set_current_page ($page); 4103 $self->{multiplexer}->set_current_page ($page);
3234 $self->emit (page_changed => $self->{multiplexer}{current}); 4104 $self->emit (page_changed => $self->{multiplexer}{current});
3235} 4105}
3236 4106
4107sub _draw {
4108 my ($self) = @_;
4109
4110 $self->SUPER::_draw ();
4111
4112 if (my $cur = $self->{multiplexer}{current}) {
4113 if ($cur = $cur->{c_tab_}) {
4114 glTranslate $self->{buttonbar}{x} + $cur->{x},
4115 $self->{buttonbar}{y} + $cur->{y};
4116 glLineWidth 3;
4117 #glEnable GL_BLEND;
4118 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4119 glColor @{$self->{active_outline}};
4120 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4121 glLineWidth 1;
4122 #glDisable GL_BLEND;
4123 }
4124 }
4125}
4126
3237############################################################################# 4127#############################################################################
3238 4128
3239package CFClient::UI::Combobox; 4129package DC::UI::Selector;
3240 4130
3241use utf8; 4131use utf8;
3242 4132
3243our @ISA = CFClient::UI::Button::; 4133our @ISA = DC::UI::Button::;
3244 4134
3245sub new { 4135sub new {
3246 my $class = shift; 4136 my $class = shift;
3247 4137
3248 my $self = $class->SUPER::new ( 4138 my $self = $class->SUPER::new (
… …
3265 my ($value, $title, $tooltip) = @$_; 4155 my ($value, $title, $tooltip) = @$_;
3266 4156
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4157 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 } 4158 }
3269 4159
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4160 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271} 4161}
3272 4162
3273sub _set_value { 4163sub _set_value {
3274 my ($self, $value) = @_; 4164 my ($self, $value) = @_;
3275 4165
3276 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4166 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4167 $item ||= $self->{options}[0]
3277 or return; 4168 or return;
3278 4169
3279 $self->{value} = $item->[0]; 4170 $self->{value} = $item->[0];
3280 $self->set_markup ("$item->[1] ⇓"); 4171 $self->set_markup ("$item->[1] ⇓");
3281 $self->set_tooltip ($item->[2]); 4172# $self->set_tooltip ($item->[2]);
3282} 4173}
3283 4174
3284sub set_value { 4175sub set_value {
3285 my ($self, $value) = @_; 4176 my ($self, $value) = @_;
3286 4177
… …
3288 4179
3289 $self->_set_value ($value); 4180 $self->_set_value ($value);
3290 $self->emit (changed => $value); 4181 $self->emit (changed => $value);
3291} 4182}
3292 4183
4184sub set_options {
4185 my ($self, $options) = @_;
4186
4187 $self->{options} = $options;
4188 $self->_set_value ($self->{value});
4189}
4190
3293############################################################################# 4191#############################################################################
3294 4192
3295package CFClient::UI::Statusbox; 4193package DC::UI::Statusbox;
3296 4194
3297our @ISA = CFClient::UI::VBox::; 4195our @ISA = DC::UI::VBox::;
3298 4196
3299sub new { 4197sub new {
3300 my $class = shift; 4198 my $class = shift;
3301 4199
3302 my $self = $class->SUPER::new ( 4200 my $self = $class->SUPER::new (
3303 fontsize => 0.8, 4201 fontsize => 0.8,
3304 @_, 4202 @_,
3305 ); 4203 );
3306 4204
3307 Scalar::Util::weaken (my $this = $self); 4205 DC::weaken (my $this = $self);
3308 4206
3309 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4207 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3310 4208
3311 $self 4209 $self
3312} 4210}
3313 4211
3314sub reorder { 4212sub reorder {
3315 my ($self) = @_; 4213 my ($self) = @_;
3316 my $NOW = Time::HiRes::time; 4214 my $NOW = Time::HiRes::time;
3317 4215
3318 # freeze display when hovering over any label 4216 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner} 4217 return if $DC::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4218 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} }; 4219 values %{ $self->{item} };
3322 4220
3323 while (my ($k, $v) = each %{ $self->{item} }) { 4221 while (my ($k, $v) = each %{ $self->{item} }) {
3324 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4222 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325 } 4223 }
4224
4225 $self->{timer}->set (1, 1);
3326 4226
3327 my @widgets; 4227 my @widgets;
3328 4228
3329 my @items = sort { 4229 my @items = sort {
3330 $a->{pri} <=> $b->{pri} 4230 $a->{pri} <=> $b->{pri}
3331 or $b->{id} <=> $a->{id} 4231 or $b->{id} <=> $a->{id}
3332 } values %{ $self->{item} }; 4232 } values %{ $self->{item} };
3333
3334 $self->{timer}->interval (1);
3335 4233
3336 my $count = 10 + 1; 4234 my $count = 10 + 1;
3337 for my $item (@items) { 4235 for my $item (@items) {
3338 last unless --$count; 4236 last unless --$count;
3339 4237
… …
3346 for ($short) { 4244 for ($short) {
3347 s/^\s+//; 4245 s/^\s+//;
3348 s/\s+/ /g; 4246 s/\s+/ /g;
3349 } 4247 }
3350 4248
3351 new CFClient::UI::Label 4249 new DC::UI::Label
3352 markup => $short, 4250 markup => $short,
3353 tooltip => $item->{tooltip}, 4251 tooltip => $item->{tooltip},
3354 tooltip_font => $::FONT_PROP, 4252 tooltip_font => $::FONT_PROP,
3355 tooltip_width => 0.67, 4253 tooltip_width => 0.67,
3356 fontsize => $item->{fontsize} || $self->{fontsize}, 4254 fontsize => $item->{fontsize} || $self->{fontsize},
3357 max_w => $::WIDTH * 0.44, 4255 max_w => $::WIDTH * 0.44,
4256 align => 0,
3358 fg => [@{ $item->{fg} }], 4257 fg => [@{ $item->{fg} }],
3359 can_events => 1, 4258 can_events => 1,
3360 can_hover => 1 4259 can_hover => 1
3361 }; 4260 };
3362 4261
3363 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4262 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3364 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4263 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3365 $label->update; 4264 $label->update;
3366 $label->set_max_size (undef, $label->{req_h} * $diff) 4265 $label->set_max_size (undef, $label->{req_h} * $diff)
3367 if $diff < 1; 4266 if $diff < 1;
3368 $self->{timer}->interval (1/30); 4267 $self->{timer}->set (1/30, 1/30);
3369 } else { 4268 } else {
3370 $label->{fg}[3] = $item->{fg}[3] || 1; 4269 $label->{fg}[3] = $item->{fg}[3] || 1;
3371 } 4270 }
3372 4271
3373 push @widgets, $label; 4272 push @widgets, $label;
… …
3435 $self->SUPER::destroy; 4334 $self->SUPER::destroy;
3436} 4335}
3437 4336
3438############################################################################# 4337#############################################################################
3439 4338
3440package CFClient::UI::Inventory;
3441
3442our @ISA = CFClient::UI::ScrolledWindow::;
3443
3444sub new {
3445 my $class = shift;
3446
3447 my $self = $class->SUPER::new (
3448 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3449 @_,
3450 );
3451
3452 $self
3453}
3454
3455sub set_items {
3456 my ($self, $items) = @_;
3457
3458 $self->{child}->clear;
3459 return unless $items;
3460
3461 my @items = sort {
3462 ($a->{type} <=> $b->{type})
3463 or ($a->{name} cmp $b->{name})
3464 } values %$items;
3465
3466 $self->{real_items} = \@items;
3467
3468 my $row = 0;
3469 for my $item (@items) {
3470 CFClient::Item::update_widgets $item;
3471
3472 $self->{child}->add (0, $row, $item->{face_widget});
3473 $self->{child}->add (1, $row, $item->{desc_widget});
3474 $self->{child}->add (2, $row, $item->{weight_widget});
3475
3476 $row++;
3477 }
3478}
3479
3480#############################################################################
3481
3482package CFClient::UI::SpellList;
3483
3484our @ISA = CFClient::UI::Table::;
3485
3486sub new {
3487 my $class = shift;
3488
3489 my $self = $class->SUPER::new (
3490 binding => [],
3491 commands => [],
3492 @_,
3493 )
3494}
3495
3496my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3497
3498my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3500my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3504my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3506my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3507 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3508
3509sub rebuild_spell_list {
3510 my ($self) = @_;
3511
3512 $CFClient::UI::ROOT->on_refresh ($self => sub {
3513 $self->clear;
3514
3515 return unless $::CONN;
3516
3517 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3518 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3519 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3520 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3521 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3522
3523 my $row = 0;
3524
3525 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3526 my $spell = $self->{spell}{$_};
3527
3528 $row++;
3529
3530 my $spell_cb = sub {
3531 my ($widget, $ev) = @_;
3532
3533 if ($ev->{button} == 1) {
3534 $::CONN->user_send ("cast $spell->{name}");
3535 } elsif ($ev->{button} == 2) {
3536 $::CONN->user_send ("invoke $spell->{name}");
3537 } elsif ($ev->{button} == 3) {
3538 (new CFClient::UI::Menu
3539 items => [
3540 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3541 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3542 ],
3543 )->popup ($ev);
3544 } else {
3545 return 0;
3546 }
3547
3548 1
3549 };
3550
3551 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3552
3553 #TODO: add path info to tooltip
3554 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3555
3556 $self->add (0, $row, new CFClient::UI::Face
3557 face => $spell->{face},
3558 can_hover => 1,
3559 can_events => 1,
3560 tooltip => $tooltip,
3561 on_button_down => $spell_cb,
3562 );
3563
3564 $self->add (1, $row, new CFClient::UI::Label
3565 expand => 1,
3566 text => $spell->{name},
3567 can_hover => 1,
3568 can_events => 1,
3569 tooltip => $tooltip,
3570 on_button_down => $spell_cb,
3571 );
3572
3573 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3574 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3575 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3576 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3577 }
3578 });
3579}
3580
3581sub add_spell {
3582 my ($self, $spell) = @_;
3583
3584 $self->{spell}->{$spell->{name}} = $spell;
3585 $self->rebuild_spell_list;
3586}
3587
3588sub remove_spell {
3589 my ($self, $spell) = @_;
3590
3591 delete $self->{spell}->{$spell->{name}};
3592 $self->rebuild_spell_list;
3593}
3594
3595sub clear_spells {
3596 my ($self) = @_;
3597
3598 $self->{spell} = {};
3599 $self->rebuild_spell_list;
3600}
3601
3602#############################################################################
3603
3604package CFClient::UI::Root; 4339package DC::UI::Root;
3605 4340
3606our @ISA = CFClient::UI::Container::; 4341our @ISA = DC::UI::Container::;
3607 4342
3608use List::Util qw(min max); 4343use List::Util qw(min max);
3609 4344
3610use CFClient::OpenGL; 4345use DC::OpenGL;
3611 4346
3612sub new { 4347sub new {
3613 my $class = shift; 4348 my $class = shift;
3614 4349
3615 my $self = $class->SUPER::new ( 4350 my $self = $class->SUPER::new (
3616 visible => 1, 4351 visible => 1,
3617 @_, 4352 @_,
3618 ); 4353 );
3619 4354
3620 Scalar::Util::weaken ($self->{root} = $self); 4355 DC::weaken ($self->{root} = $self);
3621 4356
3622 $self 4357 $self
3623} 4358}
3624 4359
3625sub size_request { 4360sub size_request {
… …
3673} 4408}
3674 4409
3675sub update { 4410sub update {
3676 my ($self) = @_; 4411 my ($self) = @_;
3677 4412
3678 $::WANT_REFRESH++; 4413 $::WANT_REFRESH = 1;
3679} 4414}
3680 4415
3681sub add { 4416sub add {
3682 my ($self, @children) = @_; 4417 my ($self, @children) = @_;
3683 4418
… …
3720 while ($self->{refresh_hook}) { 4455 while ($self->{refresh_hook}) {
3721 $_->() 4456 $_->()
3722 for values %{delete $self->{refresh_hook}}; 4457 for values %{delete $self->{refresh_hook}};
3723 } 4458 }
3724 4459
3725 if ($self->{realloc}) { 4460 while ($self->{realloc}) {
3726 my %queue; 4461 my %queue;
3727 my @queue; 4462 my @queue;
3728 my $widget; 4463 my $widget;
3729 4464
3730 outer: 4465 outer:
… …
3750 4485
3751 delete $queue{$widget+0}; 4486 delete $queue{$widget+0};
3752 4487
3753 my ($w, $h) = $widget->size_request; 4488 my ($w, $h) = $widget->size_request;
3754 4489
3755 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4490 $w += $widget->{padding_x} * 2;
3756 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4491 $h += $widget->{padding_y} * 2;
4492
4493 $w = max $widget->{min_w}, $w;
4494 $h = max $widget->{min_h}, $h;
3757 4495
3758 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3759 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3760 4498
3761 $w = $widget->{force_w} if exists $widget->{force_w}; 4499 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3777 } 4515 }
3778 } 4516 }
3779 4517
3780 delete $self->{realloc}{$widget+0}; 4518 delete $self->{realloc}{$widget+0};
3781 } 4519 }
3782 }
3783 4520
3784 while (my $size_alloc = delete $self->{size_alloc}) { 4521 while (my $size_alloc = delete $self->{size_alloc}) {
3785 my @queue = sort { $b->{visible} <=> $a->{visible} } 4522 my @queue = sort { $a->{visible} <=> $b->{visible} }
3786 values %$size_alloc; 4523 values %$size_alloc;
3787 4524
3788 while () { 4525 while () {
3789 my $widget = pop @queue || last; 4526 my $widget = pop @queue || last;
3790 4527
3791 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4528 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3792 4529
3793 $w = 0 if $w < 0; 4530 $w = max $widget->{min_w}, $w;
3794 $h = 0 if $h < 0; 4531 $h = max $widget->{min_h}, $h;
3795 4532
4533# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4534# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4535
4536 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4537 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4538
3796 $w = int $w + 0.5; 4539 $w = int $w + 0.5;
3797 $h = int $h + 0.5; 4540 $h = int $h + 0.5;
3798 4541
3799 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4542 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3800 $widget->{old_w} = $widget->{w}; 4543 $widget->{old_w} = $widget->{w};
3801 $widget->{old_h} = $widget->{h}; 4544 $widget->{old_h} = $widget->{h};
3802 4545
3803 $widget->{w} = $w; 4546 $widget->{w} = $w;
3804 $widget->{h} = $h; 4547 $widget->{h} = $h;
3805 4548
3806 $widget->emit (size_allocate => $w, $h); 4549 $widget->emit (size_allocate => $w, $h);
4550 }
3807 } 4551 }
3808 } 4552 }
3809 } 4553 }
3810 4554
3811 while ($self->{post_alloc_hook}) { 4555 while ($self->{post_alloc_hook}) {
3812 $_->() 4556 $_->()
3813 for values %{delete $self->{post_alloc_hook}}; 4557 for values %{delete $self->{post_alloc_hook}};
3814 } 4558 }
3815
3816 4559
3817 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4560 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3818 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4561 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3819 glClear GL_COLOR_BUFFER_BIT; 4562 glClear GL_COLOR_BUFFER_BIT;
3820 4563
… …
3823 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4566 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3824 glMatrixMode GL_MODELVIEW; 4567 glMatrixMode GL_MODELVIEW;
3825 glLoadIdentity; 4568 glLoadIdentity;
3826 4569
3827 { 4570 {
3828 package CFClient::UI::Base; 4571 package DC::UI::Base;
3829 4572
3830 ($draw_x, $draw_y, $draw_w, $draw_h) = 4573 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3831 (0, 0, $self->{w}, $self->{h}); 4574 (0, 0, $self->{w}, $self->{h});
3832 }
3833 4575
3834 $self->_draw; 4576 $self->_draw;
4577 }
3835} 4578}
3836 4579
3837############################################################################# 4580#############################################################################
3838 4581
3839package CFClient::UI; 4582package DC::UI;
3840 4583
3841$ROOT = new CFClient::UI::Root; 4584$ROOT = new DC::UI::Root;
3842$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4585$TOOLTIP = new DC::UI::Tooltip z => 900;
3843 4586
38441 45871
3845 4588

Diff Legend

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