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.303 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.481 by root, Tue Oct 12 05:11:38 2010 UTC

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

Diff Legend

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