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.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.476 by root, Sun Jan 11 23:45:52 2009 UTC

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

Diff Legend

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