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.262 by elmex, Wed May 31 13:44:26 2006 UTC vs.
Revision 1.457 by root, Fri Dec 28 15:05:20 2007 UTC

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

Diff Legend

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