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

Diff Legend

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