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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
132 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
133 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
183 } 190 }
184 } 191 }
185 192
186 reconfigure_widgets; 193 reconfigure_widgets;
187} 194}
… …
196 203
197sub new { 204sub new {
198 my $class = shift; 205 my $class = shift;
199 206
200 my $self = bless { 207 my $self = bless {
201 x => 0, 208 x => "center",
202 y => 0, 209 y => "center",
203 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
204 can_events => 1, 213 can_events => 1,
205 @_ 214 @_
206 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 218
208 for (keys %$self) { 219 for (keys %$self) {
209 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
211 } 222 }
212 } 223 }
213 224
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
221 } 235 }
222 236
223 $self 237 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 238}
235 239
236sub destroy { 240sub destroy {
237 my ($self) = @_; 241 my ($self) = @_;
238 242
… …
240 %$self = (); 244 %$self = ();
241} 245}
242 246
243sub show { 247sub show {
244 my ($self) = @_; 248 my ($self) = @_;
249
245 return if $self->{parent}; 250 return if $self->{parent};
246 251
247 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
248}
249
250sub show_centered {
251 my ($self) = @_;
252 return if $self->{parent};
253
254 $self->show;
255
256 $CFClient::UI::ROOT->on_post_alloc (
257 "centered $self" => sub {
258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
259 },
260 );
261} 253}
262 254
263sub set_visible { 255sub set_visible {
264 my ($self) = @_; 256 my ($self) = @_;
265 257
266 return if $self->{visible}; 258 return if $self->{visible};
267 259
268 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
270 262
271 $self->emit (visibility_change => 1) 263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
272} 268}
273 269
274sub set_invisible { 270sub set_invisible {
275 my ($self) = @_; 271 my ($self) = @_;
276 272
277 return unless $self->{visible}; 273 return unless $self->{visible};
278 274
279 # broken show/hide model 275 $_->set_invisible for $self->children;
280 276
277 delete $self->{visible};
281 delete $self->{root}; 278 delete $self->{root};
282 delete $self->{visible};
283 279
284 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
286 282
287 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
289 285
290 $self->focus_out; 286 $self->emit ("focus_out");
291
292 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
293} 305}
294 306
295sub hide { 307sub hide {
296 my ($self) = @_; 308 my ($self) = @_;
297 309
… …
299 311
300 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
301 if $self->{parent}; 313 if $self->{parent};
302} 314}
303 315
304sub move { 316sub move_abs {
305 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
306 318
307 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
308 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
309 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
310 322
311 $self->update; 323 $self->update;
312} 324}
313 325
314sub set_size { 326sub set_size {
315 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
316 328
317 $self->{def_w} = $w; 329 $self->{force_w} = $w;
318 $self->{def_h} = $h; 330 $self->{force_h} = $h;
319 331
320 $self->check_size; 332 $self->realloc;
321} 333}
322 334
323sub size_request { 335sub size_request {
324 require Carp; 336 require Carp;
325 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
327 339
328sub configure { 340sub configure {
329 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
330 342
331 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
332 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
333 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
334 348
335 # use alignment to adjust x, y 349 # use alignment to adjust x, y
336 350
337 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
338 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
339
340 ($w, $h) = ($w2, $h2);
341 } 353 }
342 354
343 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
344 $self->{x} = $x; 356 $self->{x} = $x;
345 $self->{y} = $y; 357 $self->{y} = $y;
346 $self->update; 358 $self->update;
347 } 359 }
348 360
349 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
351 }
352}
353 363
354sub size_allocate { 364 $self->{alloc_w} = $w;
355 # nothing to be done 365 $self->{alloc_h} = $h;
356}
357 366
358sub reconfigure { 367 $self->{root}{size_alloc}{$self+0} = $self;
359 my ($self) = @_; 368 }
360
361 $self->check_size (1);
362 $self->update;
363} 369}
364 370
365sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
366} 377}
367 378
368sub set_max_size { 379sub set_max_size {
369 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
370 381
371 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
372 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
373} 386}
374 387
375sub set_tooltip { 388sub set_tooltip {
376 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
377 390
… …
382 395
383 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
384 397
385 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
386 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
387 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
388 } 401 }
389} 402}
390 403
391# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
392sub coord2local { 405sub coord2local {
… …
400 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
401 414
402 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
403} 416}
404 417
405sub focus_in { 418sub invoke_focus_in {
406 my ($self) = @_; 419 my ($self) = @_;
407 420
408 return if $FOCUS == $self; 421 return if $FOCUS == $self;
409 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
410 423
411 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
412 425
413 $self->_emit (focus_in => $focus);
414
415 $focus->update if $focus; 426 $focus->update if $focus;
416 $FOCUS->update; 427 $FOCUS->update;
417}
418 428
429 0
430}
431
419sub focus_out { 432sub invoke_focus_out {
420 my ($self) = @_; 433 my ($self) = @_;
421 434
422 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
423 436
424 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
425 438
426 $self->_emit (focus_out => $focus);
427
428 $focus->update if $focus; #? 439 $focus->update if $focus; #?
429 440
430 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
431 unless $FOCUS; 442 unless $FOCUS;
432}
433 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
434sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
435sub button_up { } 454sub invoke_button_up { 1 }
436sub key_down { } 455sub invoke_key_down { 1 }
437sub key_up { } 456sub invoke_key_up { 1 }
438 457
439sub button_down { 458sub invoke_button_down {
440 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
441 460
442 $self->focus_in; 461 $self->grab_focus;
443}
444 462
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
449sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479}
480
481sub find_widget {
482 my ($self, $x, $y) = @_;
483
484 return () unless $self->{can_events};
485
486 return $self
487 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
488 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
489
490 ()
491}
492
493sub set_parent {
494 my ($self, $parent) = @_;
495
496 Scalar::Util::weaken ($self->{parent} = $parent);
497 $self->set_visible if $parent->{visible};
498}
499
500sub realloc {
501 my ($self) = @_;
502
503 if ($self->{visible}) {
504 return if $self->{root}{realloc}{$self+0};
505
506 $self->{root}{realloc}{$self+0} = $self;
507 $self->{root}->update;
508 } else {
509 delete $self->{req_w};
510 delete $self->{req_h};
511 }
512}
513
514sub update {
515 my ($self) = @_;
516
517 $self->{parent}->update
518 if $self->{parent};
519}
520
521sub reconfigure {
522 my ($self) = @_;
523
524 $self->realloc;
525 $self->update;
526}
527
528# using global variables seems a bit hacky, but passing through all drawing
529# functions seems pointless.
530our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
450 531
451sub draw { 532sub draw {
452 my ($self) = @_; 533 my ($self) = @_;
453 534
454 return unless $self->{h} && $self->{w}; 535 return unless $self->{h} && $self->{w};
536
537 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542
543 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
455 546
456 glPushMatrix; 547 glPushMatrix;
457 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
458 $self->_draw;
459 glPopMatrix;
460 549
461 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
462 my ($x, $y) = @$self{qw(x y)};
463
464 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
465 glEnable GL_BLEND; 552 glEnable GL_BLEND;
466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
467 glBegin GL_QUADS; 554 glBegin GL_QUADS;
468 glVertex $x , $y; 555 glVertex 0 , 0;
469 glVertex $x + $self->{w}, $y; 556 glVertex $self->{w}, 0;
470 glVertex $x + $self->{w}, $y + $self->{h}; 557 glVertex $self->{w}, $self->{h};
471 glVertex $x , $y + $self->{h}; 558 glVertex 0 , $self->{h};
472 glEnd; 559 glEnd;
473 glDisable GL_BLEND; 560 glDisable GL_BLEND;
474 } 561 }
475 562
476 if ($ENV{PCLIENT_DEBUG}) { 563 if ($ENV{CFPLUS_DEBUG} & 1) {
477 glPushMatrix; 564 glPushMatrix;
478 glColor 1, 1, 0, 1; 565 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 566 glTranslate 0.375, 0.375;
480 glBegin GL_LINE_LOOP; 567 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 568 glVertex 0 , 0;
482 glVertex $self->{w} - 1, 0; 569 glVertex $self->{w} - 1, 0;
483 glVertex $self->{w} - 1, $self->{h} - 1; 570 glVertex $self->{w} - 1, $self->{h} - 1;
484 glVertex 0 , $self->{h} - 1; 571 glVertex 0 , $self->{h} - 1;
485 glEnd; 572 glEnd;
486 glPopMatrix; 573 glPopMatrix;
487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
488 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
489} 579}
490 580
491sub _draw { 581sub _draw {
492 my ($self) = @_; 582 my ($self) = @_;
493 583
494 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
495} 585}
496 586
497sub find_widget {
498 my ($self, $x, $y) = @_;
499
500 return () unless $self->{can_events};
501
502 return $self
503 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506 ()
507}
508
509sub set_parent {
510 my ($self, $parent) = @_;
511
512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible;
515
516 $self->check_size;
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555}
556
557sub DESTROY { 587sub DESTROY {
558 my ($self) = @_; 588 my ($self) = @_;
559 589
560 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
561 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
562} 594}
563 595
564############################################################################# 596#############################################################################
565 597
566package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
591 623
592 if ($color && (@$color < 4 || $color->[3])) { 624 if ($color && (@$color < 4 || $color->[3])) {
593 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
594 626
595 glEnable GL_BLEND; 627 glEnable GL_BLEND;
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
597 glColor @$color; 629 glColor_premultiply @$color;
598 630
599 glBegin GL_QUADS; 631 glBegin GL_QUADS;
600 glVertex 0 , 0; 632 glVertex 0 , 0;
601 glVertex 0 , $h; 633 glVertex 0 , $h;
602 glVertex $w, $h; 634 glVertex $w, $h;
… …
617 my ($class, %arg) = @_; 649 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 650 $class->SUPER::new (can_events => 0, %arg);
619} 651}
620 652
621sub size_request { 653sub size_request {
622 (0, 0) 654 my ($self) = @_;
655
656 ($self->{w} + 0, $self->{h} + 0)
623} 657}
624 658
625sub draw { } 659sub draw { }
626 660
627############################################################################# 661#############################################################################
… …
631our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
632 666
633sub new { 667sub new {
634 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
635 669
636 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
637 671
638 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
639 children => [], 673 children => [],
640 can_events => 0, 674 can_events => 0,
641 %arg, 675 %arg,
642 ); 676 );
677
643 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
644 680
645 $self 681 $self
646} 682}
647 683
648sub add { 684sub add {
… …
656 $self->{children} = [ 692 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 693 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 694 @{$self->{children}}, @widgets
659 ]; 695 ];
660 696
661 $self->check_size (1); 697 $self->realloc;
662 $self->update;
663} 698}
664 699
665sub children { 700sub children {
666 @{ $_[0]{children} } 701 @{ $_[0]{children} }
667} 702}
… …
672 delete $child->{parent}; 707 delete $child->{parent};
673 $child->hide; 708 $child->hide;
674 709
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 710 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 711
677 $self->check_size (1); 712 $self->realloc;
678 $self->update;
679} 713}
680 714
681sub clear { 715sub clear {
682 my ($self) = @_; 716 my ($self) = @_;
683 717
… …
687 for (@$children) { 721 for (@$children) {
688 delete $_->{parent}; 722 delete $_->{parent};
689 $_->hide; 723 $_->hide;
690 } 724 }
691 725
692 $self->check_size; 726 $self->realloc;
693 $self->update;
694} 727}
695 728
696sub find_widget { 729sub find_widget {
697 my ($self, $x, $y) = @_; 730 my ($self, $x, $y) = @_;
698 731
699 $x -= $self->{x}; 732 $x -= $self->{x};
700 $y -= $self->{y}; 733 $y -= $self->{y};
701 734
702 my $res; 735 my $res;
703 736
704 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
705 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
706 and return $res; 739 and return $res;
707 } 740 }
708 741
709 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
730} 763}
731 764
732sub add { 765sub add {
733 my ($self, $child) = @_; 766 my ($self, $child) = @_;
734 767
735 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
736
737 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
738} 770}
739 771
740sub remove { 772sub remove {
741 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
750 782
751sub size_request { 783sub size_request {
752 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
753} 785}
754 786
755sub size_allocate { 787sub invoke_size_allocate {
756 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
757 789
758 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
759} 793}
760 794
761############################################################################# 795#############################################################################
796
797# back-buffered drawing area
762 798
763package CFClient::UI::Window; 799package CFClient::UI::Window;
764 800
765our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
766 802
… …
777 813
778 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
779 $self->SUPER::update; 815 $self->SUPER::update;
780} 816}
781 817
782sub size_allocate { 818sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
784 820
785 $self->SUPER::size_allocate ($w, $h);
786 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
787} 824}
788 825
789sub _render { 826sub _render {
827 my ($self) = @_;
828
790 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
791} 830}
792 831
793sub render_child { 832sub render_child {
794 my ($self) = @_; 833 my ($self) = @_;
795 834
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
799 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
800 $self->_render; 846 $self->_render;
801 }; 847 };
802} 848}
803 849
804sub _draw { 850sub _draw {
805 my ($self) = @_; 851 my ($self) = @_;
806 852
807 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
808 854
809 my $tex = $self->{texture} 855 my $tex = $self->{texture}
810 or return; 856 or return;
811 857
812 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
815 861
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 863
818 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
819} 865}
… …
835} 881}
836 882
837sub size_request { 883sub size_request {
838 my ($self) = @_; 884 my ($self) = @_;
839 885
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 887
842 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
843} 889 $h = 10 if $self->{scroll_y};
844 890
891 ($w, $h)
892}
893
845sub size_allocate { 894sub invoke_size_allocate {
846 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
847 896
897 my $child = $self->child;
898
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 901
851 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
852 $self->update; 903 $self->update;
904
905 1
853} 906}
854 907
855sub set_offset { 908sub set_offset {
856 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
857 910
… …
890} 943}
891 944
892sub _render { 945sub _render {
893 my ($self) = @_; 946 my ($self) = @_;
894 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896 952
897 $self->SUPER::_render; 953 $self->SUPER::_render;
898} 954}
899 955
… …
902package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
903 959
904our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
905 961
906sub new { 962sub new {
907 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
908 966
909 my $self; 967 my $self;
910 968
911 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
912 vertical => 1, 970 vertical => 1,
… …
917 ; 975 ;
918 976
919 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
920 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
921 slider => $slider, 979 slider => $slider,
922 @_, 980 %arg,
923 ); 981 );
924 982
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
928 985
929 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
930} 993}
931 994
932sub update { 995sub update {
933 my ($self) = @_; 996 my ($self) = @_;
934 997
… …
937 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940} 1003}
941 1004
942sub size_allocate { 1005sub invoke_size_allocate {
943 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
944
945 $self->SUPER::size_allocate ($w, $h);
946 1007
947 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
949} 1012}
950 1013
951#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
952# update viewport offset on scroll 1015# update viewport offset on scroll
953 1016
… …
973 1036
974 if ($self->{bg}) { 1037 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
976 1039
977 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
979 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
980 1043
981 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
982 glVertex 0 , 0; 1045 glVertex 0 , 0;
983 glVertex 0 , $h; 1046 glVertex 0 , $h;
984 glVertex $w, $h; 1047 glVertex $w, $h;
… …
997 1060
998our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
999 1062
1000use CFClient::OpenGL; 1063use CFClient::OpenGL;
1001 1064
1002my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1072
1006sub new { 1073sub new {
1007 my $class = shift; 1074 my ($class, %arg) = @_;
1008 1075
1009 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1010 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1011 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1012 border => 0.6, 1079 border => 0.6,
1013 is_toplevel => 1,
1014 can_events => 1, 1080 can_events => 1,
1015 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
1016 ); 1084 );
1017 1085
1018 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1019 align => 0, 1087 align => 0,
1020 valign => 1, 1088 valign => 1,
1021 text => $self->{title}, 1089 text => $self->{title},
1022 fontsize => $self->{border}; 1090 fontsize => $self->{border},
1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 image => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1023 1101
1024 $self 1102 $self
1103}
1104
1105sub add {
1106 my ($self, @widgets) = @_;
1107
1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1025} 1111}
1026 1112
1027sub border { 1113sub border {
1028 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1029} 1115}
1030 1116
1031sub size_request { 1117sub size_request {
1032 my ($self) = @_; 1118 my ($self) = @_;
1119
1120 $self->{title_widget}->size_request
1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1033 1125
1034 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1035 1127
1036 ( 1128 (
1037 $w + $self->border * 2, 1129 $w + $self->border * 2,
1038 $h + $self->border * 2, 1130 $h + $self->border * 2,
1039 ) 1131 )
1040} 1132}
1041 1133
1042sub size_allocate { 1134sub invoke_size_allocate {
1043 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
1044 1136
1137 if ($self->{title_widget}) {
1138 $self->{title_widget}{w} = $w;
1139 $self->{title_widget}{h} = $h;
1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1141 }
1142
1143 my $border = $self->border;
1144
1045 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1046 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1047 1147
1048 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1049 if $self->{title};
1050
1051 $self->child->configure ($self->border, $self->border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1052}
1053 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1054sub button_down { 1156sub invoke_button_down {
1055 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1056 1158
1057 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1058 my $border = $self->border; 1160 my $border = $self->border;
1059 1161
… …
1072 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1073 1175
1074 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1075 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1076 1178
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1081 $self->move ($self->{user_x}, $self->{user_y}); 1181
1082 $self->check_size; 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1183 $self->realloc;
1083 }; 1184 };
1084 1185
1085 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1086 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1087 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1089 $self->{motion} = sub { 1190 $self->{motion} = sub {
1090 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1091 1192
1092 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1093 1194
1094 $self->{user_x} = $bx + $x - $ox; 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1095 $self->{user_y} = $by + $y - $oy; 1196 # HACK: the next line is required to enforce placement
1096 1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1097 $self->move ($self->{user_x}, $self->{user_y});
1098 $self->update;
1099 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1100 } 1203 1
1101} 1204}
1102 1205
1103sub button_up { 1206sub invoke_button_up {
1104 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1105 1208
1106 delete $self->{motion}; 1209 ! ! delete $self->{motion}
1107} 1210}
1108 1211
1109sub mouse_motion { 1212sub invoke_mouse_motion {
1110 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1111 1214
1112 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
1113} 1218}
1114 1219
1115sub _draw { 1220sub _draw {
1116 my ($self) = @_; 1221 my ($self) = @_;
1117 1222
1223 my $child = $self->{children}[0];
1224
1118 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
1119 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
1120 1227
1121 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
1122 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1123 1230
1124 my $border = $self->border; 1231 my $border = $self->border;
1125 1232
1126 glColor @{ $self->{border_bg} }; 1233 glColor @{ $self->{border_bg} };
1127 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1234 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1128 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1129 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1130 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1131 1238
1132 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1133 my $bg = $tex[0]; 1240 glColor @{ $self->{bg} };
1134 1241
1135 # TODO: repeat texture not scale 1242 # TODO: repeat texture not scale
1243 # solve this better(?)
1136 my $rep_x = $cw / $bg->{w}; 1244 $bg->{s} = $cw / $bg->{w};
1137 my $rep_y = $ch / $bg->{h}; 1245 $bg->{t} = $ch / $bg->{h};
1138
1139 glColor @{ $self->{bg} };
1140
1141 $bg->{s} = $rep_x;
1142 $bg->{t} = $rep_y;
1143 $bg->{wrap_mode} = 1;
1144 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145 } 1247 }
1146 1248
1147 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1148 1250
1149 $self->{title}->draw if $self->{title};
1150
1151 $self->child->draw; 1251 $child->draw;
1252
1253 if ($self->{title_widget}) {
1254 glTranslate 0, $border - $self->{h};
1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1152} 1262}
1153 1263
1154############################################################################# 1264#############################################################################
1155 1265
1156package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1178 my ($self, $x, $y, $child) = @_; 1288 my ($self, $x, $y, $child) = @_;
1179 1289
1180 $child->set_parent ($self); 1290 $child->set_parent ($self);
1181 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1182 1292
1183 $self->check_size (1); 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1184} 1300}
1185 1301
1186# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1187sub clear { 1303sub clear {
1188 my ($self) = @_; 1304 my ($self) = @_;
… …
1193 for (@children) { 1309 for (@children) {
1194 delete $_->{parent}; 1310 delete $_->{parent};
1195 $_->hide; 1311 $_->hide;
1196 } 1312 }
1197 1313
1198 $self->check_size (1); 1314 $self->realloc;
1199 $self->update;
1200} 1315}
1201 1316
1202sub get_wh { 1317sub get_wh {
1203 my ($self) = @_; 1318 my ($self) = @_;
1204 1319
… …
1230 (sum @$ws), 1345 (sum @$ws),
1231 (sum @$hs), 1346 (sum @$hs),
1232 ) 1347 )
1233} 1348}
1234 1349
1235sub size_allocate { 1350sub invoke_size_allocate {
1236 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1237 1352
1238 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1239 1354
1240 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1272 } 1387 }
1273 1388
1274 $y += $row_h; 1389 $y += $row_h;
1275 } 1390 }
1276 1391
1392 1
1277} 1393}
1278 1394
1279sub find_widget { 1395sub find_widget {
1280 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1281 1397
… …
1318 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1320 ) 1436 )
1321} 1437}
1322 1438
1323sub size_allocate { 1439sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1325 1441
1326 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1327 my $children = $self->{children}; 1443 my $children = $self->{children};
1328 1444
1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1445 my @req;
1330 my $req = List::Util::sum @req;
1331 1446
1332 if ($req > $space) { 1447 if ($self->{homogeneous}) {
1333 # ah well, not enough space 1448 @req = ($space / (@$children || 1)) x @$children;
1334 $_ *= $space / $req for @req;
1335 } else { 1449 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1451 my $req = List::Util::sum @req;
1452
1453 if ($req > $space) {
1454 # ah well, not enough space
1455 $_ *= $space / $req for @req;
1456 } else {
1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1337 1458
1459 $space = ($space - $req) / $expand; # remaining space to give away
1460
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand 1461 $req[$_] += $space * $children->[$_]{expand}
1339 for 0 .. $#$children; 1462 for 0 .. $#$children;
1463 }
1340 } 1464 }
1341 1465
1342 CFClient::UI::harmonize \@req; 1466 CFClient::UI::harmonize \@req;
1343 1467
1344 my $pos = 0; 1468 my $pos = 0;
… …
1404 ellipsise => 3, # end 1528 ellipsise => 3, # end
1405 layout => (new CFClient::Layout), 1529 layout => (new CFClient::Layout),
1406 fontsize => 1, 1530 fontsize => 1,
1407 align => -1, 1531 align => -1,
1408 valign => -1, 1532 valign => -1,
1409 padding => 2, 1533 padding_x => 2,
1534 padding_y => 2,
1410 can_events => 0, 1535 can_events => 0,
1411 %arg 1536 %arg
1412 ); 1537 );
1413 1538
1414 if (exists $self->{template}) { 1539 if (exists $self->{template}) {
… …
1441 1566
1442 delete $self->{texture}; 1567 delete $self->{texture};
1443 $self->SUPER::update; 1568 $self->SUPER::update;
1444} 1569}
1445 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1446sub set_text { 1578sub set_text {
1447 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1448 1580
1449 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1450 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1451 1583
1452 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1453 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1454 1586
1587 delete $self->{size_req};
1588 $self->realloc;
1455 $self->update; 1589 $self->update;
1456 $self->check_size;
1457} 1590}
1458 1591
1459sub set_markup { 1592sub set_markup {
1460 my ($self, $markup) = @_; 1593 my ($self, $markup) = @_;
1461 1594
… …
1465 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466 1599
1467 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1468 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1469 1602
1603 delete $self->{size_req};
1604 $self->realloc;
1470 $self->update; 1605 $self->update;
1471 $self->check_size;
1472} 1606}
1473 1607
1474sub size_request { 1608sub size_request {
1475 my ($self) = @_; 1609 my ($self) = @_;
1476 1610
1611 $self->{size_req} ||= do {
1477 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1478 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1479 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1480 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1481 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1482 1617
1483 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1484 1619
1485 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1486 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1487 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1488 1623
1489 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1490 1625
1491 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1492 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1493 } 1631 };
1494 1632
1495 ( 1633 @{ $self->{size_req} }
1496 $w + $self->{padding} * 2,
1497 $h + $self->{padding} * 2,
1498 )
1499} 1634}
1500 1635
1501sub size_allocate { 1636sub invoke_size_allocate {
1502 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1503 1638
1639 delete $self->{ox};
1640
1504 delete $self->{texture}; 1641 delete $self->{texture}
1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1505} 1645}
1506 1646
1507sub set_fontsize { 1647sub set_fontsize {
1508 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1509 1649
1510 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1511 delete $self->{texture}; 1651 delete $self->{texture};
1512 1652
1513 $self->update; 1653 $self->realloc;
1514 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1515} 1662}
1516 1663
1517sub _draw { 1664sub _draw {
1518 my ($self) = @_; 1665 my ($self) = @_;
1519 1666
… …
1525 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1526 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529 1676
1530 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1531 1679
1680 unless (exists $self->{ox}) {
1532 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1533 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1534 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1535 1684
1536 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1537 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1538 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1539
1540 $tex
1541 }; 1688 };
1542 1689
1543 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1545 1694
1546 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1547 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1548 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1549 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1550 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1551 } 1702 }
1552 1703
1553 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1554} 1705}
1555 1706
… …
1572 can_hover => 1, 1723 can_hover => 1,
1573 can_focus => 1, 1724 can_focus => 1,
1574 valign => 0, 1725 valign => 0,
1575 can_events => 1, 1726 can_events => 1,
1576 #text => ... 1727 #text => ...
1728 #hidden => "*",
1577 @_ 1729 @_
1578 ) 1730 )
1579} 1731}
1580 1732
1581sub _set_text { 1733sub _set_text {
… …
1583 1735
1584 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1585 1737
1586 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1587 1739
1588 delete $self->{texture};
1589
1590 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1591 $self->{text} = $text; 1741 $self->{text} = $text;
1592 1742
1593 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1594 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1595 1746
1596 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1597} 1751}
1598 1752
1599sub set_text { 1753sub set_text {
1600 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1601 1755
1602 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1603 $self->_set_text ($text); 1757 $self->_set_text ($text);
1604 $self->update;
1605 $self->check_size;
1606} 1758}
1607 1759
1608sub get_text { 1760sub get_text {
1609 $_[0]{text} 1761 $_[0]{text}
1610} 1762}
… …
1615 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1616 1768
1617 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1618} 1770}
1619 1771
1620sub key_down { 1772sub invoke_key_down {
1621 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1622 1774
1623 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1624 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1625 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1637 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1638 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1639 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1640 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1641 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1642 $self->_emit ('escape'); 1794 $self->emit ('escape');
1643 } elsif ($uni) { 1795 } elsif ($uni) {
1644 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1645 } 1799 }
1646 1800
1647 $self->_set_text ($text); 1801 $self->_set_text ($text);
1648 $self->update;
1649 $self->check_size;
1650}
1651 1802
1803 $self->realloc;
1804
1805 1
1806}
1807
1652sub focus_in { 1808sub invoke_focus_in {
1653 my ($self) = @_; 1809 my ($self) = @_;
1654 1810
1655 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1656 1812
1657 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1658} 1814}
1659 1815
1660sub button_down { 1816sub invoke_button_down {
1661 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1662 1818
1663 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1664 1820
1665 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1666 1822
1667 # byte-index to char-index 1823 # byte-index to char-index
1668 my $text = $self->{text}; 1824 my $text = $self->{text};
1669 utf8::encode $text; 1825 utf8::encode $text;
1670 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1671 1827
1672 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1673 $self->update; 1829 $self->update;
1830
1831 1
1674} 1832}
1675 1833
1676sub mouse_motion { 1834sub invoke_mouse_motion {
1677 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1678# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 1
1679} 1839}
1680 1840
1681sub _draw { 1841sub _draw {
1682 my ($self) = @_; 1842 my ($self) = @_;
1683 1843
1684 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1685 1845
1686 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1687 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1688 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1689 } else { 1849 } else {
1690 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1691 } 1851 }
1692 1852
1693 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1694 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1695 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1696 glVertex 0 , 0; 1856 glVertex 0 , 0;
1697 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1698 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1699 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1724 1884
1725our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1726 1886
1727use CFClient::OpenGL; 1887use CFClient::OpenGL;
1728 1888
1729sub key_down { 1889sub invoke_key_down {
1730 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1731 1891
1732 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1733 1893
1734 if ($sym == 13) { 1894 if ($sym == 13) {
1735 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1736 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1737 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1738 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1739 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1740 $self->update; 1901 $self->update;
1741 1902
1742 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1743 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1744 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1760 } else { 1921 } else {
1761 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1762 } 1923 }
1763 1924
1764 } else { 1925 } else {
1765 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1766 } 1929 1
1767
1768} 1930}
1769 1931
1770############################################################################# 1932#############################################################################
1771 1933
1772package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1781 1943
1782sub new { 1944sub new {
1783 my $class = shift; 1945 my $class = shift;
1784 1946
1785 $class->SUPER::new ( 1947 $class->SUPER::new (
1786 padding => 4, 1948 padding_x => 4,
1949 padding_y => 4,
1787 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1788 active_fg => [0, 0, 1], 1951 active_fg => [0, 0, 1],
1789 can_hover => 1, 1952 can_hover => 1,
1790 align => 0, 1953 align => 0,
1791 valign => 0, 1954 valign => 0,
1792 can_events => 1, 1955 can_events => 1,
1793 @_ 1956 @_
1794 ) 1957 )
1795} 1958}
1796 1959
1797sub activate { }
1798
1799sub button_up { 1960sub invoke_button_up {
1800 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1801 1962
1802 $self->emit ("activate") 1963 $self->emit ("activate")
1803 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1804 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
1966
1967 1
1805} 1968}
1806 1969
1807sub _draw { 1970sub _draw {
1808 my ($self) = @_; 1971 my ($self) = @_;
1809 1972
1810 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1811
1812 if ($GRAB == $self) {
1813 $self->{fg} = $self->{active_fg};
1814 }
1815 1974
1816 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1818 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1819 1978
… …
1824 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1825} 1984}
1826 1985
1827############################################################################# 1986#############################################################################
1828 1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
2020}
2021
2022#############################################################################
2023
1829package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
1830 2025
1831our @ISA = CFClient::UI::DrawBG::; 2026our @ISA = CFClient::UI::DrawBG::;
1832 2027
1833my @tex = 2028my @tex =
… …
1838 2033
1839sub new { 2034sub new {
1840 my $class = shift; 2035 my $class = shift;
1841 2036
1842 $class->SUPER::new ( 2037 $class->SUPER::new (
1843 padding => 2, 2038 padding_x => 2,
2039 padding_y => 2,
1844 fg => [1, 1, 1], 2040 fg => [1, 1, 1],
1845 active_fg => [1, 1, 0], 2041 active_fg => [1, 1, 0],
1846 bg => [0, 0, 0, 0.2], 2042 bg => [0, 0, 0, 0.2],
1847 active_bg => [1, 1, 1, 0.5], 2043 active_bg => [1, 1, 1, 0.5],
1848 state => 0, 2044 state => 0,
… …
1852} 2048}
1853 2049
1854sub size_request { 2050sub size_request {
1855 my ($self) = @_; 2051 my ($self) = @_;
1856 2052
1857 ($self->{padding} * 2 + 6) x 2 2053 (6) x 2
1858} 2054}
1859 2055
1860sub button_down { 2056sub invoke_button_down {
1861 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1862 2058
1863 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1864 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1865 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1866 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1867 } 2067 1
1868} 2068}
1869 2069
1870sub _draw { 2070sub _draw {
1871 my ($self) = @_; 2071 my ($self) = @_;
1872 2072
1873 $self->SUPER::_draw; 2073 $self->SUPER::_draw;
1874 2074
1875 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1876 2076
1877 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2077 my ($w, $h) = @$self{qw(w h)};
2078
2079 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1878 2080
1879 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1880 2082
1881 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
1882 2084
… …
2037 2239
2038 my $h1 = $self->{h} * (1 - $ycut1); 2240 my $h1 = $self->{h} * (1 - $ycut1);
2039 my $h2 = $self->{h} * (1 - $ycut2); 2241 my $h2 = $self->{h} * (1 - $ycut2);
2040 2242
2041 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
2042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2043 glEnable GL_TEXTURE_2D; 2246 glEnable GL_TEXTURE_2D;
2044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2045 2248
2046 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2249 glBindTexture GL_TEXTURE_2D, $t1->{name};
2047 glBegin GL_QUADS; 2250 glBegin GL_QUADS;
… …
2147 fg => [1, 1, 1], 2350 fg => [1, 1, 1],
2148 active_fg => [0, 0, 0], 2351 active_fg => [0, 0, 0],
2149 bg => [0, 0, 0, 0.2], 2352 bg => [0, 0, 0, 0.2],
2150 active_bg => [1, 1, 1, 0.5], 2353 active_bg => [1, 1, 1, 0.5],
2151 range => [0, 0, 100, 10, 0], 2354 range => [0, 0, 100, 10, 0],
2152 req_w => $::WIDTH / 80, 2355 min_w => $::WIDTH / 80,
2153 req_h => $::WIDTH / 80, 2356 min_h => $::WIDTH / 80,
2154 vertical => 0, 2357 vertical => 0,
2155 can_hover => 1, 2358 can_hover => 1,
2156 inner_pad => 0.02, 2359 inner_pad => 0.02,
2157 @_ 2360 @_
2158 ); 2361 );
… …
2166sub set_range { 2369sub set_range {
2167 my ($self, $range) = @_; 2370 my ($self, $range) = @_;
2168 2371
2169 ($range, $self->{range}) = ($self->{range}, $range); 2372 ($range, $self->{range}) = ($self->{range}, $range);
2170 2373
2171 $self->update
2172 if "@$range" ne "@{$self->{range}}"; 2374 if ("@$range" ne "@{$self->{range}}") {
2375 $self->update;
2376 $self->set_value ($self->{range}[0]);
2377 }
2173} 2378}
2174 2379
2175sub set_value { 2380sub set_value {
2176 my ($self, $value) = @_; 2381 my ($self, $value) = @_;
2177 2382
… …
2188 if $unit; 2393 if $unit;
2189 2394
2190 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2191 2396
2192 if ($value != $old_value) { 2397 if ($value != $old_value) {
2193 $self->_emit (changed => $value); 2398 $self->emit (changed => $value);
2194 $self->update; 2399 $self->update;
2195 } 2400 }
2196} 2401}
2197 2402
2198sub size_request { 2403sub size_request {
2199 my ($self) = @_; 2404 my ($self) = @_;
2200 2405
2201 my $w = $self->{req_w}; 2406 ($self->{req_w}, $self->{req_h})
2202 my $h = $self->{req_h};
2203
2204 $self->{vertical} ? ($h, $w) : ($w, $h)
2205} 2407}
2206 2408
2207sub button_down { 2409sub invoke_button_down {
2208 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2209 2411
2210 $self->SUPER::button_down ($ev, $x, $y); 2412 $self->SUPER::invoke_button_down ($ev, $x, $y);
2211 2413
2212 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2213 2415
2214 $self->mouse_motion ($ev, $x, $y); 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2215} 2417}
2216 2418
2217sub mouse_motion { 2419sub invoke_mouse_motion {
2218 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2219 2421
2220 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2221 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2222 2424
2223 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2425 my (undef, $lo, $hi, $page) = @{$self->{range}};
2224 2426
2225 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2427 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2226 2428
2227 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2429 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2430 } else {
2431 return 0;
2432 }
2433
2228 } 2434 1
2229} 2435}
2230 2436
2231sub update { 2437sub update {
2232 my ($self) = @_; 2438 my ($self) = @_;
2233 2439
2234 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2440 delete $self->{knob_w};
2441 $self->SUPER::update;
2442}
2443
2444sub _draw {
2445 my ($self) = @_;
2446
2447 unless ($self->{knob_w}) {
2235 $self->set_value ($self->{range}[0]); 2448 $self->set_value ($self->{range}[0]);
2236 2449
2237 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2450 my ($value, $lo, $hi, $page) = @{$self->{range}};
2238 my $range = ($hi - $page - $lo) || 1e-100; 2451 my $range = ($hi - $page - $lo) || 1e-100;
2239 2452
… …
2245 $value = ($value - $lo) / $range; 2458 $value = ($value - $lo) / $range;
2246 $value = $value * $self->{scale} + $self->{offset}; 2459 $value = $value * $self->{scale} + $self->{offset};
2247 2460
2248 $self->{knob_x} = $value - $knob_w * 0.5; 2461 $self->{knob_x} = $value - $knob_w * 0.5;
2249 $self->{knob_w} = $knob_w; 2462 $self->{knob_w} = $knob_w;
2250 }); 2463 }
2251
2252 $self->SUPER::update;
2253}
2254
2255sub _draw {
2256 my ($self) = @_;
2257 2464
2258 $self->SUPER::_draw (); 2465 $self->SUPER::_draw ();
2259 2466
2260 glScale $self->{w}, $self->{h}; 2467 glScale $self->{w}, $self->{h};
2261 2468
… …
2322sub set_range { shift->{slider}->set_range (@_) } 2529sub set_range { shift->{slider}->set_range (@_) }
2323sub set_value { shift->{slider}->set_value (@_) } 2530sub set_value { shift->{slider}->set_value (@_) }
2324 2531
2325############################################################################# 2532#############################################################################
2326 2533
2327package CFClient::UI::TextView; 2534package CFClient::UI::TextScroller;
2328 2535
2329our @ISA = CFClient::UI::HBox::; 2536our @ISA = CFClient::UI::HBox::;
2330 2537
2331use CFClient::OpenGL; 2538use CFClient::OpenGL;
2332 2539
… …
2334 my $class = shift; 2541 my $class = shift;
2335 2542
2336 my $self = $class->SUPER::new ( 2543 my $self = $class->SUPER::new (
2337 fontsize => 1, 2544 fontsize => 1,
2338 can_events => 0, 2545 can_events => 0,
2546 indent => 0,
2339 #font => default_font 2547 #font => default_font
2340 @_, 2548 @_,
2341 2549
2342 layout => (new CFClient::Layout 1), 2550 layout => (new CFClient::Layout 1),
2343 par => [], 2551 par => [],
… …
2358 2566
2359 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2360 $self->reflow; 2568 $self->reflow;
2361} 2569}
2362 2570
2363sub size_allocate { 2571sub invoke_size_allocate {
2364 my ($self, $w, $h) = @_; 2572 my ($self, $w, $h) = @_;
2365
2366 $self->SUPER::size_allocate ($w, $h);
2367 2573
2368 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2369 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2370 $self->{layout}->set_width ($self->{children}[0]{w}); 2576 $self->{layout}->set_width ($self->{children}[0]{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2371 2578
2372 $self->reflow; 2579 $self->reflow;
2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2373} 2582}
2374 2583
2375sub text_size { 2584sub text_size {
2376 my ($self, $text, $indent) = @_; 2585 my ($self, $text, $indent) = @_;
2377 2586
2378 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2379 2588
2380 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2381 $layout->set_width ($self->{children}[0]{w} - $indent); 2590 $layout->set_width ($self->{children}[0]{w} - $indent);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2382 $layout->set_markup ($text); 2592 $layout->set_markup ($text);
2383 2593
2384 $layout->size 2594 $layout->size
2385} 2595}
2386 2596
… …
2425 2635
2426 return unless $self->{h} > 0; 2636 return unless $self->{h} > 0;
2427 2637
2428 delete $self->{texture}; 2638 delete $self->{texture};
2429 2639
2430 $ROOT->on_post_alloc ($self, sub { 2640 $ROOT->on_post_alloc ($self => sub {
2431 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2432 2642
2433 if (delete $self->{need_reflow}) { 2643 if (delete $self->{need_reflow}) {
2434 my $height = 0; 2644 my $height = 0;
2435 2645
… …
2438 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2439 2649
2440 for (@{$self->{par}}) { 2650 for (@{$self->{par}}) {
2441 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2442 $layout->set_width ($W - $_->[3]); 2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2443 $layout->set_markup ($_->[4]); 2654 $layout->set_markup ($_->[4]);
2444 my ($w, $h) = $layout->size; 2655 my ($w, $h) = $layout->size;
2445 $_->[0] = $w + $_->[3]; 2656 $_->[0] = $w + $_->[3];
2446 $_->[1] = $h; 2657 $_->[1] = $h;
2447 } 2658 }
… …
2450 } 2661 }
2451 2662
2452 $self->{height} = $height; 2663 $self->{height} = $height;
2453 2664
2454 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2455 2666
2456 delete $self->{texture}; 2667 delete $self->{texture};
2457 } 2668 }
2458 2669
2459 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2460 glClearColor 0.5, 0.5, 0.5, 0; 2671 glClearColor 0, 0, 0, 0;
2461 glClear GL_COLOR_BUFFER_BIT; 2672 glClear GL_COLOR_BUFFER_BIT;
2462 2673
2463 my $top = int $self->{children}[1]{range}[0]; 2674 my $top = int $self->{children}[1]{range}[0];
2464 2675
2465 my $y0 = $top; 2676 my $y0 = $top;
… …
2479 my $h = $par->[1]; 2690 my $h = $par->[1];
2480 2691
2481 if ($y0 < $y + $h && $y < $y1) { 2692 if ($y0 < $y + $h && $y < $y1) {
2482 $layout->set_foreground (@{ $par->[2] }); 2693 $layout->set_foreground (@{ $par->[2] });
2483 $layout->set_width ($W - $par->[3]); 2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 $layout->set_markup ($par->[4]); 2696 $layout->set_markup ($par->[4]);
2485 2697
2486 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2698 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2487 2699
2488 glRasterPos $par->[3], $y - $y0; 2700 glRasterPos $par->[3], $y - $y0;
… …
2500sub _draw { 2712sub _draw {
2501 my ($self) = @_; 2713 my ($self) = @_;
2502 2714
2503 glEnable GL_TEXTURE_2D; 2715 glEnable GL_TEXTURE_2D;
2504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2505 glColor 1, 1, 1, 1; 2717 glColor 0, 0, 0, 1;
2506 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2507 glDisable GL_TEXTURE_2D; 2719 glDisable GL_TEXTURE_2D;
2508 2720
2509 $self->{children}[1]->draw; 2721 $self->{children}[1]->draw;
2510 2722
2511} 2723}
… …
2594} 2806}
2595 2807
2596sub set_tooltip_from { 2808sub set_tooltip_from {
2597 my ($self, $widget) = @_; 2809 my ($self, $widget) = @_;
2598 2810
2811 my $tooltip = $widget->{tooltip};
2812
2813 if ($ENV{CFPLUS_DEBUG} & 2) {
2814 $tooltip .= "\n\n" . (ref $widget) . "\n"
2815 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2816 . "req $widget->{req_w} $widget->{req_h}\n"
2817 . "visible $widget->{visible}";
2818 }
2819
2820 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//;
2822
2599 $self->add (new CFClient::UI::Label 2823 $self->add (new CFClient::UI::Label
2600 markup => $widget->{tooltip}, 2824 markup => $tooltip,
2601 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602 fontsize => 0.8, 2826 fontsize => 0.8,
2603 fg => [0, 0, 0, 1], 2827 fg => [0, 0, 0, 1],
2604 ellipsise => 0, 2828 ellipsise => 0,
2605 font => ($widget->{tooltip_font} || $::FONT_PROP), 2829 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2612 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2613 2837
2614 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2615} 2839}
2616 2840
2617sub size_allocate { 2841sub invoke_size_allocate {
2618 my ($self, $w, $h) = @_; 2842 my ($self, $w, $h) = @_;
2619 2843
2620 $self->SUPER::size_allocate ($w - 4, $h - 4); 2844 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2845}
2846
2847sub invoke_visibility_change {
2848 my ($self, $visible) = @_;
2849
2850 return unless $visible;
2851
2852 $self->{root}->on_post_alloc ("move_$self" => sub {
2853 my $widget = $self->{owner}
2854 or return;
2855
2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857
2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859 if $x + $self->{w} > $self->{root}{w};
2860
2861 $self->move_abs ($x, $y);
2862 });
2621} 2863}
2622 2864
2623sub _draw { 2865sub _draw {
2624 my ($self) = @_; 2866 my ($self) = @_;
2625 2867
… …
2642 glVertex $w, $h; 2884 glVertex $w, $h;
2643 glVertex $w, 0; 2885 glVertex $w, 0;
2644 glEnd; 2886 glEnd;
2645 2887
2646 glTranslate 2 - 0.375, 2 - 0.375; 2888 glTranslate 2 - 0.375, 2 - 0.375;
2889
2647 $self->SUPER::_draw; 2890 $self->SUPER::_draw;
2648} 2891}
2649 2892
2650############################################################################# 2893#############################################################################
2651 2894
… …
2710 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2711 2954
2712 if ($tex) { 2955 if ($tex) {
2713 glEnable GL_TEXTURE_2D; 2956 glEnable GL_TEXTURE_2D;
2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2715 glColor 1, 1, 1, 1; 2958 glColor 0, 0, 0, 1;
2716 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2717 glDisable GL_TEXTURE_2D; 2960 glDisable GL_TEXTURE_2D;
2718 } 2961 }
2719} 2962}
2720 2963
2721sub DESTROY { 2964sub destroy {
2722 my ($self) = @_; 2965 my ($self) = @_;
2723 2966
2724 $self->{timer}->cancel 2967 $self->{timer}->cancel
2725 if $self->{timer}; 2968 if $self->{timer};
2726 2969
2727 $self->SUPER::DESTROY; 2970 $self->SUPER::destroy;
2728} 2971}
2729 2972
2730############################################################################# 2973#############################################################################
2731 2974
2732package CFClient::UI::Inventory; 2975package CFClient::UI::Buttonbar;
2733 2976
2734our @ISA = CFClient::UI::ScrolledWindow::; 2977our @ISA = CFClient::UI::HBox::;
2735 2978
2736sub new { 2979# TODO: should actualyl wrap buttons and other goodies.
2737 my $class = shift;
2738
2739 my $self = $class->SUPER::new (
2740 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2741 @_,
2742 );
2743
2744 $self
2745}
2746
2747sub set_items {
2748 my ($self, $items) = @_;
2749
2750 $self->{scrolled}->clear;
2751 return unless $items;
2752
2753 my @items = sort {
2754 ($a->{type} <=> $b->{type})
2755 or ($a->{name} cmp $b->{name})
2756 } @$items;
2757
2758 $self->{real_items} = \@items;
2759
2760 my $row = 0;
2761 for my $item (@items) {
2762 CFClient::Item::update_widgets $item;
2763
2764 $self->{scrolled}->add (0, $row, $item->{face_widget});
2765 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2766 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2767
2768 $row++;
2769 }
2770}
2771 2980
2772############################################################################# 2981#############################################################################
2773 2982
2774package CFClient::UI::Menu; 2983package CFClient::UI::Menu;
2775 2984
… …
2787 ); 2996 );
2788 2997
2789 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2998 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2790 2999
2791 for my $item (@{ $self->{items} }) { 3000 for my $item (@{ $self->{items} }) {
2792 my ($widget, $cb) = @$item; 3001 my ($widget, $cb, $tooltip) = @$item;
2793 3002
2794 # handle various types of items, only text for now 3003 # handle various types of items, only text for now
2795 if (!ref $widget) { 3004 if (!ref $widget) {
2796 $widget = new CFClient::UI::Label 3005 $widget = new CFClient::UI::Label
2797 can_hover => 1, 3006 can_hover => 1,
2798 can_events => 1, 3007 can_events => 1,
2799 text => $widget; 3008 markup => $widget,
3009 tooltip => $tooltip
2800 } 3010 }
2801 3011
2802 $self->{item}{$widget} = $item; 3012 $self->{item}{$widget} = $item;
2803 3013
2804 $self->{vbox}->add ($widget); 3014 $self->{vbox}->add ($widget);
… …
2809 3019
2810# popup given the event (must be a mouse button down event currently) 3020# popup given the event (must be a mouse button down event currently)
2811sub popup { 3021sub popup {
2812 my ($self, $ev) = @_; 3022 my ($self, $ev) = @_;
2813 3023
2814 $self->_emit ("popdown"); 3024 $self->emit ("popdown");
2815 3025
2816 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2817 $GRAB = $self; 3027 $GRAB = $self;
2818 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2819 3029
2820 $self->show; 3030 $self->show;
2821 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3031 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2822} 3032}
2823 3033
2824sub mouse_motion { 3034sub invoke_mouse_motion {
2825 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2826 3036
2827 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2828 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2829 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2830}
2831 3040
3041 0
3042}
3043
2832sub button_up { 3044sub invoke_button_up {
2833 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2834 3046
2835 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2836 undef $GRAB; 3048 undef $GRAB;
2837 $self->hide; 3049 $self->hide;
2838 3050
2839 $self->_emit ("popdown"); 3051 $self->emit ("popdown");
2840 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
3053 } else {
3054 return 0
3055 }
3056
2841 } 3057 1
2842} 3058}
2843 3059
2844############################################################################# 3060#############################################################################
2845 3061
2846package CFClient::UI::Statusbox; 3062package CFClient::UI::Multiplexer;
2847 3063
2848our @ISA = CFClient::UI::VBox::; 3064our @ISA = CFClient::UI::Container::;
2849 3065
2850sub new { 3066sub new {
2851 my $class = shift; 3067 my $class = shift;
2852 3068
2853 $class->SUPER::new ( 3069 my $self = $class->SUPER::new (
3070 @_,
3071 );
3072
3073 $self->{current} = $self->{children}[0]
3074 if @{ $self->{children} };
3075
3076 $self
3077}
3078
3079sub add {
3080 my ($self, @widgets) = @_;
3081
3082 $self->SUPER::add (@widgets);
3083
3084 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} };
3086}
3087
3088sub set_current_page {
3089 my ($self, $page_or_widget) = @_;
3090
3091 my $widget = ref $page_or_widget
3092 ? $page_or_widget
3093 : $self->{children}[$page_or_widget];
3094
3095 $self->{current} = $widget;
3096 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3097
3098 $self->emit (page_changed => $self->{current});
3099
3100 $self->realloc;
3101}
3102
3103sub visible_children {
3104 $_[0]{current}
3105}
3106
3107sub size_request {
3108 my ($self) = @_;
3109
3110 $self->{current}->size_request
3111}
3112
3113sub invoke_size_allocate {
3114 my ($self, $w, $h) = @_;
3115
3116 $self->{current}->configure (0, 0, $w, $h);
3117
3118 1
3119}
3120
3121sub _draw {
3122 my ($self) = @_;
3123
3124 $self->{current}->draw;
3125}
3126
3127#############################################################################
3128
3129package CFClient::UI::Notebook;
3130
3131our @ISA = CFClient::UI::VBox::;
3132
3133sub new {
3134 my $class = shift;
3135
3136 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self
3140 @_,
3141 );
3142
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3144 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3145
3146 $self
3147}
3148
3149sub add {
3150 my ($self, $title, $widget, $tooltip) = @_;
3151
3152 Scalar::Util::weaken $self;
3153
3154 $self->{buttonbar}->add (new CFClient::UI::Button
3155 markup => $title,
3156 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) },
3158 );
3159
3160 $self->{multiplexer}->add ($widget);
3161}
3162
3163sub set_current_page {
3164 my ($self, $page) = @_;
3165
3166 $self->{multiplexer}->set_current_page ($page);
3167 $self->emit (page_changed => $self->{multiplexer}{current});
3168}
3169
3170#############################################################################
3171
3172package CFClient::UI::Combobox;
3173
3174use utf8;
3175
3176our @ISA = CFClient::UI::Button::;
3177
3178sub new {
3179 my $class = shift;
3180
3181 my $self = $class->SUPER::new (
3182 options => [], # [value, title, longdesc], ...
3183 value => undef,
3184 @_,
3185 );
3186
3187 $self->_set_value ($self->{value});
3188
3189 $self
3190}
3191
3192sub invoke_button_down {
3193 my ($self, $ev) = @_;
3194
3195 my @menu_items;
3196
3197 for (@{ $self->{options} }) {
3198 my ($value, $title, $tooltip) = @$_;
3199
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 }
3202
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204}
3205
3206sub _set_value {
3207 my ($self, $value) = @_;
3208
3209 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3210 or return;
3211
3212 $self->{value} = $item->[0];
3213 $self->set_markup ("$item->[1] ⇓");
3214 $self->set_tooltip ($item->[2]);
3215}
3216
3217sub set_value {
3218 my ($self, $value) = @_;
3219
3220 return unless $self->{value} ne $value;
3221
3222 $self->_set_value ($value);
3223 $self->emit (changed => $value);
3224}
3225
3226#############################################################################
3227
3228package CFClient::UI::Statusbox;
3229
3230our @ISA = CFClient::UI::VBox::;
3231
3232sub new {
3233 my $class = shift;
3234
3235 my $self = $class->SUPER::new (
2854 fontsize => 0.8, 3236 fontsize => 0.8,
2855 @_, 3237 @_,
2856 ) 3238 );
3239
3240 Scalar::Util::weaken (my $this = $self);
3241
3242 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243
3244 $self
2857} 3245}
2858 3246
2859sub reorder { 3247sub reorder {
2860 my ($self) = @_; 3248 my ($self) = @_;
2861 my $NOW = time; 3249 my $NOW = Time::HiRes::time;
3250
3251 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} };
2862 3255
2863 while (my ($k, $v) = each %{ $self->{item} }) { 3256 while (my ($k, $v) = each %{ $self->{item} }) {
2864 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3257 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2865 } 3258 }
2866 3259
… …
2869 my @items = sort { 3262 my @items = sort {
2870 $a->{pri} <=> $b->{pri} 3263 $a->{pri} <=> $b->{pri}
2871 or $b->{id} <=> $a->{id} 3264 or $b->{id} <=> $a->{id}
2872 } values %{ $self->{item} }; 3265 } values %{ $self->{item} };
2873 3266
3267 $self->{timer}->interval (1);
3268
2874 my $count = 10 + 1; 3269 my $count = 10 + 1;
2875 for my $item (@items) { 3270 for my $item (@items) {
2876 last unless --$count; 3271 last unless --$count;
2877 3272
2878 push @widgets, $item->{label} ||= do { 3273 my $label = $item->{label} ||= do {
2879 # TODO: doesn't handle markup well (read as: at all) 3274 # TODO: doesn't handle markup well (read as: at all)
2880 my $short = $item->{count} > 1 3275 my $short = $item->{count} > 1
2881 ? "<b>$item->{count} ×</b> $item->{text}" 3276 ? "<b>$item->{count} ×</b> $item->{text}"
2882 : $item->{text}; 3277 : $item->{text};
2883 3278
… …
2891 tooltip => $item->{tooltip}, 3286 tooltip => $item->{tooltip},
2892 tooltip_font => $::FONT_PROP, 3287 tooltip_font => $::FONT_PROP,
2893 tooltip_width => 0.67, 3288 tooltip_width => 0.67,
2894 fontsize => $item->{fontsize} || $self->{fontsize}, 3289 fontsize => $item->{fontsize} || $self->{fontsize},
2895 max_w => $::WIDTH * 0.44, 3290 max_w => $::WIDTH * 0.44,
2896 fg => $item->{fg}, 3291 fg => [@{ $item->{fg} }],
2897 can_events => 1, 3292 can_events => 1,
2898 can_hover => 1 3293 can_hover => 1
2899 }; 3294 };
3295
3296 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3297 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3298 $label->update;
3299 $label->set_max_size (undef, $label->{req_h} * $diff)
3300 if $diff < 1;
3301 $self->{timer}->interval (1/30);
3302 } else {
3303 $label->{fg}[3] = $item->{fg}[3] || 1;
3304 }
3305
3306 push @widgets, $label;
2900 } 3307 }
2901 3308
2902 $self->clear; 3309 $self->clear;
2903 $self->SUPER::add (reverse @widgets); 3310 $self->SUPER::add (reverse @widgets);
2904} 3311}
… …
2909 $text =~ s/^\s+//; 3316 $text =~ s/^\s+//;
2910 $text =~ s/\s+$//; 3317 $text =~ s/\s+$//;
2911 3318
2912 return unless $text; 3319 return unless $text;
2913 3320
2914 my $timeout = time + ((delete $arg{timeout}) || 60); 3321 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2915 3322
2916 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3323 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2917 3324
2918 if (my $item = $self->{item}{$group}) { 3325 if (my $item = $self->{item}{$group}) {
2919 if ($item->{text} eq $text) { 3326 if ($item->{text} eq $text) {
2920 $item->{count}++; 3327 $item->{count}++;
2921 } else { 3328 } else {
2922 $item->{count} = 1; 3329 $item->{count} = 1;
2923 $item->{text} = $item->{tooltip} = $text; 3330 $item->{text} = $item->{tooltip} = $text;
2924 } 3331 }
2925 $item->{id} = ++$self->{id}; 3332 $item->{id} += 0.2;#d#
2926 $item->{timeout} = $timeout; 3333 $item->{timeout} = $timeout;
2927 delete $item->{label}; 3334 delete $item->{label};
2928 } else { 3335 } else {
2929 $self->{item}{$group} = { 3336 $self->{item}{$group} = {
2930 id => ++$self->{id}, 3337 id => ++$self->{id},
… …
2949 3356
2950 $self->reorder; 3357 $self->reorder;
2951 $self->SUPER::reconfigure; 3358 $self->SUPER::reconfigure;
2952} 3359}
2953 3360
3361sub destroy {
3362 my ($self) = @_;
3363
3364 $self->{timer}->cancel;
3365
3366 $self->SUPER::destroy;
3367}
3368
2954############################################################################# 3369#############################################################################
2955 3370
2956package CFClient::UI::Root; 3371package CFClient::UI::Inventory;
2957 3372
2958our @ISA = CFClient::UI::Container::; 3373our @ISA = CFClient::UI::ScrolledWindow::;
2959
2960use CFClient::OpenGL;
2961 3374
2962sub new { 3375sub new {
2963 my $class = shift; 3376 my $class = shift;
2964 3377
2965 $class->SUPER::new ( 3378 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380 @_,
3381 );
3382
3383 $self
3384}
3385
3386sub set_items {
3387 my ($self, $items) = @_;
3388
3389 $self->{child}->clear;
3390 return unless $items;
3391
3392 my @items = sort {
3393 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name})
3395 } @$items;
3396
3397 $self->{real_items} = \@items;
3398
3399 my $row = 0;
3400 for my $item (@items) {
3401 CFClient::Item::update_widgets $item;
3402
3403 $self->{child}->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget});
3406
3407 $row++;
3408 }
3409}
3410
3411#############################################################################
3412
3413package CFClient::UI::BindEditor;
3414
3415our @ISA = CFClient::UI::FancyFrame::;
3416
3417sub new {
3418 my $class = shift;
3419
3420 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422 $self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426 text => "start recording",
3427 tooltip => "Start/Stops recording of actions."
3428 ."All subsequent actions after the recording started will be captured."
3429 ."The actions are displayed after the record was stopped."
3430 ."To bind the action you have to click on the 'Bind' button",
3431 on_activate => sub {
3432 unless ($self->{recording}) {
3433 $self->start;
3434 } else {
3435 $self->stop;
3436 }
3437 });
3438
3439 $vb->add (new CFClient::UI::Label text => "Actions:");
3440 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3443 $vb->add (my $hb = new CFClient::UI::HBox);
3444 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445 $hb->add (new CFClient::UI::Button
3446 text => "bind",
3447 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448 on_activate => sub {
3449 $self->ask_for_bind;
3450 });
3451
3452 $vb->add (my $hb = new CFClient::UI::HBox);
3453 $hb->add (new CFClient::UI::Button
3454 text => "ok",
3455 expand => 1,
3456 tooltip => "This closes the binding editor and saves the binding",
3457 on_activate => sub {
3458 $self->hide;
3459 $self->commit;
3460 });
3461
3462 $hb->add (new CFClient::UI::Button
3463 text => "cancel",
3464 expand => 1,
3465 tooltip => "This closes the binding editor without saving",
3466 on_activate => sub {
3467 $self->hide;
3468 $self->{binding_cancel}->()
3469 if $self->{binding_cancel};
3470 });
3471
3472 $self->update_binding_widgets;
3473
3474 $self
3475}
3476
3477sub commit {
3478 my ($self) = @_;
3479 my ($mod, $sym, $cmds) = $self->get_binding;
3480 if ($sym != 0 && @$cmds > 0) {
3481 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482 ."'. Don't forget 'Save Config'!");
3483 $self->{binding_change}->($mod, $sym, $cmds)
3484 if $self->{binding_change};
3485 } else {
3486 $::STATUSBOX->add ("No action bound, no key or action specified!");
3487 $self->{binding_cancel}->()
3488 if $self->{binding_cancel};
3489 }
3490}
3491
3492sub start {
3493 my ($self) = @_;
3494
3495 $self->{rec_btn}->set_text ("stop recording");
3496 $self->{recording} = 1;
3497 $self->clear_command_list;
3498 $::CONN->start_record if $::CONN;
3499}
3500
3501sub stop {
3502 my ($self) = @_;
3503
3504 $self->{rec_btn}->set_text ("start recording");
3505 $self->{recording} = 0;
3506
3507 my $rec;
3508 $rec = $::CONN->stop_record if $::CONN;
3509 return unless ref $rec eq 'ARRAY';
3510 $self->set_command_list ($rec);
3511}
3512
3513
3514sub ask_for_bind_and_commit {
3515 my ($self) = @_;
3516 $self->ask_for_bind (1);
3517}
3518
3519sub ask_for_bind {
3520 my ($self, $commit, $end_cb) = @_;
3521
3522 CFClient::Binder::open_binding_dialog (sub {
3523 my ($mod, $sym) = @_;
3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525 $self->update_binding_widgets;
3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3528 });
3529}
3530
3531# $mod and $sym are the modifiers and key symbol
3532# $cmds is a array ref of strings (the commands)
3533# $cb is the callback that is executed on OK
3534# $ccb is the callback that is executed on CANCEL and
3535# when the binding was unsuccessful on OK
3536sub set_binding {
3537 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539 $self->clear_command_list;
3540 $self->{recording} = 0;
3541 $self->{rec_btn}->set_text ("start recording");
3542
3543 $self->{binding} = [$mod, $sym];
3544 $self->{commands} = $cmds;
3545
3546 $self->{binding_change} = $cb;
3547 $self->{binding_cancel} = $ccb;
3548
3549 $self->update_binding_widgets;
3550}
3551
3552# this is a shortcut method that asks for a binding
3553# and then just binds it.
3554sub do_quick_binding {
3555 my ($self, $cmds, $end_cb) = @_;
3556 $self->set_binding (undef, undef, $cmds, sub {
3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558 });
3559 $self->ask_for_bind (1, $end_cb);
3560}
3561
3562sub update_binding_widgets {
3563 my ($self) = @_;
3564 my ($mod, $sym, $cmds) = $self->get_binding;
3565 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566 $self->set_command_list ($cmds);
3567}
3568
3569sub get_binding {
3570 my ($self) = @_;
3571 return (
3572 $self->{binding}->[0],
3573 $self->{binding}->[1],
3574 [ grep { defined $_ } @{$self->{commands}} ]
3575 );
3576}
3577
3578sub clear_command_list {
3579 my ($self) = @_;
3580 $self->{cmdbox}->clear ();
3581}
3582
3583sub set_command_list {
3584 my ($self, $cmds) = @_;
3585
3586 $self->{cmdbox}->clear ();
3587 $self->{commands} = $cmds;
3588
3589 my $idx = 0;
3590
3591 for (@$cmds) {
3592 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594 my $i = $idx;
3595 $hb->add (new CFClient::UI::Label text => $_);
3596 $hb->add (new CFClient::UI::Button
3597 text => "delete",
3598 tooltip => "Deletes the action from the record",
3599 on_activate => sub {
3600 $self->{cmdbox}->remove ($hb);
3601 $cmds->[$i] = undef;
3602 });
3603
3604
3605 $idx++
3606 }
3607}
3608
3609#############################################################################
3610
3611package CFClient::UI::SpellList;
3612
3613our @ISA = CFClient::UI::Table::;
3614
3615sub new {
3616 my $class = shift;
3617
3618 my $self = $class->SUPER::new (
3619 binding => [],
3620 commands => [],
3621 @_,
3622 )
3623}
3624
3625my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3626
3627my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3629my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638sub rebuild_spell_list {
3639 my ($self) = @_;
3640
3641 $CFClient::UI::ROOT->on_refresh ($self => sub {
3642 $self->clear;
3643
3644 return unless $::CONN;
3645
3646 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652 my $row = 0;
3653
3654 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655 my $spell = $self->{spell}{$_};
3656
3657 $row++;
3658
3659 my $spell_cb = sub {
3660 my ($widget, $ev) = @_;
3661
3662 if ($ev->{button} == 1) {
3663 $::CONN->user_send ("cast $spell->{name}");
3664 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu
3668 items => [
3669 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671 ],
3672 )->popup ($ev);
3673 } else {
3674 return 0;
3675 }
3676
3677 1
3678 };
3679
3680 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682 #TODO: add path info to tooltip
3683 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685 $self->add (0, $row, new CFClient::UI::Face
3686 face => $spell->{face},
3687 can_hover => 1,
3688 can_events => 1,
3689 tooltip => $tooltip,
3690 on_button_down => $spell_cb,
3691 );
3692
3693 $self->add (1, $row, new CFClient::UI::Label
3694 expand => 1,
3695 text => $spell->{name},
3696 can_hover => 1,
3697 can_events => 1,
3698 tooltip => $tooltip,
3699 on_button_down => $spell_cb,
3700 );
3701
3702 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706 }
3707 });
3708}
3709
3710sub add_spell {
3711 my ($self, $spell) = @_;
3712
3713 $self->{spell}->{$spell->{name}} = $spell;
3714 $self->rebuild_spell_list;
3715}
3716
3717sub remove_spell {
3718 my ($self, $spell) = @_;
3719
3720 delete $self->{spell}->{$spell->{name}};
3721 $self->rebuild_spell_list;
3722}
3723
3724sub clear_spells {
3725 my ($self) = @_;
3726
3727 $self->{spell} = {};
3728 $self->rebuild_spell_list;
3729}
3730
3731#############################################################################
3732
3733package CFClient::UI::Root;
3734
3735our @ISA = CFClient::UI::Container::;
3736
3737use List::Util qw(min max);
3738
3739use CFClient::OpenGL;
3740
3741sub new {
3742 my $class = shift;
3743
3744 my $self = $class->SUPER::new (
2966 visible => 1, 3745 visible => 1,
2967 @_, 3746 @_,
2968 ) 3747 );
2969}
2970 3748
2971sub configure { 3749 Scalar::Util::weaken ($self->{root} = $self);
2972 my ($self, $x, $y, $w, $h) = @_;
2973 3750
2974 $self->{w} = $w; 3751 $self
2975 $self->{h} = $h;
2976}
2977
2978sub check_size {
2979 my ($self) = @_;
2980
2981 $self->size_allocate ($self->{w}, $self->{h})
2982 if $self->{w};
2983} 3752}
2984 3753
2985sub size_request { 3754sub size_request {
2986 my ($self) = @_; 3755 my ($self) = @_;
2987 3756
2988 ($self->{w}, $self->{h}) 3757 ($self->{w}, $self->{h})
2989} 3758}
2990 3759
3760sub _to_pixel {
3761 my ($coord, $size, $max) = @_;
3762
3763 $coord =
3764 $coord eq "center" ? ($max - $size) * 0.5
3765 : $coord eq "max" ? $max
3766 : $coord;
3767
3768 $coord = 0 if $coord < 0;
3769 $coord = $max - $size if $coord > $max - $size;
3770
3771 int $coord + 0.5
3772}
3773
2991sub size_allocate { 3774sub invoke_size_allocate {
2992 my ($self, $w, $h) = @_; 3775 my ($self, $w, $h) = @_;
2993 3776
2994 for my $child ($self->children) { 3777 for my $child ($self->children) {
2995 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3778 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2996 3779
2997 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3780 $X = $child->{force_x} if exists $child->{force_x};
2998 if exists $child->{req_x}; 3781 $Y = $child->{force_y} if exists $child->{force_y};
2999 3782
3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3783 $X = _to_pixel $X, $W, $self->{w};
3001 if exists $child->{req_y}; 3784 $Y = _to_pixel $Y, $H, $self->{h};
3002
3003 delete @$child{qw(req_x req_y)};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3785
3008 $child->configure ($X, $Y, $W, $H); 3786 $child->configure ($X, $Y, $W, $H);
3009 } 3787 }
3788
3789 1
3010} 3790}
3011 3791
3012sub coord2local { 3792sub coord2local {
3013 my ($self, $x, $y) = @_; 3793 my ($self, $x, $y) = @_;
3014 3794
… …
3022} 3802}
3023 3803
3024sub update { 3804sub update {
3025 my ($self) = @_; 3805 my ($self) = @_;
3026 3806
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3807 $::WANT_REFRESH++;
3029} 3808}
3030 3809
3031sub add { 3810sub add {
3032 my ($self, @children) = @_; 3811 my ($self, @children) = @_;
3033 3812
3034 for my $child (@children) {
3035 $child->{is_toplevel} = 1; 3813 $_->{is_toplevel} = 1
3036 3814 for @children;
3037 # integerise window positions
3038 $child->{x} = int $child->{x};
3039 $child->{y} = int $child->{y};
3040 }
3041 3815
3042 $self->SUPER::add (@children); 3816 $self->SUPER::add (@children);
3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3049} 3817}
3050 3818
3051sub remove { 3819sub remove {
3052 my ($self, @children) = @_; 3820 my ($self, @children) = @_;
3053 3821
3054 $self->SUPER::remove (@children); 3822 $self->SUPER::remove (@children);
3823
3824 delete $self->{is_toplevel}
3825 for @children;
3055 3826
3056 while (@children) { 3827 while (@children) {
3057 my $w = pop @children; 3828 my $w = pop @children;
3058 push @children, $w->children; 3829 push @children, $w->children;
3059 $w->set_invisible; 3830 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3849 while ($self->{refresh_hook}) {
3079 $_->() 3850 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3851 for values %{delete $self->{refresh_hook}};
3081 } 3852 }
3082 3853
3083 if ($self->{check_size}) { 3854 if ($self->{realloc}) {
3855 my %queue;
3084 my @queue; 3856 my @queue;
3857 my $widget;
3085 3858
3086 for (;;) { 3859 outer:
3087 if ($self->{check_size}) { 3860 while () {
3088 #TODO use array-of-depth approach 3861 if (my $realloc = delete $self->{realloc}) {
3862 for $widget (values %$realloc) {
3863 $widget->{visible} or next; # do not resize invisible widgets
3089 3864
3090 @queue = sort { $a->{visible} <=> $b->{visible} } 3865 $queue{$widget+0}++ and next; # duplicates are common
3091 @queue, values %{delete $self->{check_size}}; 3866
3867 push @{ $queue[$widget->{visible}] }, $widget;
3868 }
3092 } 3869 }
3093 3870
3871 while () {
3872 @queue or last outer;
3873
3094 my $widget = pop @queue || last; 3874 $widget = pop @{ $queue[-1] || [] }
3095 3875 and last;
3096 defined $widget->{visible} or last; # do not resize invisible widgets
3097
3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3099 ? @$widget{qw(def_w def_h)}
3100 : $widget->size_request;
3101
3102 if (delete $widget->{force_alloc}
3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105 3876
3877 pop @queue;
3878 }
3879
3880 delete $queue{$widget+0};
3881
3882 my ($w, $h) = $widget->size_request;
3883
3884 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3885 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3886
3887 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3888 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3889
3890 $w = $widget->{force_w} if exists $widget->{force_w};
3891 $h = $widget->{force_h} if exists $widget->{force_h};
3892
3893 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3894 || delete $widget->{force_realloc}) {
3106 $widget->{req_w} = $w; 3895 $widget->{req_w} = $w;
3107 $widget->{req_h} = $h; 3896 $widget->{req_h} = $h;
3108 3897
3109 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3898 $self->{size_alloc}{$widget+0} = $widget;
3110 3899
3111 $widget->{parent}->check_size
3112 if $widget->{parent}; 3900 if (my $parent = $widget->{parent}) {
3901 $self->{realloc}{$parent+0} = $parent
3902 unless $queue{$parent+0};
3903
3904 $parent->{force_size_alloc} = 1;
3905 $self->{size_alloc}{$parent+0} = $parent;
3906 }
3113 } 3907 }
3908
3909 delete $self->{realloc}{$widget+0};
3114 } 3910 }
3115 } 3911 }
3116 3912
3117 while ($self->{size_alloc}) { 3913 while (my $size_alloc = delete $self->{size_alloc}) {
3118 for (values %{delete $self->{size_alloc}}) { 3914 my @queue = sort { $b->{visible} <=> $a->{visible} }
3119 my ($widget, $w, $h) = @$_; 3915 values %$size_alloc;
3916
3917 while () {
3918 my $widget = pop @queue || last;
3919
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120 3921
3121 $w = 0 if $w < 0; 3922 $w = 0 if $w < 0;
3122 $h = 0 if $h < 0; 3923 $h = 0 if $h < 0;
3123 3924
3925 $w = int $w + 0.5;
3926 $h = int $h + 0.5;
3927
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w};
3930 $widget->{old_h} = $widget->{h};
3931
3124 $widget->{w} = $w; 3932 $widget->{w} = $w;
3125 $widget->{h} = $h; 3933 $widget->{h} = $h;
3934
3126 $widget->emit (size_allocate => $w, $h); 3935 $widget->emit (size_allocate => $w, $h);
3936 }
3127 } 3937 }
3128 } 3938 }
3129 3939
3130 while ($self->{post_alloc_hook}) { 3940 while ($self->{post_alloc_hook}) {
3131 $_->() 3941 $_->()
3132 for values %{delete $self->{post_alloc_hook}}; 3942 for values %{delete $self->{post_alloc_hook}};
3133 } 3943 }
3944
3134 3945
3135 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3946 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3136 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3137 glClear GL_COLOR_BUFFER_BIT; 3948 glClear GL_COLOR_BUFFER_BIT;
3138 3949
… …
3140 glLoadIdentity; 3951 glLoadIdentity;
3141 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3142 glMatrixMode GL_MODELVIEW; 3953 glMatrixMode GL_MODELVIEW;
3143 glLoadIdentity; 3954 glLoadIdentity;
3144 3955
3956 {
3957 package CFClient::UI::Base;
3958
3959 ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h});
3961 }
3962
3145 $self->_draw; 3963 $self->_draw;
3146} 3964}
3147 3965
3148############################################################################# 3966#############################################################################
3149 3967

Diff Legend

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