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.312 by root, Fri Jun 23 23:54:30 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->emit ("focus_out"); 321 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 322 $self->emit (visibility_change => 0);
288} 323}
… …
290sub set_visibility { 325sub set_visibility {
291 my ($self, $visible) = @_; 326 my ($self, $visible) = @_;
292 327
293 return if $self->{visible} == $visible; 328 return if $self->{visible} == $visible;
294 329
295 $visible ? $self->hide 330 $visible ? $self->show
296 : $self->show; 331 : $self->hide;
297} 332}
298 333
299sub toggle_visibility { 334sub toggle_visibility {
300 my ($self) = @_; 335 my ($self) = @_;
301 336
… …
307sub hide { 342sub hide {
308 my ($self) = @_; 343 my ($self) = @_;
309 344
310 $self->set_invisible; 345 $self->set_invisible;
311 346
347 # extra $parent copy for 5.8.8+ bug workaround
348 # (otherwise $_[0] in remove gets freed
349 if (my $parent = $self->{parent}) {
312 $self->{parent}->remove ($self) 350 $parent->remove ($self);
313 if $self->{parent}; 351 }
314} 352}
315 353
316sub move_abs { 354sub move_abs {
317 my ($self, $x, $y, $z) = @_; 355 my ($self, $x, $y, $z) = @_;
318 356
… …
330 $self->{force_h} = $h; 368 $self->{force_h} = $h;
331 369
332 $self->realloc; 370 $self->realloc;
333} 371}
334 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
335sub size_request { 391sub size_request {
336 require Carp; 392 require Carp;
337 Carp::confess "size_request is abstract"; 393 Carp::confess "size_request is abstract";
338} 394}
339 395
… …
345 my ($self, $x, $y, $w, $h) = @_; 401 my ($self, $x, $y, $w, $h) = @_;
346 402
347 if ($self->{aspect}) { 403 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 404 my ($ow, $oh) = ($w, $h);
349 405
350 $w = List::Util::min $w, int $h * $self->{aspect}; 406 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 407 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
352 408
353 # use alignment to adjust x, y 409 # use alignment to adjust x, y
354 410
355 $x += int 0.5 * ($ow - $w); 411 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 412 $y += int 0.5 * ($oh - $h);
… …
397 453
398 return if $self->{tooltip} eq $tooltip; 454 return if $self->{tooltip} eq $tooltip;
399 455
400 $self->{tooltip} = $tooltip; 456 $self->{tooltip} = $tooltip;
401 457
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 458 if ($DC::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 459 delete $DC::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 460 $DC::UI::TOOLTIP_WATCHER->invoke;
405 } 461 }
406} 462}
407 463
408# translate global coordinates to local coordinate system 464# translate global coordinates to local coordinate system
409sub coord2local { 465sub coord2local {
410 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
411 467
468 return (undef, undef) unless $self->{parent};
469
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 470 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 471}
414 472
415# translate local coordinates to global coordinate system 473# translate local coordinates to global coordinate system
416sub coord2global { 474sub coord2global {
417 my ($self, $x, $y) = @_; 475 my ($self, $x, $y) = @_;
418 476
477 return (undef, undef) unless $self->{parent};
478
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 479 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 480}
421 481
422sub invoke_focus_in { 482sub invoke_focus_in {
423 my ($self) = @_; 483 my ($self) = @_;
424 484
425 return if $FOCUS == $self; 485 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 486 return unless $self->{can_focus};
427 487
428 my $focus = $FOCUS; $FOCUS = $self; 488 $FOCUS = $self;
429 489
430 $focus->update if $focus; 490 $self->update;
431 $FOCUS->update;
432 491
433 0 492 0
434} 493}
435 494
436sub invoke_focus_out { 495sub invoke_focus_out {
437 my ($self) = @_; 496 my ($self) = @_;
438 497
439 return unless $FOCUS == $self; 498 return unless $FOCUS == $self;
440 499
441 my $focus = $FOCUS; undef $FOCUS; 500 undef $FOCUS;
442 501
443 $focus->update if $focus; #? 502 $self->update;
444 503
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 504 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 505 unless $FOCUS;
447 506
448 0 507 0
449} 508}
450 509
451sub grab_focus { 510sub grab_focus {
452 my ($self) = @_; 511 my ($self) = @_;
453 512
513 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 514 $self->emit ("focus_in");
455} 515}
456 516
457sub invoke_mouse_motion { 1 } 517sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 518sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 519sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 520sub invoke_key_up { 0 }
521sub invoke_mouse_wheel { 0 }
461 522
462sub invoke_button_down { 523sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 524 my ($self, $ev, $x, $y) = @_;
464 525
465 $self->grab_focus; 526 $self->grab_focus;
466 527
467 1 528 0
468} 529}
469 530
470sub connect { 531sub connect {
471 my ($self, $signal, $cb) = @_; 532 my ($self, $signal, $cb) = @_;
472 533
473 push @{ $self->{signal_cb}{$signal} }, $cb; 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 }
474} 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);
475 554
476sub emit { 555sub emit {
477 my ($self, $signal, @args) = @_; 556 my ($self, $signal, @args) = @_;
478 557
479 #d##TODO# stop propagating at first true, do not use sum 558 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 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
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 569 ($self->can ("invoke_$signal") || sub { 1 }), # closure
570 ) {
571 return $cb->($self, @args, @append) || next;
572 }
573
574 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 575 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 576}
484 577
485sub find_widget { 578#sub find_widget {
486 my ($self, $x, $y) = @_; 579# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 580
497sub set_parent { 581sub set_parent {
498 my ($self, $parent) = @_; 582 my ($self, $parent) = @_;
499 583
500 Scalar::Util::weaken ($self->{parent} = $parent); 584 DC::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 585 $self->set_visible if $parent->{visible};
502} 586}
503 587
504sub realloc { 588sub realloc {
505 my ($self) = @_; 589 my ($self) = @_;
… …
531 615
532# 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
533# functions seems pointless. 617# functions seems pointless.
534our ($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
535 619
536sub draw { 620#sub draw {
537 my ($self) = @_; 621#CFPlus.xs
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549 glPushMatrix;
550 glTranslate $self->{x}, $self->{y}, 0;
551
552 if ($self == $HOVER && $self->{can_hover}) {
553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554 glEnable GL_BLEND;
555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556 glBegin GL_QUADS;
557 glVertex 0 , 0;
558 glVertex $self->{w}, 0;
559 glVertex $self->{w}, $self->{h};
560 glVertex 0 , $self->{h};
561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
575 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 }
578
579 $self->_draw;
580 glPopMatrix;
581}
582 622
583sub _draw { 623sub _draw {
584 my ($self) = @_; 624 my ($self) = @_;
585 625
586 warn "no draw defined for $self\n"; 626 warn "no draw defined for $self\n";
587} 627}
588 628
589sub DESTROY { 629sub DESTROY {
590 my ($self) = @_; 630 my ($self) = @_;
591 631
592 delete $WIDGET{$self+0}; 632 return if DC::in_destruct;
593 633
634 local $@;
594 eval { $self->destroy }; 635 eval { $self->destroy };
595 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};
596} 639}
597 640
598############################################################################# 641#############################################################################
599 642
600package CFClient::UI::DrawBG; 643package DC::UI::DrawBG;
601 644
602our @ISA = CFClient::UI::Base::; 645our @ISA = DC::UI::Base::;
603 646
604use strict; 647use common::sense;
648
605use CFClient::OpenGL; 649use DC::OpenGL;
606 650
607sub new { 651sub new {
608 my $class = shift; 652 my $class = shift;
609
610 # range [value, low, high, page]
611 653
612 $class->SUPER::new ( 654 $class->SUPER::new (
613 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
614 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
615 @_ 657 @_
616 ) 658 )
617} 659}
618 660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
666}
667
619sub _draw { 668sub _draw {
620 my ($self) = @_; 669 my ($self) = @_;
621 670
622 my $color = $FOCUS == $self && $self->{active_bg} 671 my $color = $FOCUS == $self
623 ? $self->{active_bg} 672 ? $self->{active_bg} || $self->{bg}
624 : $self->{bg}; 673 : $self->{bg};
625 674
626 if ($color && (@$color < 4 || $color->[3])) { 675 if ($color && (@$color < 4 || $color->[3])) {
627 my ($w, $h) = @$self{qw(w h)}; 676 my ($w, $h) = @$self{qw(w h)};
628 677
629 glEnable GL_BLEND; 678 glEnable GL_BLEND;
630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 679 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
631 glColor_premultiply @$color; 680 glColor_premultiply @$color;
632
633 glBegin GL_QUADS;
634 glVertex 0 , 0;
635 glVertex 0 , $h;
636 glVertex $w, $h; 681 glRect 0, 0, $w, $h;
637 glVertex $w, 0;
638 glEnd;
639
640 glDisable GL_BLEND; 682 glDisable GL_BLEND;
641 } 683 }
642} 684}
643 685
644############################################################################# 686#############################################################################
645 687
646package CFClient::UI::Empty; 688package DC::UI::Empty;
647 689
648our @ISA = CFClient::UI::Base::; 690our @ISA = DC::UI::Base::;
649 691
650sub new { 692sub new {
651 my ($class, %arg) = @_; 693 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 694 $class->SUPER::new (can_events => 0, %arg);
653} 695}
… …
660 702
661sub draw { } 703sub draw { }
662 704
663############################################################################# 705#############################################################################
664 706
665package CFClient::UI::Container; 707package DC::UI::Container;
666 708
667our @ISA = CFClient::UI::Base::; 709our @ISA = DC::UI::Base::;
668 710
669sub new { 711sub new {
670 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
671 713
672 my $children = delete $arg{children}; 714 my $children = delete $arg{children};
… …
676 can_events => 0, 718 can_events => 0,
677 %arg, 719 %arg,
678 ); 720 );
679 721
680 $self->add (@$children) 722 $self->add (@$children)
681 if $children; 723 if $children && @$children;
682 724
683 $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;
684} 734}
685 735
686sub add { 736sub add {
687 my ($self, @widgets) = @_; 737 my ($self, @widgets) = @_;
688 738
689 $_->set_parent ($self) 739 $_->set_parent ($self)
690 for @widgets; 740 for @widgets;
691 741
742 # TODO: only do this in widgets that need it, e.g. root, fixed
692 use sort 'stable'; 743 use sort 'stable';
693 744
694 $self->{children} = [ 745 $self->{children} = [
695 sort { $a->{z} <=> $b->{z} } 746 sort { $a->{z} <=> $b->{z} }
696 @{$self->{children}}, @widgets 747 @{$self->{children}}, @widgets
697 ]; 748 ];
698 749
699 $self->realloc; 750 $self->realloc;
751
752 $self->emit (c_add => \@widgets);
753
754 map $_+0, @widgets
700} 755}
701 756
702sub children { 757sub children {
703 @{ $_[0]{children} } 758 @{ $_[0]{children} }
704} 759}
705 760
706sub remove { 761sub remove {
707 my ($self, $child) = @_; 762 my ($self, @widgets) = @_;
708 763
764 $self->emit (c_remove => \@widgets);
765
766 for my $child (@widgets) {
709 delete $child->{parent}; 767 delete $child->{parent};
710 $child->hide; 768 $child->hide;
711
712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 769 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
770 }
713 771
714 $self->realloc; 772 $self->realloc;
715} 773}
716 774
717sub clear { 775sub clear {
718 my ($self) = @_; 776 my ($self) = @_;
719 777
720 my $children = delete $self->{children}; 778 my $children = $self->{children};
721 $self->{children} = []; 779 $self->{children} = [];
722 780
723 for (@$children) { 781 for (@$children) {
724 delete $_->{parent}; 782 delete $_->{parent};
725 $_->hide; 783 $_->hide;
… …
745} 803}
746 804
747sub _draw { 805sub _draw {
748 my ($self) = @_; 806 my ($self) = @_;
749 807
750 $_->draw for @{$self->{children}}; 808 $_->draw for $self->visible_children;
751} 809}
752 810
753############################################################################# 811#############################################################################
754 812
755package CFClient::UI::Bin; 813package DC::UI::Bin;
756 814
757our @ISA = CFClient::UI::Container::; 815our @ISA = DC::UI::Container::;
758 816
759sub new { 817sub new {
760 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
761 819
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 820 my $child = (delete $arg{child}) || new DC::UI::Empty::;
763 821
764 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
765} 823}
766 824
767sub add { 825sub add {
768 my ($self, $child) = @_; 826 my ($self, $child) = @_;
769 827
770 $self->SUPER::remove ($_) for @{ $self->{children} }; 828 $self->clear;
771 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
772} 830}
773 831
774sub remove { 832sub remove {
775 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
776 834
777 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
778 836
779 $self->{children} = [new CFClient::UI::Empty] 837 $self->{children} = [new DC::UI::Empty]
780 unless @{$self->{children}}; 838 unless @{$self->{children}};
781} 839}
782 840
783sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
784 842
… …
793 851
794 1 852 1
795} 853}
796 854
797############################################################################# 855#############################################################################
798
799# back-buffered drawing area 856# back-buffered drawing area
800 857
801package CFClient::UI::Window; 858package DC::UI::Window;
802 859
803our @ISA = CFClient::UI::Bin::; 860our @ISA = DC::UI::Bin::;
804 861
805use CFClient::OpenGL; 862use DC::OpenGL;
806 863
807sub new { 864sub new {
808 my ($class, %arg) = @_; 865 my ($class, %arg) = @_;
809 866
810 my $self = $class->SUPER::new (%arg); 867 my $self = $class->SUPER::new (%arg);
… …
832} 889}
833 890
834sub render_child { 891sub render_child {
835 my ($self) = @_; 892 my ($self) = @_;
836 893
837 $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 {
838 glClearColor 0, 0, 0, 0; 895 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 896 glClear GL_COLOR_BUFFER_BIT;
840 897
841 { 898 {
842 package CFClient::UI::Base; 899 package DC::UI::Base;
843 900
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 901 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 902 (0, 0, $self->{w}, $self->{h});
903
904 $self->_render;
846 } 905 }
847
848 $self->_render;
849 }; 906 };
850} 907}
851 908
852sub _draw { 909sub _draw {
853 my ($self) = @_; 910 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 911
857 my $tex = $self->{texture} 912 my $tex = $self->{texture}
858 or return; 913 or return;
859 914
860 glEnable GL_TEXTURE_2D; 915 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 917 glColor 0, 0, 0, 1;
863 918
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 919 $tex->draw_quad_alpha_premultiplied (0, 0);
865 920
866 glDisable GL_TEXTURE_2D; 921 glDisable GL_TEXTURE_2D;
867} 922}
868 923
869############################################################################# 924#############################################################################
870 925
871package CFClient::UI::ViewPort; 926package DC::UI::ViewPort;
872 927
928use List::Util qw(min max);
929
873our @ISA = CFClient::UI::Window::; 930our @ISA = DC::UI::Window::;
874 931
875sub new { 932sub new {
876 my $class = shift; 933 my $class = shift;
877 934
878 $class->SUPER::new ( 935 $class->SUPER::new (
… …
885sub size_request { 942sub size_request {
886 my ($self) = @_; 943 my ($self) = @_;
887 944
888 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 945 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889 946
890 $w = 10 if $self->{scroll_x}; 947 $w = 1 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y}; 948 $h = 1 if $self->{scroll_y};
892 949
893 ($w, $h) 950 ($w, $h)
894} 951}
895 952
896sub invoke_size_allocate { 953sub invoke_size_allocate {
… …
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
1161 $self->{motion} = sub {
1162 my ($ev, $x, $y) = @_;
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
1005} 1210}
1006 1211
1007sub invoke_size_allocate { 1212sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1213 my ($self, $w, $h) = @_;
1009 1214
1010 my $child = $self->{vp}->child; 1215 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1216 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1217}
1015 1218
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
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 if ($self->{has_close_button}) { 1392 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1393 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1394 new DC::UI::ImageButton
1098 path => '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_button}); 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_button}) if $self->{close_button}; 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
1414}
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
1117} 1423}
1118 1424
1119sub size_request { 1425sub size_request {
1120 my ($self) = @_; 1426 my ($self) = @_;
1121 1427
… …
1150 $self->child->configure ($border, $border, $w, $h); 1456 $self->child->configure ($border, $border, $w, $h);
1151 1457
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1458 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1459 if $self->{close_button};
1154 1460
1461 1
1462}
1463
1464sub invoke_delete {
1465 my ($self) = @_;
1466
1467 $self->hide;
1468
1155 1 1469 1
1156} 1470}
1157 1471
1158sub invoke_button_down { 1472sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1473 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1531 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1532
1219 ! ! $self->{motion} 1533 ! ! $self->{motion}
1220} 1534}
1221 1535
1536sub invoke_visibility_change {
1537 my ($self, $visible) = @_;
1538
1539 delete $self->{motion} unless $visible;
1540
1541 0
1542}
1543
1222sub _draw { 1544sub _draw {
1223 my ($self) = @_; 1545 my ($self) = @_;
1224 1546
1225 my $child = $self->{children}[0]; 1547 my $child = $self->{children}[0];
1226 1548
… …
1230 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1232 1554
1233 my $border = $self->border; 1555 my $border = $self->border;
1234 1556
1557 if ($border) {
1235 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1236 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1239 $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 }
1240 1578
1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1242 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1243 1581
1244 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
1263 if $self->{close_button}; 1601 if $self->{close_button};
1264} 1602}
1265 1603
1266############################################################################# 1604#############################################################################
1267 1605
1268package CFClient::UI::Table; 1606package DC::UI::Table;
1269 1607
1270our @ISA = CFClient::UI::Base::; 1608our @ISA = DC::UI::Container::;
1271 1609
1272use List::Util qw(max sum); 1610use List::Util qw(max sum);
1273 1611
1274use CFClient::OpenGL; 1612use DC::OpenGL;
1275 1613
1276sub new { 1614sub new {
1277 my $class = shift; 1615 my $class = shift;
1278 1616
1279 $class->SUPER::new ( 1617 $class->SUPER::new (
1280 col_expand => [], 1618 col_expand => [],
1619 row_expand => [],
1281 @_, 1620 @_,
1282 ) 1621 )
1283} 1622}
1284 1623
1285sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287}
1288
1289sub add { 1624sub add {
1290 my ($self, $x, $y, $child) = @_; 1625 my ($self, @widgets) = @_;
1291 1626
1292 $child->set_parent ($self); 1627 for my $child (@widgets) {
1293 $self->{children}[$y][$x] = $child; 1628 $child->{c_rowspan} ||= 1;
1629 $child->{c_colspan} ||= 1;
1630 }
1294 1631
1295 $self->realloc; 1632 $self->SUPER::add (@widgets);
1296} 1633}
1297 1634
1298sub 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 {
1299 my ($self, $child) = @_; 1653 my ($self) = @_;
1300 1654
1301 # TODO: not yet implemented 1655 my (@w, @h);
1302}
1303
1304# TODO: move to container class maybe? send children a signal on removal?
1305sub clear {
1306 my ($self) = @_;
1307 1656
1308 my @children = $self->children; 1657 my @children = $self->children;
1309 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 }
1310 1668 }
1311 for (@children) {
1312 delete $_->{parent};
1313 $_->hide;
1314 }
1315 1669
1316 $self->realloc; 1670 # second pass, rows
1317} 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1318
1319sub get_wh {
1320 my ($self) = @_;
1321
1322 my (@w, @h);
1323
1324 for my $y (0 .. $#{$self->{children}}) {
1325 my $row = $self->{children}[$y]
1326 or next;
1327
1328 for my $x (0 .. $#$row) {
1329 my $widget = $row->[$x]
1330 or next;
1331 my ($w, $h) = @$widget{qw(req_w req_h)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1332 1673
1333 $w[$x] = max $w[$x], $w; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1334 $h[$y] = max $h[$y], $h; 1675
1676 if ($h > $sh) {
1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1335 } 1678 }
1336 } 1679 }
1337 1680
1338 (\@w, \@h) 1681 (\@w, \@h)
1339} 1682}
… …
1355 my ($ws, $hs) = $self->get_wh; 1698 my ($ws, $hs) = $self->get_wh;
1356 1699
1357 my $req_w = (sum @$ws) || 1; 1700 my $req_w = (sum @$ws) || 1;
1358 my $req_h = (sum @$hs) || 1; 1701 my $req_h = (sum @$hs) || 1;
1359 1702
1360 # TODO: nicer code && do row_expand 1703 # now linearly scale the rows/columns to the allocated size
1361 my @col_expand = @{$self->{col_expand}}; 1704 my @col_expand = @{$self->{col_expand}};
1362 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1363 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1364 1707
1365 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1709
1369 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
1370 CFClient::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1371 1719
1372 my $y; 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1373 1722
1374 for my $r (0 .. $#{$self->{children}}) { 1723 for my $widget ($self->children) {
1375 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)};
1376 or next;
1377 1725
1378 my $x = 0; 1726 $widget->configure (
1379 my $row_h = $hs->[$r]; 1727 $x[$c], $y[$r],
1728 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1380 1729 );
1381 for my $c (0 .. $#$row) { 1730 }
1382 my $col_w = $ws->[$c];
1383 1731
1384 if (my $widget = $row->[$c]) { 1732 1
1385 $widget->configure ($x, $y, $col_w, $row_h); 1733}
1386 }
1387 1734
1388 $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};
1389 } 1762 }
1763 }
1390 1764
1391 $y += $row_h; 1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
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 {
1786 my ($self, $W, $H) = @_;
1787
1788 for my $child ($self->visible_children) {
1789 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1790 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1791
1792 $x += $child->{c_halign} * $child->{req_w};
1793 $y += $child->{c_valign} * $child->{req_h};
1794
1795 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1392 } 1796 }
1393 1797
1394 1 1798 1
1395} 1799}
1396 1800
1397sub find_widget {
1398 my ($self, $x, $y) = @_;
1399
1400 $x -= $self->{x};
1401 $y -= $self->{y};
1402
1403 my $res;
1404
1405 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1406 $res = $_->find_widget ($x, $y)
1407 and return $res;
1408 }
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}
1420
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 invoke_size_allocate { 1823sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
… …
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));
… …
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;
… …
1652 2032
1653sub set_fontsize { 2033sub set_fontsize {
1654 my ($self, $fontsize) = @_; 2034 my ($self, $fontsize) = @_;
1655 2035
1656 $self->{fontsize} = $fontsize; 2036 $self->{fontsize} = $fontsize;
2037 delete $self->{size_req};
1657 delete $self->{texture}; 2038 delete $self->{texture};
1658 2039
1659 $self->realloc; 2040 $self->realloc;
1660} 2041}
1661 2042
1662sub reconfigure { 2043sub reconfigure {
1663 my ($self) = @_; 2044 my ($self) = @_;
1664 2045
1665 delete $self->{size_req}; 2046 delete $self->{size_req};
2047 delete $self->{texture};
1666 2048
1667 $self->SUPER::reconfigure; 2049 $self->SUPER::reconfigure;
1668} 2050}
1669 2051
1670sub _draw { 2052sub _draw {
1671 my ($self) = @_; 2053 my ($self) = @_;
1672 2054
1673 $self->SUPER::_draw; # draw background, if applicable 2055 $self->SUPER::_draw; # draw background, if applicable
1674 2056
1675 my $tex = $self->{texture} ||= do { 2057 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 2058 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2059 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 2060 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2061 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2062 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2063 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 2064
1683 new_from_layout CFClient::Texture $self->{layout} 2065 [$self->{layout}->size]
1684 }; 2066 };
1685 2067
1686 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
1687 $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);
1688 : $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);
1689 : ($self->{w} - $tex->{w}) * 0.5);
1690 2071
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5);
1694 }; 2073 };
1695 2074
1696 glEnable GL_TEXTURE_2D; 2075# unless ($self->{list}) {
1697 2076# $self->{list} = DC::OpenGL::glGenList;
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2077# DC::OpenGL::glNewList $self->{list};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2078# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1700 2079# DC::OpenGL::glEndList;
1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708 } 2080# }
2081#
2082# DC::OpenGL::glCallList $self->{list};
1709 2083
1710 glDisable GL_TEXTURE_2D; 2084 $self->{layout}->draw;
1711} 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#}
1712 2094
1713############################################################################# 2095#############################################################################
1714 2096
1715package CFClient::UI::EntryBase; 2097package DC::UI::EntryBase;
1716 2098
1717our @ISA = CFClient::UI::Label::; 2099our @ISA = DC::UI::Label::;
1718 2100
1719use CFClient::OpenGL; 2101use DC::OpenGL;
1720 2102
1721sub new { 2103sub new {
1722 my $class = shift; 2104 my $class = shift;
1723 2105
1724 $class->SUPER::new ( 2106 $class->SUPER::new (
1725 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
1726 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2109 outline => undef,
1727 active_bg => [1, 1, 1, 0.5], 2110 active_bg => [0, 0, 1, .2],
1728 active_fg => [0, 0, 0], 2111 active_fg => [1, 1, 1],
2112 active_outline => [1, 1, 0],
1729 can_hover => 1, 2113 can_hover => 1,
1730 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
1731 valign => 0, 2116 valign => 0.5,
1732 can_events => 1, 2117 can_events => 1,
2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
1733 #text => ... 2121 #text => ...
1734 #hidden => "*", 2122 #hidden => "*",
1735 @_ 2123 @_
1736 ) 2124 )
1737} 2125}
… …
1782 my $sym = $ev->{sym}; 2170 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 2171 my $uni = $ev->{unicode};
1784 2172
1785 my $text = $self->get_text; 2173 my $text = $self->get_text;
1786 2174
1787 if ($uni == 8) { 2175 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2176
2177 if ($sym == DC::SDLK_BACKSPACE) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
1790 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } 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 = "";
1796 $self->{cursor} = 0; 2199 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2200 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2201 $self->emit ('escape');
1801 } elsif ($uni) { 2202 } elsif ($uni == 0x0d) {
2203 substr $text, $self->{cursor}++, 0, "\012";
2204 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2205 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2206 } else {
1804 return 0; 2207 return 0;
1805 } 2208 }
1806 2209
1807 $self->_set_text ($text); 2210 $self->_set_text ($text);
1808 2211
1809 $self->realloc; 2212 $self->realloc;
2213 $self->update;
1810 2214
1811 1 2215 1
1812} 2216}
1813 2217
1814sub invoke_focus_in { 2218sub invoke_focus_in {
… …
1826 2230
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2231 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2232
1829 # byte-index to char-index 2233 # byte-index to char-index
1830 my $text = $self->{text}; 2234 my $text = $self->{text};
1831 utf8::encode $text; 2235 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2236 $self->{cursor} = length $text;
1833 2237
1834 $self->_set_text ($self->{text}); 2238 $self->_set_text ($self->{text});
1835 $self->update; 2239 $self->update;
1836 2240
1837 1 2241 1
… …
1856 glColor_premultiply @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
1857 } 2261 }
1858 2262
1859 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1861 glBegin GL_QUADS;
1862 glVertex 0 , 0;
1863 glVertex 0 , $self->{h};
1864 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
1865 glVertex $self->{w}, 0;
1866 glEnd;
1867 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
1868 2267
1869 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
1870 2269
1871 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
… …
1873 2272
1874 unless (exists $self->{cur_h}) { 2273 unless (exists $self->{cur_h}) {
1875 my $text = substr $self->{text}, 0, $self->{cursor}; 2274 my $text = substr $self->{text}, 0, $self->{cursor};
1876 utf8::encode $text; 2275 utf8::encode $text;
1877 2276
1878 @$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);
1879 } 2278 }
1880 2279
1881 glColor @{$self->{fg}}; 2280 glColor_premultiply @{$self->{active_fg}};
1882 glBegin GL_LINES; 2281 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2282 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1884 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};
1885 glEnd; 2284 glEnd;
1886 }
1887}
1888 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
1889package CFClient::UI::Entry; 2304package DC::UI::Entry;
1890 2305
1891our @ISA = CFClient::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
1892 2307
1893use CFClient::OpenGL; 2308use DC::OpenGL;
2309
2310sub new {
2311 my $class = shift;
2312
2313 $class->SUPER::new (
2314 history_pointer => -1,
2315 @_
2316 )
2317}
2318
1894 2319
1895sub invoke_key_down { 2320sub invoke_key_down {
1896 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1897 2322
1898 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1899 2324
1900 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
1903 2328
1904 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
1907 $self->update; 2332 $self->update;
1908 2333
1909 } elsif ($sym == CFClient::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
1912 } 2337 }
1913 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2342 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2344 }
1920 2345
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2349
1925 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1927 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
1928 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
1929 } 2357 }
1930 2358
1931 } else { 2359 } else {
1932 return $self->SUPER::invoke_key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
1933 } 2361 }
… …
1935 1 2363 1
1936} 2364}
1937 2365
1938############################################################################# 2366#############################################################################
1939 2367
1940package CFClient::UI::Button; 2368package DC::UI::TextEdit;
1941 2369
1942our @ISA = CFClient::UI::Label::; 2370our @ISA = DC::UI::EntryBase::;
1943 2371
1944use CFClient::OpenGL; 2372use DC::OpenGL;
1945
1946my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png);
1949 2373
1950sub new { 2374sub new {
1951 my $class = shift; 2375 my $class = shift;
1952 2376
1953 $class->SUPER::new ( 2377 $class->SUPER::new (
1954 padding_x => 4,
1955 padding_y => 4, 2378 padding_y => 4,
1956 fg => [1, 1, 1], 2379
1957 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 (
1958 can_hover => 1, 2431 can_hover => 1,
1959 align => 0, 2432 align => 0.5,
1960 valign => 0, 2433 valign => 0.5,
1961 can_events => 1, 2434 can_events => 1,
1962 @_ 2435 @_
1963 ) 2436 )
1964} 2437}
1965 2438
… …
1974} 2447}
1975 2448
1976sub _draw { 2449sub _draw {
1977 my ($self) = @_; 2450 my ($self) = @_;
1978 2451
1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1980
1981 glEnable GL_TEXTURE_2D; 2452 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 glColor 0, 0, 0, 1; 2454 glColor 0, 0, 0, 1;
1984 2455
2456 my $tex = $tex[$GRAB == $self];
1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986 2458
1987 glDisable GL_TEXTURE_2D; 2459 glDisable GL_TEXTURE_2D;
1988 2460
1989 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
1990} 2462}
1991 2463
1992############################################################################# 2464#############################################################################
1993 2465
1994package CFClient::UI::ImageButton; 2466package DC::UI::Button;
1995 2467
1996our @ISA = CFClient::UI::Image::; 2468our @ISA = DC::UI::Label::;
1997 2469
1998use CFClient::OpenGL; 2470use DC::OpenGL;
1999 2471
2000my %textures; 2472my @tex =
2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
2474 qw(b1_button_inactive.png b1_button_active.png);
2001 2475
2002sub new { 2476sub new {
2003 my $class = shift; 2477 my $class = shift;
2004 2478
2005 my $self = $class->SUPER::new ( 2479 $class->SUPER::new (
2006 padding_x => 4, 2480 padding_x => 8,
2007 padding_y => 4, 2481 padding_y => 4,
2008 fg => [1, 1, 1], 2482 fg => [1.0, 1.0, 1.0],
2009 active_fg => [0, 0, 1], 2483 active_fg => [0.8, 0.8, 0.8],
2010 can_hover => 1, 2484 can_hover => 1,
2011 align => 0, 2485 align => 0.5,
2012 valign => 0, 2486 valign => 0.5,
2013 can_events => 1, 2487 can_events => 1,
2014 @_ 2488 @_
2015 ); 2489 )
2016} 2490}
2017 2491
2018sub invoke_button_up { 2492sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_; 2493 my ($self, $ev, $x, $y) = @_;
2020 2494
… …
2023 && $y >= 0 && $y < $self->{h}; 2497 && $y >= 0 && $y < $self->{h};
2024 2498
2025 1 2499 1
2026} 2500}
2027 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
2028############################################################################# 2519#############################################################################
2029 2520
2030package CFClient::UI::CheckBox; 2521package DC::UI::CheckBox;
2031 2522
2032our @ISA = CFClient::UI::DrawBG::; 2523our @ISA = DC::UI::DrawBG::;
2033 2524
2034my @tex = 2525my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037 2528
2038use CFClient::OpenGL; 2529use DC::OpenGL;
2039 2530
2040sub new { 2531sub new {
2041 my $class = shift; 2532 my $class = shift;
2042 2533
2043 $class->SUPER::new ( 2534 $class->SUPER::new (
2535 fontsize => 1,
2044 padding_x => 2, 2536 padding_x => 2,
2045 padding_y => 2, 2537 padding_y => 2,
2046 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2047 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2054} 2546}
2055 2547
2056sub size_request { 2548sub size_request {
2057 my ($self) = @_; 2549 my ($self) = @_;
2058 2550
2059 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2552}
2553
2554sub toggle {
2555 my ($self) = @_;
2556
2557 $self->{state} = !$self->{state};
2558 $self->emit (changed => $self->{state});
2559 $self->update;
2060} 2560}
2061 2561
2062sub invoke_button_down { 2562sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_; 2563 my ($self, $ev, $x, $y) = @_;
2064 2564
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2565 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2566 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state}; 2567 $self->toggle;
2068 $self->emit (changed => $self->{state});
2069 } else { 2568 } else {
2070 return 0 2569 return 0
2071 } 2570 }
2072 2571
2073 1 2572 1
… …
2076sub _draw { 2575sub _draw {
2077 my ($self) = @_; 2576 my ($self) = @_;
2078 2577
2079 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
2080 2579
2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2082 2581
2083 my ($w, $h) = @$self{qw(w h)}; 2582 my ($w, $h) = @$self{qw(w h)};
2084 2583
2085 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;
2086 2585
… …
2093 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2094} 2593}
2095 2594
2096############################################################################# 2595#############################################################################
2097 2596
2098package CFClient::UI::Image; 2597package DC::UI::Image;
2099 2598
2100our @ISA = CFClient::UI::Base::; 2599our @ISA = DC::UI::DrawBG::;
2101 2600
2102use CFClient::OpenGL; 2601use DC::OpenGL;
2103 2602
2104our %texture_cache; 2603our %texture_cache;
2105 2604
2106sub new { 2605sub new {
2107 my $class = shift; 2606 my $class = shift;
2108 2607
2109 my $self = $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2110 can_events => 0, 2609 can_events => 0,
2610 scale => 1,
2111 @_, 2611 @_,
2112 ); 2612 );
2113 2613
2614 $self->{path} || $self->{tex}
2615 or Carp::croak "'path' or 'tex' attributes required";
2616
2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2619
2620 DC::weaken $texture_cache{$self->{path}};
2621
2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2623
2624 $self
2625}
2626
2627sub STORABLE_freeze {
2628 my ($self, $cloning) = @_;
2629
2114 $self->{path} 2630 $self->{path}
2115 or Carp::croak "required attribute 'path' not set"; 2631 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2116 2632
2117 $self->{tex} = $texture_cache{$self->{path}} ||= 2633 $self->{path}
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2634}
2119 2635
2120 Scalar::Util::weaken $texture_cache{$self->{path}}; 2636sub STORABLE_attach {
2637 my ($self, $cloning, $path) = @_;
2121 2638
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2639 $self->new (path => $path)
2640}
2123 2641
2124 $self 2642sub set_texture {
2643 my ($self, $tex) = @_;
2644
2645 $self->{tex} = $tex;
2646 $self->update;
2125} 2647}
2126 2648
2127sub size_request { 2649sub size_request {
2128 my ($self) = @_; 2650 my ($self) = @_;
2129 2651
2130 ($self->{tex}{w}, $self->{tex}{h}) 2652 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2131} 2653}
2132 2654
2133sub _draw { 2655sub _draw {
2134 my ($self) = @_; 2656 my ($self) = @_;
2657
2658 $self->SUPER::_draw;
2135 2659
2136 my $tex = $self->{tex}; 2660 my $tex = $self->{tex};
2137 2661
2138 my ($w, $h) = ($self->{w}, $self->{h}); 2662 my ($w, $h) = ($self->{w}, $self->{h});
2139 2663
… …
2152 glDisable GL_TEXTURE_2D; 2676 glDisable GL_TEXTURE_2D;
2153} 2677}
2154 2678
2155############################################################################# 2679#############################################################################
2156 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
2157package CFClient::UI::VGauge; 2721package DC::UI::VGauge;
2158 2722
2159our @ISA = CFClient::UI::Base::; 2723our @ISA = DC::UI::Base::;
2160 2724
2161use List::Util qw(min max); 2725use List::Util qw(min max);
2162 2726
2163use CFClient::OpenGL; 2727use DC::OpenGL;
2164 2728
2165my %tex = ( 2729my %tex = (
2166 food => [ 2730 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2731 map { new_from_resource DC::Texture $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2732 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2733 ],
2170 grace => [ 2734 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2735 map { new_from_resource DC::Texture $_, mipmap => 1 }
2172 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/
2173 ], 2737 ],
2174 hp => [ 2738 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2739 map { new_from_resource DC::Texture $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2740 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2741 ],
2178 mana => [ 2742 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2743 map { new_from_resource DC::Texture $_, mipmap => 1 }
2180 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/
2181 ], 2745 ],
2182); 2746);
2183 2747
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2748# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2808 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2809 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2810
2247 my $h1 = $self->{h} * (1 - $ycut1); 2811 my $h1 = $self->{h} * (1 - $ycut1);
2248 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);
2249 2816
2250 glEnable GL_BLEND; 2817 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2818 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2819 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2820 glEnable GL_TEXTURE_2D;
… …
2272 2839
2273 if ($t3) { 2840 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2841 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2842 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2843 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2844 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2845 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2846 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2847 glEnd;
2281 } 2848 }
2282 2849
2283 glDisable GL_BLEND; 2850 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2851 glDisable GL_TEXTURE_2D;
2285} 2852}
2286 2853
2287############################################################################# 2854#############################################################################
2288 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
2289package CFClient::UI::Gauge; 3010package DC::UI::Gauge;
2290 3011
2291our @ISA = CFClient::UI::VBox::; 3012our @ISA = DC::UI::VBox::;
2292 3013
2293sub new { 3014sub new {
2294 my ($class, %arg) = @_; 3015 my ($class, %arg) = @_;
2295 3016
2296 my $self = $class->SUPER::new ( 3017 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 3019 can_hover => 1,
2299 can_events => 1, 3020 can_events => 1,
2300 %arg, 3021 %arg,
2301 ); 3022 );
2302 3023
2303 $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");
2304 $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);
2305 $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");
2306 3027
2307 $self 3028 $self
2308} 3029}
2309 3030
2310sub set_fontsize { 3031sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 3052 $self->{value}->set_text ($val);
2332} 3053}
2333 3054
2334############################################################################# 3055#############################################################################
2335 3056
2336package CFClient::UI::Slider; 3057package DC::UI::Slider;
2337 3058
2338use strict; 3059use common::sense;
2339 3060
2340use CFClient::OpenGL; 3061use DC::OpenGL;
2341 3062
2342our @ISA = CFClient::UI::DrawBG::; 3063our @ISA = DC::UI::DrawBG::;
2343 3064
2344my @tex = 3065my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3066 map { new_from_resource DC::Texture $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 3067 qw(s1_slider.png s1_slider_bg.png);
2347 3068
2348sub new { 3069sub new {
2349 my $class = shift; 3070 my $class = shift;
2350 3071
… …
2387sub set_value { 3108sub set_value {
2388 my ($self, $value) = @_; 3109 my ($self, $value) = @_;
2389 3110
2390 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3111 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2391 3112
2392 $hi = $lo + 1 if $hi <= $lo; 3113 $hi = $lo if $hi < $lo;
2393 3114
2394 $page = $hi - $lo if $page > $hi - $lo; 3115 $value = $hi - $page if $value > $hi - $page;
2395
2396 $value = $lo if $value < $lo; 3116 $value = $lo if $value < $lo;
2397 $value = $hi - $page if $value > $hi - $page;
2398 3117
2399 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3118 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2400 if $unit; 3119 if $unit;
2401 3120
2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3121 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2418 3137
2419 $self->SUPER::invoke_button_down ($ev, $x, $y); 3138 $self->SUPER::invoke_button_down ($ev, $x, $y);
2420 3139
2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3140 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2422 3141
2423 $self->invoke_mouse_motion ($ev, $x, $y) 3142 $self->invoke_mouse_motion ($ev, $x, $y);
3143
3144 1
2424} 3145}
2425 3146
2426sub invoke_mouse_motion { 3147sub invoke_mouse_motion {
2427 my ($self, $ev, $x, $y) = @_; 3148 my ($self, $ev, $x, $y) = @_;
2428 3149
2429 if ($GRAB == $self) { 3150 if ($GRAB == $self) {
2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3151 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2431 3152
2432 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3153 my (undef, $lo, $hi, $page) = @{$self->{range}};
2433 3154
2434 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3155 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2435 3156
2436 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3157 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437 } else { 3158 } else {
2438 return 0; 3159 return 0;
2439 } 3160 }
2440 3161
2441 1 3162 1
2442} 3163}
2443 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
2444sub update { 3177sub update {
2445 my ($self) = @_; 3178 my ($self) = @_;
2446 3179
2447 delete $self->{knob_w}; 3180 delete $self->{knob_w};
2448 $self->SUPER::update; 3181 $self->SUPER::update;
… …
2452 my ($self) = @_; 3185 my ($self) = @_;
2453 3186
2454 unless ($self->{knob_w}) { 3187 unless ($self->{knob_w}) {
2455 $self->set_value ($self->{range}[0]); 3188 $self->set_value ($self->{range}[0]);
2456 3189
2457 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3190 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2458 my $range = ($hi - $page - $lo) || 1e-100; 3191 my $range = ($hi - $page - $lo) || 1e-10;
2459 3192
2460 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};
2461 3194
2462 $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;
2463 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3196 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2464 3197
2465 $value = ($value - $lo) / $range; 3198 $value = ($value - $lo) / $range;
… …
2495 glDisable GL_TEXTURE_2D; 3228 glDisable GL_TEXTURE_2D;
2496} 3229}
2497 3230
2498############################################################################# 3231#############################################################################
2499 3232
2500package CFClient::UI::ValSlider; 3233package DC::UI::ValSlider;
2501 3234
2502our @ISA = CFClient::UI::HBox::; 3235our @ISA = DC::UI::HBox::;
2503 3236
2504sub new { 3237sub new {
2505 my ($class, %arg) = @_; 3238 my ($class, %arg) = @_;
2506 3239
2507 my $range = delete $arg{range}; 3240 my $range = delete $arg{range};
2508 3241
2509 my $self = $class->SUPER::new ( 3242 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3243 slider => (new DC::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3244 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 3245 to_value => sub { shift },
2513 from_value => sub { shift }, 3246 from_value => sub { shift },
2514 %arg, 3247 %arg,
2515 ); 3248 );
2516 3249
… …
2536sub set_range { shift->{slider}->set_range (@_) } 3269sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 3270sub set_value { shift->{slider}->set_value (@_) }
2538 3271
2539############################################################################# 3272#############################################################################
2540 3273
2541package CFClient::UI::TextScroller; 3274package DC::UI::TextScroller;
2542 3275
2543our @ISA = CFClient::UI::HBox::; 3276our @ISA = DC::UI::HBox::;
2544 3277
2545use CFClient::OpenGL; 3278use DC::OpenGL;
2546 3279
2547sub new { 3280sub new {
2548 my $class = shift; 3281 my $class = shift;
2549 3282
2550 my $self = $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
2551 fontsize => 1, 3284 fontsize => 1,
2552 can_events => 0, 3285 can_events => 1,
2553 indent => 0, 3286 indent => 0,
2554 #font => default_font 3287 #font => default_font
2555 @_, 3288 @_,
2556 3289
2557 layout => (new CFClient::Layout 1), 3290 layout => (new DC::Layout),
2558 par => [], 3291 par => [],
3292 max_par => 0,
2559 height => 0, 3293 height => 0,
2560 children => [ 3294 children => [
2561 (new CFClient::UI::Empty expand => 1), 3295 (new DC::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 3296 (new DC::UI::Slider vertical => 1),
2563 ], 3297 ],
2564 ); 3298 );
2565 3299
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 3300 $self->{children}[1]->connect (changed => sub { $self->update });
2567 3301
… …
2576} 3310}
2577 3311
2578sub size_request { 3312sub size_request {
2579 my ($self) = @_; 3313 my ($self) = @_;
2580 3314
2581 my ($empty, $slider) = @{ $self->{children} }; 3315 my ($empty, $slider) = $self->visible_children;
2582 3316
2583 local $self->{children} = [$empty, $slider]; 3317 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request 3318 $self->SUPER::size_request
2585} 3319}
2586 3320
… …
2597 3331
2598 $self->reflow; 3332 $self->reflow;
2599 3333
2600 local $self->{children} = [$empty, $slider]; 3334 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 3335 $self->SUPER::invoke_size_allocate ($w, $h)
3336}
3337
3338sub invoke_mouse_wheel {
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
2602} 3346}
2603 3347
2604sub get_layout { 3348sub get_layout {
2605 my ($self, $para) = @_; 3349 my ($self, $para) = @_;
2606 3350
… …
2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3357 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2614 $layout->set_markup ($para->{markup}); 3358 $layout->set_markup ($para->{markup});
2615 3359
2616 $layout->set_shapes ( 3360 $layout->set_shapes (
2617 map 3361 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3362 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}} 3363 @{$para->{widget}}
2620 ); 3364 );
2621 3365
2622 $layout 3366 $layout
2623} 3367}
… …
2632sub set_offset { 3376sub set_offset {
2633 my ($self, $offset) = @_; 3377 my ($self, $offset) = @_;
2634 3378
2635 # todo: base offset on lines or so, not on pixels 3379 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset); 3380 $self->{children}[1]->set_value ($offset);
3381}
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;
2637} 3396}
2638 3397
2639sub clear { 3398sub clear {
2640 my ($self) = @_; 3399 my ($self) = @_;
2641 3400
… …
2646 $self->{height} = 0; 3405 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3406 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 3407}
2649 3408
2650sub add_paragraph { 3409sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 3410 my $self = shift;
2652 3411
2653 my ($text, @w) = ref $para ? @$para : $para; 3412 for my $para (@_) {
2654
2655 $para = { 3413 $para = {
3414 fg => [1, 1, 1, 1],
3415 indent => 0,
3416 markup => "",
3417 widget => [],
3418 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 3419 w => 1e10,
2657 wrapped => 1, 3420 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 3421 };
2663 3422
2664 $self->add (@w) if @w; 3423 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 push @{$self->{par}}, $para; 3424 push @{$self->{par}}, $para;
3425 }
3426
3427 if (my $max = $self->{max_par}) {
3428 shift @{$self->{par}} while @{$self->{par}} > $max;
3429 }
2666 3430
2667 $self->{need_reflow}++; 3431 $self->{need_reflow}++;
2668 $self->update; 3432 $self->update;
2669} 3433}
2670 3434
2671sub scroll_to_bottom { 3435sub scroll_to_bottom {
2672 my ($self) = @_; 3436 my ($self) = @_;
2673 3437
2674 $self->{scroll_to_bottom} = 1; 3438 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 3439 $self->update;
2676} 3440}
2677 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
3464 $self->{height} = $height;
3465 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3466
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 }
3473}
3474
2678sub update { 3475sub update {
2679 my ($self) = @_; 3476 my ($self) = @_;
2680 3477
2681 $self->SUPER::update; 3478 $self->SUPER::update;
2682 3479
2683 return unless $self->{h} > 0; 3480 return unless $self->{h} > 0;
2684 3481
2685 delete $self->{texture}; 3482 delete $self->{texture};
2686 3483
2687 $ROOT->on_post_alloc ($self => sub { 3484 $ROOT->on_post_alloc ($self => sub {
3485 $self->force_uptodate;
3486
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3487 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3488
2690 if (delete $self->{need_reflow}) {
2691 my $height = 0;
2692
2693 for my $para (@{$self->{par}}) {
2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695 my $layout = $self->get_layout ($para);
2696 my ($w, $h) = $layout->size;
2697
2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2701 }
2702
2703 $height += $para->{h};
2704 }
2705
2706 $self->{height} = $height;
2707
2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3489 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3490 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3491 glClear GL_COLOR_BUFFER_BIT;
2720 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;
2721 my $top = int $self->{children}[1]{range}[0]; 3501 my $top = int $self->{children}[1]{range}[0];
2722 3502
2723 my $y0 = $top; 3503 my $y0 = $top;
2724 my $y1 = $top + $H; 3504 my $y1 = $top + $H;
2725 3505
2726 my $y = 0;
2727
2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732 for my $para (@{$self->{par}}) { 3506 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3507 my $h = $para->{h};
3508 my $y = $para->{y};
2734 3509
2735 if ($y0 < $y + $h && $y < $y1) { 3510 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3511 my $layout = $self->get_layout ($para);
2738 3512
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3513 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3514 $layout->draw;
2743 3515
2744 if (my @w = @{ $para->{widget} }) { 3516 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3517 my @s = $layout->get_shapes;
2746 3518
2747 for (@w) { 3519 for (@w) {
… …
2753 $_->draw; 3525 $_->draw;
2754 } 3526 }
2755 } 3527 }
2756 } 3528 }
2757 3529
2758 $y += $h; 3530 $paridx++;
3531 $top_paragraph ||= $paridx if $y >= $top;
2759 } 3532 }
2760 3533
2761 glDisable GL_BLEND; 3534 $self->{top_paragraph} = $top_paragraph;
2762 }; 3535 };
2763 }); 3536 });
2764} 3537}
2765 3538
2766sub reconfigure { 3539sub reconfigure {
… …
2784 $self->{children}[1]->draw; 3557 $self->{children}[1]->draw;
2785} 3558}
2786 3559
2787############################################################################# 3560#############################################################################
2788 3561
2789package CFClient::UI::Animator; 3562package DC::UI::Animator;
2790 3563
2791use CFClient::OpenGL; 3564use DC::OpenGL;
2792 3565
2793our @ISA = CFClient::UI::Bin::; 3566our @ISA = DC::UI::Bin::;
2794 3567
2795sub moveto { 3568sub moveto {
2796 my ($self, $x, $y) = @_; 3569 my ($self, $x, $y) = @_;
2797 3570
2798 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3571 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2826 glPopMatrix; 3599 glPopMatrix;
2827} 3600}
2828 3601
2829############################################################################# 3602#############################################################################
2830 3603
2831package CFClient::UI::Flopper; 3604package DC::UI::Flopper;
2832 3605
2833our @ISA = CFClient::UI::Button::; 3606our @ISA = DC::UI::Button::;
2834 3607
2835sub new { 3608sub new {
2836 my $class = shift; 3609 my $class = shift;
2837 3610
2838 my $self = $class->SUPER::new ( 3611 my $self = $class->SUPER::new (
… …
2850 $self->{other}->toggle_visibility; 3623 $self->{other}->toggle_visibility;
2851} 3624}
2852 3625
2853############################################################################# 3626#############################################################################
2854 3627
2855package CFClient::UI::Tooltip; 3628package DC::UI::Tooltip;
2856 3629
2857our @ISA = CFClient::UI::Bin::; 3630our @ISA = DC::UI::Bin::;
2858 3631
2859use CFClient::OpenGL; 3632use DC::OpenGL;
2860 3633
2861sub new { 3634sub new {
2862 my $class = shift; 3635 my $class = shift;
2863 3636
2864 $class->SUPER::new ( 3637 $class->SUPER::new (
… …
2868} 3641}
2869 3642
2870sub set_tooltip_from { 3643sub set_tooltip_from {
2871 my ($self, $widget) = @_; 3644 my ($self, $widget) = @_;
2872 3645
2873 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 =~ /^#(.*)$/;
2874 3651
2875 if ($ENV{CFPLUS_DEBUG} & 2) { 3652 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n" 3653 $tip .= "\n\n" . (ref $widget) . "\n"
2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3654 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2878 . "req $widget->{req_w} $widget->{req_h}\n" 3655 . "req $widget->{req_w} $widget->{req_h}\n"
2879 . "visible $widget->{visible}"; 3656 . "visible $widget->{visible}";
2880 } 3657 }
2881 3658
2882 $tooltip =~ s/^\n+//; 3659 $tip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//; 3660 $tip =~ s/\n+$//;
2884 3661
2885 $self->add (new CFClient::UI::Label 3662 $self->add (new DC::UI::Label
3663 fg => $DC::THEME{tooltip_fg},
2886 markup => $tooltip, 3664 markup => $tip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3665 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3666 align => 0,
2888 fontsize => 0.8, 3667 fontsize => 0.8,
2889 fg => [0, 0, 0, 1], 3668 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
2890 ellipsise => 0, 3669 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP), 3670 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 ); 3671 );
2893} 3672}
2894 3673
… …
2913 3692
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3693 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3694 my $widget = $self->{owner}
2916 or return; 3695 or return;
2917 3696
3697 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3698 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3699
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3700 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3701 if $x + $self->{w} > $self->{root}{w};
2922 3702
2923 $self->move_abs ($x, $y); 3703 $self->move_abs ($x, $y);
3704 } else {
3705 $self->hide;
3706 }
2924 }); 3707 });
2925} 3708}
2926 3709
2927sub _draw { 3710sub _draw {
2928 my ($self) = @_; 3711 my ($self) = @_;
2929 3712
2930 glTranslate 0.375, 0.375;
2931
2932 my ($w, $h) = @$self{qw(w h)}; 3713 my ($w, $h) = @$self{qw(w h)};
2933 3714
2934 glColor 1, 0.8, 0.4; 3715 glColor @{ $DC::THEME{tooltip_bg} };
2935 glBegin GL_QUADS; 3716 glRect 0, 0, $w, $h;
2936 glVertex 0 , 0;
2937 glVertex 0 , $h;
2938 glVertex $w, $h;
2939 glVertex $w, 0;
2940 glEnd;
2941 3717
2942 glColor 0, 0, 0; 3718 glColor @{ $DC::THEME{tooltip_border} };
2943 glBegin GL_LINE_LOOP; 3719 glRect_lineloop .5, .5, $w + .5, $h + .5;
2944 glVertex 0 , 0;
2945 glVertex 0 , $h;
2946 glVertex $w, $h;
2947 glVertex $w, 0;
2948 glEnd;
2949 3720
2950 glTranslate 2 - 0.375, 2 - 0.375; 3721 glTranslate 2, 2;
2951 3722
2952 $self->SUPER::_draw; 3723 $self->SUPER::_draw;
2953} 3724}
2954 3725
2955############################################################################# 3726#############################################################################
2956 3727
2957package CFClient::UI::Face; 3728package DC::UI::Face;
2958 3729
2959our @ISA = CFClient::UI::Base::; 3730our @ISA = DC::UI::DrawBG::;
2960 3731
2961use CFClient::OpenGL; 3732use DC::OpenGL;
2962 3733
2963sub new { 3734sub new {
2964 my $class = shift; 3735 my $class = shift;
2965 3736
2966 my $self = $class->SUPER::new ( 3737 my $self = $class->SUPER::new (
3738 size_w => 32,
3739 size_h => 8,
2967 aspect => 1, 3740 aspect => 1,
2968 can_events => 0, 3741 can_events => 0,
2969 @_, 3742 @_,
2970 ); 3743 );
2971 3744
2972 if ($self->{anim} && $self->{animspeed}) { 3745 $self->update_anim;
2973 Scalar::Util::weaken (my $widget = $self);
2974
2975 $self->{timer} = Event->timer (
2976 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977 hard => 1,
2978 interval => $self->{animspeed},
2979 cb => sub {
2980 ++$widget->{frame};
2981 $widget->update;
2982 },
2983 );
2984 }
2985 3746
2986 $self 3747 $self
2987} 3748}
2988 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
2989sub size_request { 3809sub size_request {
2990 (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)
2991} 3827}
2992 3828
2993sub update { 3829sub update {
2994 my ($self) = @_; 3830 my ($self) = @_;
2995 3831
2996 return unless $self->{visible}; 3832 return unless $self->{visible};
2997 3833
2998 $self->SUPER::update; 3834 $self->SUPER::update;
2999} 3835}
3000 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
3001sub _draw { 3866sub _draw {
3002 my ($self) = @_; 3867 my ($self) = @_;
3003 3868
3004 return unless $::CONN; 3869 $self->SUPER::_draw;
3005 3870
3006 my $face; 3871 if (my $tex = $self->{tex}) {
3007
3008 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}];
3010
3011 $face = $anim->[ $self->{frame} % @$anim ]
3012 if $anim && @$anim;
3013 }
3014
3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3016
3017 if ($tex) {
3018 glEnable GL_TEXTURE_2D; 3872 glEnable GL_TEXTURE_2D;
3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020 glColor 0, 0, 0, 1; 3874 glColor 0, 0, 0, 1;
3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3022 glDisable GL_TEXTURE_2D; 3876 glDisable GL_TEXTURE_2D;
… …
3024} 3878}
3025 3879
3026sub destroy { 3880sub destroy {
3027 my ($self) = @_; 3881 my ($self) = @_;
3028 3882
3029 $self->{timer}->cancel 3883 (delete $self->{timer})->cancel
3030 if $self->{timer}; 3884 if $self->{timer};
3031 3885
3032 $self->SUPER::destroy; 3886 $self->SUPER::destroy;
3033} 3887}
3034 3888
3035############################################################################# 3889#############################################################################
3036 3890
3037package CFClient::UI::Buttonbar; 3891package DC::UI::Buttonbar;
3038 3892
3039our @ISA = CFClient::UI::HBox::; 3893our @ISA = DC::UI::HBox::;
3040 3894
3041# TODO: should actualyl wrap buttons and other goodies. 3895# TODO: should actually wrap buttons and other goodies.
3042 3896
3043############################################################################# 3897#############################################################################
3044 3898
3045package CFClient::UI::Menu; 3899package DC::UI::Menu;
3046 3900
3047our @ISA = CFClient::UI::FancyFrame::; 3901our @ISA = DC::UI::Toplevel::;
3048 3902
3049use CFClient::OpenGL; 3903use DC::OpenGL;
3050 3904
3051sub new { 3905sub new {
3052 my $class = shift; 3906 my $class = shift;
3053 3907
3054 my $self = $class->SUPER::new ( 3908 my $self = $class->SUPER::new (
3055 items => [], 3909 items => [],
3056 z => 100, 3910 z => 100,
3057 @_, 3911 @_,
3058 ); 3912 );
3059 3913
3060 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3914 $self->add ($self->{vbox} = new DC::UI::VBox);
3061 3915
3062 for my $item (@{ $self->{items} }) { 3916 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3917 my ($widget, $cb, $tooltip) = @$item;
3064 3918
3065 # handle various types of items, only text for now 3919 # handle various types of items, only text for now
3066 if (!ref $widget) { 3920 if (!ref $widget) {
3921 if ($widget =~ /\t/) {
3922 my ($left, $right) = split /\t/, $widget, 2;
3923
3067 $widget = new CFClient::UI::Label 3924 $widget = new DC::UI::HBox
3068 can_hover => 1, 3925 can_hover => 1,
3069 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,
3070 markup => $widget, 3939 markup => $widget,
3071 tooltip => $tooltip 3940 tooltip => $tooltip;
3941 }
3072 } 3942 }
3073 3943
3074 $self->{item}{$widget} = $item; 3944 $self->{item}{$widget} = $item;
3075 3945
3076 $self->{vbox}->add ($widget); 3946 $self->{vbox}->add ($widget);
… …
3088 # maybe save $GRAB? must be careful about events... 3958 # maybe save $GRAB? must be careful about events...
3089 $GRAB = $self; 3959 $GRAB = $self;
3090 $self->{button} = $ev->{button}; 3960 $self->{button} = $ev->{button};
3091 3961
3092 $self->show; 3962 $self->show;
3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 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
3094} 3972}
3095 3973
3096sub invoke_mouse_motion { 3974sub invoke_mouse_motion {
3097 my ($self, $ev, $x, $y) = @_; 3975 my ($self, $ev, $x, $y) = @_;
3098 3976
… …
3119 1 3997 1
3120} 3998}
3121 3999
3122############################################################################# 4000#############################################################################
3123 4001
3124package CFClient::UI::Multiplexer; 4002package DC::UI::Multiplexer;
3125 4003
3126our @ISA = CFClient::UI::Container::; 4004our @ISA = DC::UI::Container::;
3127 4005
3128sub new { 4006sub new {
3129 my $class = shift; 4007 my $class = shift;
3130 4008
3131 my $self = $class->SUPER::new ( 4009 my $self = $class->SUPER::new (
3132 @_, 4010 @_,
3133 ); 4011 );
3134 4012
3135 $self->{current} = $self->{children}[0] 4013 $self->set_current_page (0);
3136 if @{ $self->{children} };
3137 4014
3138 $self 4015 $self
3139} 4016}
3140 4017
3141sub add { 4018sub add {
3142 my ($self, @widgets) = @_; 4019 my ($self, @widgets) = @_;
3143 4020
3144 $self->SUPER::add (@widgets); 4021 $self->SUPER::add (@widgets);
3145 4022
3146 $self->{current} = $self->{children}[0] 4023 $self->set_current_page (0)
3147 if @{ $self->{children} }; 4024 if @widgets == @{ $self->{children} };
4025}
4026
4027sub get_current_page {
4028 my ($self) = @_;
4029
4030 $self->{current}
3148} 4031}
3149 4032
3150sub set_current_page { 4033sub set_current_page {
3151 my ($self, $page_or_widget) = @_; 4034 my ($self, $page_or_widget) = @_;
3152 4035
3153 my $widget = ref $page_or_widget 4036 my $widget = ref $page_or_widget
3154 ? $page_or_widget 4037 ? $page_or_widget
3155 : $self->{children}[$page_or_widget]; 4038 : $self->{children}[$page_or_widget];
3156 4039
4040 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4041
3157 $self->{current} = $widget; 4042 if (($self->{current} = $widget)) {
4043 $self->{current}->set_visible if $self->{current} && $self->{visible};
3158 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4044 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3159 4045
3160 $self->emit (page_changed => $self->{current}); 4046 $self->emit (page_changed => $self->{current});
4047 }
3161 4048
3162 $self->realloc; 4049 $self->realloc;
3163} 4050}
3164 4051
3165sub visible_children { 4052sub visible_children {
3166 $_[0]{current} 4053 $_[0]{current} || ()
3167} 4054}
3168 4055
3169sub size_request { 4056sub size_request {
3170 my ($self) = @_; 4057 my ($self) = @_;
3171 4058
4059 $self->{current}
3172 $self->{current}->size_request 4060 ? $self->{current}->size_request
4061 : (0, 0)
3173} 4062}
3174 4063
3175sub invoke_size_allocate { 4064sub invoke_size_allocate {
3176 my ($self, $w, $h) = @_; 4065 my ($self, $w, $h) = @_;
3177 4066
3178 $self->{current}->configure (0, 0, $w, $h); 4067 $self->{current}->configure (0, 0, $w, $h)
4068 if $self->{current};
3179 4069
3180 1 4070 1
3181} 4071}
3182 4072
3183sub _draw { 4073sub _draw {
3184 my ($self) = @_; 4074 my ($self) = @_;
3185 4075
3186 $self->{current}->draw; 4076 $self->{current}->draw
4077 if $self->{current};
3187} 4078}
3188 4079
3189############################################################################# 4080#############################################################################
3190 4081
3191package CFClient::UI::Notebook; 4082package DC::UI::Notebook;
3192 4083
4084use DC::OpenGL;
4085
3193our @ISA = CFClient::UI::VBox::; 4086our @ISA = DC::UI::VBox::;
3194 4087
3195sub new { 4088sub new {
3196 my $class = shift; 4089 my $class = shift;
3197 4090
3198 my $self = $class->SUPER::new ( 4091 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar), 4092 buttonbar => (new DC::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 4093 multiplexer => (new DC::UI::Multiplexer expand => 1),
4094 active_outline => [.7, .7, 0.2],
3201 # filter => # will be put between multiplexer and $self 4095 # filter => # will be put between multiplexer and $self
3202 @_, 4096 @_,
3203 ); 4097 );
3204 4098
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4099 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3206 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4100 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3207 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
3208 $self 4136 $self
3209} 4137}
3210 4138
3211sub 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 {
3212 my ($self, $title, $widget, $tooltip) = @_; 4169 my ($self, $title, $widget, $tooltip) = @_;
3213 4170
3214 Scalar::Util::weaken $self; 4171 $title = [$title, $tooltip] unless ref $title;
4172 $widget->{c_tab} = $title;
3215 4173
3216 $self->{buttonbar}->add (new CFClient::UI::Button
3217 markup => $title,
3218 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) },
3220 );
3221
3222 $self->{multiplexer}->add ($widget); 4174 $self->add ($widget);
4175}
4176
4177sub get_current_page {
4178 my ($self) = @_;
4179
4180 $self->{multiplexer}->get_current_page
3223} 4181}
3224 4182
3225sub set_current_page { 4183sub set_current_page {
3226 my ($self, $page) = @_; 4184 my ($self, $page) = @_;
3227 4185
3228 $self->{multiplexer}->set_current_page ($page); 4186 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current}); 4187 $self->emit (page_changed => $self->{multiplexer}{current});
3230} 4188}
3231 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 }
4208}
4209
3232############################################################################# 4210#############################################################################
3233 4211
3234package CFClient::UI::Combobox; 4212package DC::UI::Selector;
3235 4213
3236use utf8; 4214use utf8;
3237 4215
3238our @ISA = CFClient::UI::Button::; 4216our @ISA = DC::UI::Button::;
3239 4217
3240sub new { 4218sub new {
3241 my $class = shift; 4219 my $class = shift;
3242 4220
3243 my $self = $class->SUPER::new ( 4221 my $self = $class->SUPER::new (
… …
3260 my ($value, $title, $tooltip) = @$_; 4238 my ($value, $title, $tooltip) = @$_;
3261 4239
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4240 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 } 4241 }
3264 4242
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4243 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266} 4244}
3267 4245
3268sub _set_value { 4246sub _set_value {
3269 my ($self, $value) = @_; 4247 my ($self, $value) = @_;
3270 4248
3271 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4249 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4250 $item ||= $self->{options}[0]
3272 or return; 4251 or return;
3273 4252
3274 $self->{value} = $item->[0]; 4253 $self->{value} = $item->[0];
3275 $self->set_markup ("$item->[1] ⇓"); 4254 $self->set_markup ("$item->[1] ⇓");
3276 $self->set_tooltip ($item->[2]); 4255# $self->set_tooltip ($item->[2]);
3277} 4256}
3278 4257
3279sub set_value { 4258sub set_value {
3280 my ($self, $value) = @_; 4259 my ($self, $value) = @_;
3281 4260
… …
3283 4262
3284 $self->_set_value ($value); 4263 $self->_set_value ($value);
3285 $self->emit (changed => $value); 4264 $self->emit (changed => $value);
3286} 4265}
3287 4266
4267sub set_options {
4268 my ($self, $options) = @_;
4269
4270 $self->{options} = $options;
4271 $self->_set_value ($self->{value});
4272}
4273
3288############################################################################# 4274#############################################################################
3289 4275
3290package CFClient::UI::Statusbox; 4276package DC::UI::Statusbox;
3291 4277
3292our @ISA = CFClient::UI::VBox::; 4278our @ISA = DC::UI::VBox::;
3293 4279
3294sub new { 4280sub new {
3295 my $class = shift; 4281 my $class = shift;
3296 4282
3297 my $self = $class->SUPER::new ( 4283 my $self = $class->SUPER::new (
3298 fontsize => 0.8, 4284 fontsize => 0.8,
3299 @_, 4285 @_,
3300 ); 4286 );
3301 4287
3302 Scalar::Util::weaken (my $this = $self); 4288 DC::weaken (my $this = $self);
3303 4289
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4290 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3305 4291
3306 $self 4292 $self
3307} 4293}
3308 4294
3309sub reorder { 4295sub reorder {
3310 my ($self) = @_; 4296 my ($self) = @_;
3311 my $NOW = Time::HiRes::time; 4297 my $NOW = EV::time;
3312 4298
3313 # freeze display when hovering over any label 4299 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner} 4300 return if $DC::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4301 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} }; 4302 values %{ $self->{item} };
3317 4303
3318 while (my ($k, $v) = each %{ $self->{item} }) { 4304 while (my ($k, $v) = each %{ $self->{item} }) {
3319 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4305 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320 } 4306 }
4307
4308 $self->{timer}->set (1, 1);
3321 4309
3322 my @widgets; 4310 my @widgets;
3323 4311
3324 my @items = sort { 4312 my @items = sort {
3325 $a->{pri} <=> $b->{pri} 4313 $a->{pri} <=> $b->{pri}
3326 or $b->{id} <=> $a->{id} 4314 or $b->{id} <=> $a->{id}
3327 } values %{ $self->{item} }; 4315 } values %{ $self->{item} };
3328
3329 $self->{timer}->interval (1);
3330 4316
3331 my $count = 10 + 1; 4317 my $count = 10 + 1;
3332 for my $item (@items) { 4318 for my $item (@items) {
3333 last unless --$count; 4319 last unless --$count;
3334 4320
… …
3341 for ($short) { 4327 for ($short) {
3342 s/^\s+//; 4328 s/^\s+//;
3343 s/\s+/ /g; 4329 s/\s+/ /g;
3344 } 4330 }
3345 4331
3346 new CFClient::UI::Label 4332 new DC::UI::Label
3347 markup => $short, 4333 markup => $short,
3348 tooltip => $item->{tooltip}, 4334 tooltip => $item->{tooltip},
3349 tooltip_font => $::FONT_PROP, 4335 tooltip_font => $::FONT_PROP,
3350 tooltip_width => 0.67, 4336 tooltip_width => 0.67,
3351 fontsize => $item->{fontsize} || $self->{fontsize}, 4337 fontsize => $item->{fontsize} || $self->{fontsize},
3352 max_w => $::WIDTH * 0.44, 4338 max_w => $::WIDTH * 0.44,
4339 align => 0,
3353 fg => [@{ $item->{fg} }], 4340 fg => [@{ $item->{fg} }],
3354 can_events => 1, 4341 can_events => 1,
3355 can_hover => 1 4342 can_hover => 1
3356 }; 4343 };
3357 4344
3358 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4345 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3359 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4346 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3360 $label->update; 4347 $label->update;
3361 $label->set_max_size (undef, $label->{req_h} * $diff) 4348 $label->set_max_size (undef, $label->{req_h} * $diff)
3362 if $diff < 1; 4349 if $diff < 1;
3363 $self->{timer}->interval (1/30); 4350 $self->{timer}->set (1/30, 1/30);
3364 } else { 4351 } else {
3365 $label->{fg}[3] = $item->{fg}[3] || 1; 4352 $label->{fg}[3] = $item->{fg}[3] || 1;
3366 } 4353 }
3367 4354
3368 push @widgets, $label; 4355 push @widgets, $label;
3369 } 4356 }
4357
4358 my $hash = join ",", @widgets;
4359 return if $hash eq $self->{last_widget_hash};
4360 $self->{last_widget_hash} = $hash;
3370 4361
3371 $self->clear; 4362 $self->clear;
3372 $self->SUPER::add (reverse @widgets); 4363 $self->SUPER::add (reverse @widgets);
3373} 4364}
3374 4365
… …
3405 count => 1, 4396 count => 1,
3406 %arg, 4397 %arg,
3407 }; 4398 };
3408 } 4399 }
3409 4400
4401 $ROOT->on_refresh (reorder => sub {
3410 $self->reorder; 4402 $self->reorder;
4403 });
3411} 4404}
3412 4405
3413sub reconfigure { 4406sub reconfigure {
3414 my ($self) = @_; 4407 my ($self) = @_;
3415 4408
… …
3428 $self->SUPER::destroy; 4421 $self->SUPER::destroy;
3429} 4422}
3430 4423
3431############################################################################# 4424#############################################################################
3432 4425
3433package CFClient::UI::Inventory;
3434
3435our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437sub new {
3438 my $class = shift;
3439
3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
3693 @_,
3694 )
3695}
3696
3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
3783 my ($self, $spell) = @_;
3784
3785 $self->{spell}->{$spell->{name}} = $spell;
3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3805package CFClient::UI::Root; 4426package DC::UI::Root;
3806 4427
3807our @ISA = CFClient::UI::Container::; 4428our @ISA = DC::UI::Container::;
3808 4429
3809use List::Util qw(min max); 4430use List::Util qw(min max);
3810 4431
3811use CFClient::OpenGL; 4432use DC::OpenGL;
3812 4433
3813sub new { 4434sub new {
3814 my $class = shift; 4435 my $class = shift;
3815 4436
3816 my $self = $class->SUPER::new ( 4437 my $self = $class->SUPER::new (
3817 visible => 1, 4438 visible => 1,
3818 @_, 4439 @_,
3819 ); 4440 );
3820 4441
3821 Scalar::Util::weaken ($self->{root} = $self); 4442 DC::weaken ($self->{root} = $self);
3822 4443
3823 $self 4444 $self
3824} 4445}
3825 4446
3826sub size_request { 4447sub size_request {
… …
3874} 4495}
3875 4496
3876sub update { 4497sub update {
3877 my ($self) = @_; 4498 my ($self) = @_;
3878 4499
3879 $::WANT_REFRESH++; 4500 $::WANT_REFRESH = 1;
3880} 4501}
3881 4502
3882sub add { 4503sub add {
3883 my ($self, @children) = @_; 4504 my ($self, @children) = @_;
3884 4505
… …
3921 while ($self->{refresh_hook}) { 4542 while ($self->{refresh_hook}) {
3922 $_->() 4543 $_->()
3923 for values %{delete $self->{refresh_hook}}; 4544 for values %{delete $self->{refresh_hook}};
3924 } 4545 }
3925 4546
3926 if ($self->{realloc}) { 4547 while ($self->{realloc}) {
3927 my %queue; 4548 my %queue;
3928 my @queue; 4549 my @queue;
3929 my $widget; 4550 my $widget;
3930 4551
3931 outer: 4552 outer:
… …
3951 4572
3952 delete $queue{$widget+0}; 4573 delete $queue{$widget+0};
3953 4574
3954 my ($w, $h) = $widget->size_request; 4575 my ($w, $h) = $widget->size_request;
3955 4576
3956 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4577 $w += $widget->{padding_x} * 2;
3957 $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;
3958 4582
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4583 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4584 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961 4585
3962 $w = $widget->{force_w} if exists $widget->{force_w}; 4586 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3978 } 4602 }
3979 } 4603 }
3980 4604
3981 delete $self->{realloc}{$widget+0}; 4605 delete $self->{realloc}{$widget+0};
3982 } 4606 }
3983 }
3984 4607
3985 while (my $size_alloc = delete $self->{size_alloc}) { 4608 while (my $size_alloc = delete $self->{size_alloc}) {
3986 my @queue = sort { $b->{visible} <=> $a->{visible} } 4609 my @queue = sort { $a->{visible} <=> $b->{visible} }
3987 values %$size_alloc; 4610 values %$size_alloc;
3988 4611
3989 while () { 4612 while () {
3990 my $widget = pop @queue || last; 4613 my $widget = pop @queue || last;
3991 4614
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4615 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993 4616
3994 $w = 0 if $w < 0; 4617 $w = max $widget->{min_w}, $w;
3995 $h = 0 if $h < 0; 4618 $h = max $widget->{min_h}, $h;
3996 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
3997 $w = int $w + 0.5; 4626 $w = int $w + 0.5;
3998 $h = int $h + 0.5; 4627 $h = int $h + 0.5;
3999 4628
4000 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}) {
4001 $widget->{old_w} = $widget->{w}; 4630 $widget->{old_w} = $widget->{w};
4002 $widget->{old_h} = $widget->{h}; 4631 $widget->{old_h} = $widget->{h};
4003 4632
4004 $widget->{w} = $w; 4633 $widget->{w} = $w;
4005 $widget->{h} = $h; 4634 $widget->{h} = $h;
4006 4635
4007 $widget->emit (size_allocate => $w, $h); 4636 $widget->emit (size_allocate => $w, $h);
4637 }
4008 } 4638 }
4009 } 4639 }
4010 } 4640 }
4011 4641
4012 while ($self->{post_alloc_hook}) { 4642 while ($self->{post_alloc_hook}) {
4013 $_->() 4643 $_->()
4014 for values %{delete $self->{post_alloc_hook}}; 4644 for values %{delete $self->{post_alloc_hook}};
4015 } 4645 }
4016
4017 4646
4018 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4647 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4019 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4648 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4020 glClear GL_COLOR_BUFFER_BIT; 4649 glClear GL_COLOR_BUFFER_BIT;
4021 4650
… …
4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4653 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025 glMatrixMode GL_MODELVIEW; 4654 glMatrixMode GL_MODELVIEW;
4026 glLoadIdentity; 4655 glLoadIdentity;
4027 4656
4028 { 4657 {
4029 package CFClient::UI::Base; 4658 package DC::UI::Base;
4030 4659
4031 ($draw_x, $draw_y, $draw_w, $draw_h) = 4660 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h}); 4661 (0, 0, $self->{w}, $self->{h});
4033 }
4034 4662
4035 $self->_draw; 4663 $self->_draw;
4664 }
4036} 4665}
4037 4666
4038############################################################################# 4667#############################################################################
4039 4668
4040package CFClient::UI; 4669package DC::UI;
4041 4670
4042$ROOT = new CFClient::UI::Root; 4671$ROOT = new DC::UI::Root;
4043$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4672$TOOLTIP = new DC::UI::Tooltip z => 900;
4044 4673
40451 46741
4046

Diff Legend

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