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

Diff Legend

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