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

Diff Legend

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