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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.307 by root, Sun Jun 18 19:13:20 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
132 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
133 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
183 } 190 }
184 } 191 }
185 192
186 reconfigure_widgets; 193 reconfigure_widgets;
187} 194}
… …
196 203
197sub new { 204sub new {
198 my $class = shift; 205 my $class = shift;
199 206
200 my $self = bless { 207 my $self = bless {
201 x => 0, 208 x => "center",
202 y => 0, 209 y => "center",
203 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
204 can_events => 1, 213 can_events => 1,
205 @_ 214 @_
206 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 218
208 for (keys %$self) { 219 for (keys %$self) {
209 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
211 } 222 }
212 } 223 }
213 224
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
221 } 235 }
222 236
223 $self 237 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 238}
235 239
236sub destroy { 240sub destroy {
237 my ($self) = @_; 241 my ($self) = @_;
238 242
… …
240 %$self = (); 244 %$self = ();
241} 245}
242 246
243sub show { 247sub show {
244 my ($self) = @_; 248 my ($self) = @_;
249
245 return if $self->{parent}; 250 return if $self->{parent};
246 251
247 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
248}
249
250sub center {
251 my ($self) = @_;
252
253 $CFClient::UI::ROOT->on_post_alloc (
254 "center_$self" => sub {
255 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
256 },
257 );
258
259 $self->update;
260} 253}
261 254
262sub set_visible { 255sub set_visible {
263 my ($self) = @_; 256 my ($self) = @_;
264 257
265 return if $self->{visible}; 258 return if $self->{visible};
266 259
267 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
268 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
269 262
270 $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;
271} 268}
272 269
273sub set_invisible { 270sub set_invisible {
274 my ($self) = @_; 271 my ($self) = @_;
275 272
276 return unless $self->{visible}; 273 return unless $self->{visible};
277 274
278 # broken show/hide model 275 $_->set_invisible for $self->children;
279 276
277 delete $self->{visible};
280 delete $self->{root}; 278 delete $self->{root};
281 delete $self->{visible};
282 279
283 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
284 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
285 282
286 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
287 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
288 285
289 $self->focus_out; 286 $self->emit ("focus_out");
290
291 $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;
292} 305}
293 306
294sub hide { 307sub hide {
295 my ($self) = @_; 308 my ($self) = @_;
296 309
… …
298 311
299 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
300 if $self->{parent}; 313 if $self->{parent};
301} 314}
302 315
303sub move { 316sub move_abs {
304 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
305 318
306 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
307 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
308 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
309 322
310 $self->update; 323 $self->update;
311} 324}
312 325
313sub set_size { 326sub set_size {
314 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
315 328
316 $self->{def_w} = $w; 329 $self->{force_w} = $w;
317 $self->{def_h} = $h; 330 $self->{force_h} = $h;
318 331
319 $self->check_size; 332 $self->realloc;
320} 333}
321 334
322sub size_request { 335sub size_request {
323 require Carp; 336 require Carp;
324 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
326 339
327sub configure { 340sub configure {
328 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
329 342
330 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
331 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
332 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
333 348
334 # use alignment to adjust x, y 349 # use alignment to adjust x, y
335 350
336 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
337 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
338
339 ($w, $h) = ($w2, $h2);
340 } 353 }
341 354
342 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
343 $self->{x} = $x; 356 $self->{x} = $x;
344 $self->{y} = $y; 357 $self->{y} = $y;
345 $self->update; 358 $self->update;
346 } 359 }
347 360
348 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
349 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
350 }
351}
352 363
353sub size_allocate { 364 $self->{alloc_w} = $w;
354 # nothing to be done 365 $self->{alloc_h} = $h;
355}
356 366
357sub reconfigure { 367 $self->{root}{size_alloc}{$self+0} = $self;
358 my ($self) = @_; 368 }
359
360 $self->check_size (1);
361 $self->update;
362} 369}
363 370
364sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
365} 377}
366 378
367sub set_max_size { 379sub set_max_size {
368 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
369 381
370 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
372} 386}
373 387
374sub set_tooltip { 388sub set_tooltip {
375 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
376 390
… …
381 395
382 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
383 397
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
387 } 401 }
388} 402}
389 403
390# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
391sub coord2local { 405sub coord2local {
… …
399 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
400 414
401 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
402} 416}
403 417
404sub focus_in { 418sub invoke_focus_in {
405 my ($self) = @_; 419 my ($self) = @_;
406 420
407 return if $FOCUS == $self; 421 return if $FOCUS == $self;
408 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
409 423
410 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
411 425
412 $self->_emit (focus_in => $focus);
413
414 $focus->update if $focus; 426 $focus->update if $focus;
415 $FOCUS->update; 427 $FOCUS->update;
416}
417 428
429 0
430}
431
418sub focus_out { 432sub invoke_focus_out {
419 my ($self) = @_; 433 my ($self) = @_;
420 434
421 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
422 436
423 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
424 438
425 $self->_emit (focus_out => $focus);
426
427 $focus->update if $focus; #? 439 $focus->update if $focus; #?
428 440
429 $::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
430 unless $FOCUS; 442 unless $FOCUS;
431}
432 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
433sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
434sub button_up { } 454sub invoke_button_up { 1 }
435sub key_down { } 455sub invoke_key_down { 1 }
436sub key_up { } 456sub invoke_key_up { 1 }
437 457
438sub button_down { 458sub invoke_button_down {
439 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
440 460
441 $self->focus_in; 461 $self->grab_focus;
442}
443 462
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
448sub 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
449 530
450sub draw { 531sub draw {
451 my ($self) = @_; 532 my ($self) = @_;
452 533
453 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);
454 545
455 glPushMatrix; 546 glPushMatrix;
456 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
457 $self->_draw;
458 glPopMatrix;
459 548
460 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
461 my ($x, $y) = @$self{qw(x y)};
462
463 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
464 glEnable GL_BLEND; 551 glEnable GL_BLEND;
465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
466 glBegin GL_QUADS; 553 glBegin GL_QUADS;
467 glVertex $x , $y; 554 glVertex 0 , 0;
468 glVertex $x + $self->{w}, $y; 555 glVertex $self->{w}, 0;
469 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $self->{w}, $self->{h};
470 glVertex $x , $y + $self->{h}; 557 glVertex 0 , $self->{h};
471 glEnd; 558 glEnd;
472 glDisable GL_BLEND; 559 glDisable GL_BLEND;
473 } 560 }
474 561
475 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
476 glPushMatrix; 563 glPushMatrix;
477 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
478 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate 0.375, 0.375;
479 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
480 glVertex 0 , 0; 567 glVertex 0 , 0;
481 glVertex $self->{w} - 1, 0; 568 glVertex $self->{w} - 1, 0;
482 glVertex $self->{w} - 1, $self->{h} - 1; 569 glVertex $self->{w} - 1, $self->{h} - 1;
483 glVertex 0 , $self->{h} - 1; 570 glVertex 0 , $self->{h} - 1;
484 glEnd; 571 glEnd;
485 glPopMatrix; 572 glPopMatrix;
486 #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;
487 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
488} 578}
489 579
490sub _draw { 580sub _draw {
491 my ($self) = @_; 581 my ($self) = @_;
492 582
493 warn "no draw defined for $self\n"; 583 warn "no draw defined for $self\n";
494} 584}
495 585
496sub find_widget {
497 my ($self, $x, $y) = @_;
498
499 return () unless $self->{can_events};
500
501 return $self
502 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
503 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
504
505 ()
506}
507
508sub set_parent {
509 my ($self, $parent) = @_;
510
511 Scalar::Util::weaken ($self->{parent} = $parent);
512
513 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
515 $self->check_size;
516}
517
518sub check_size {
519 my ($self, $forced) = @_;
520
521 $self->{force_alloc} = 1 if $forced;
522 $CFClient::UI::ROOT->{check_size}{$self} = $self;
523}
524
525sub update {
526 my ($self) = @_;
527
528 $self->{parent}->update
529 if $self->{parent};
530}
531
532sub connect {
533 my ($self, $signal, $cb) = @_;
534
535 push @{ $self->{signal_cb}{$signal} }, $cb;
536}
537
538sub _emit {
539 my ($self, $signal, @args) = @_;
540
541 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
542}
543
544sub emit {
545 my ($self, $signal, @args) = @_;
546
547 $self->_emit ($signal, @args)
548 || $self->$signal (@args);
549}
550
551sub visibility_change {
552 #my ($self, $visible) = @_;
553}
554
555sub DESTROY { 586sub DESTROY {
556 my ($self) = @_; 587 my ($self) = @_;
557 588
558 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
559 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
560} 593}
561 594
562############################################################################# 595#############################################################################
563 596
564package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
589 622
590 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
591 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
592 625
593 glEnable GL_BLEND; 626 glEnable GL_BLEND;
594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
595 glColor @$color; 628 glColor_premultiply @$color;
596 629
597 glBegin GL_QUADS; 630 glBegin GL_QUADS;
598 glVertex 0 , 0; 631 glVertex 0 , 0;
599 glVertex 0 , $h; 632 glVertex 0 , $h;
600 glVertex $w, $h; 633 glVertex $w, $h;
… …
615 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
616 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
617} 650}
618 651
619sub size_request { 652sub size_request {
620 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
621} 656}
622 657
623sub draw { } 658sub draw { }
624 659
625############################################################################# 660#############################################################################
… …
629our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
630 665
631sub new { 666sub new {
632 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
633 668
634 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
635 670
636 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
637 children => [], 672 children => [],
638 can_events => 0, 673 can_events => 0,
639 %arg, 674 %arg,
640 ); 675 );
676
641 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
642 679
643 $self 680 $self
644} 681}
645 682
646sub add { 683sub add {
… …
654 $self->{children} = [ 691 $self->{children} = [
655 sort { $a->{z} <=> $b->{z} } 692 sort { $a->{z} <=> $b->{z} }
656 @{$self->{children}}, @widgets 693 @{$self->{children}}, @widgets
657 ]; 694 ];
658 695
659 $self->check_size (1); 696 $self->realloc;
660 $self->update;
661} 697}
662 698
663sub children { 699sub children {
664 @{ $_[0]{children} } 700 @{ $_[0]{children} }
665} 701}
… …
670 delete $child->{parent}; 706 delete $child->{parent};
671 $child->hide; 707 $child->hide;
672 708
673 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 709 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
674 710
675 $self->check_size (1); 711 $self->realloc;
676 $self->update;
677} 712}
678 713
679sub clear { 714sub clear {
680 my ($self) = @_; 715 my ($self) = @_;
681 716
… …
685 for (@$children) { 720 for (@$children) {
686 delete $_->{parent}; 721 delete $_->{parent};
687 $_->hide; 722 $_->hide;
688 } 723 }
689 724
690 $self->check_size; 725 $self->realloc;
691 $self->update;
692} 726}
693 727
694sub find_widget { 728sub find_widget {
695 my ($self, $x, $y) = @_; 729 my ($self, $x, $y) = @_;
696 730
697 $x -= $self->{x}; 731 $x -= $self->{x};
698 $y -= $self->{y}; 732 $y -= $self->{y};
699 733
700 my $res; 734 my $res;
701 735
702 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
703 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
704 and return $res; 738 and return $res;
705 } 739 }
706 740
707 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
728} 762}
729 763
730sub add { 764sub add {
731 my ($self, $child) = @_; 765 my ($self, $child) = @_;
732 766
733 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
734
735 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
736} 769}
737 770
738sub remove { 771sub remove {
739 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
748 781
749sub size_request { 782sub size_request {
750 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
751} 784}
752 785
753sub size_allocate { 786sub invoke_size_allocate {
754 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
755 788
756 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
757} 792}
758 793
759############################################################################# 794#############################################################################
795
796# back-buffered drawing area
760 797
761package CFClient::UI::Window; 798package CFClient::UI::Window;
762 799
763our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
764 801
… …
775 812
776 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
777 $self->SUPER::update; 814 $self->SUPER::update;
778} 815}
779 816
780sub size_allocate { 817sub invoke_size_allocate {
781 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
782 819
783 $self->SUPER::size_allocate ($w, $h);
784 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
785} 823}
786 824
787sub _render { 825sub _render {
826 my ($self) = @_;
827
788 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
789} 829}
790 830
791sub render_child { 831sub render_child {
792 my ($self) = @_; 832 my ($self) = @_;
793 833
794 $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 {
795 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
796 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
797 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
798 $self->_render; 845 $self->_render;
799 }; 846 };
800} 847}
801 848
802sub _draw { 849sub _draw {
803 my ($self) = @_; 850 my ($self) = @_;
804 851
805 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
806 853
807 my $tex = $self->{texture} 854 my $tex = $self->{texture}
808 or return; 855 or return;
809 856
810 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
813 860
814 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
815 862
816 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
817} 864}
… …
833} 880}
834 881
835sub size_request { 882sub size_request {
836 my ($self) = @_; 883 my ($self) = @_;
837 884
838 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)};
839 886
840 $w = 10 if $self->{scroll_x}; 887 $w = 10 if $self->{scroll_x};
841 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
842 889
843 ($w, $h) 890 ($w, $h)
844} 891}
845 892
846sub size_allocate { 893sub invoke_size_allocate {
847 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
848 895
896 my $child = $self->child;
897
849 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
850 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
851 900
852 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
853 $self->update; 902 $self->update;
903
904 1
854} 905}
855 906
856sub set_offset { 907sub set_offset {
857 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
858 909
… …
891} 942}
892 943
893sub _render { 944sub _render {
894 my ($self) = @_; 945 my ($self) = @_;
895 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
896 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
897 951
898 $self->SUPER::_render; 952 $self->SUPER::_render;
899} 953}
900 954
… …
903package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
904 958
905our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
906 960
907sub new { 961sub new {
908 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
909 965
910 my $self; 966 my $self;
911 967
912 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
913 vertical => 1, 969 vertical => 1,
… …
918 ; 974 ;
919 975
920 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
921 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
922 slider => $slider, 978 slider => $slider,
923 @_, 979 %arg,
924 ); 980 );
925 981
926 $self->{vp}->add ($self->{scrolled});
927 $self->add ($self->{vp});
928 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
929 984
930 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
931} 992}
932 993
933sub update { 994sub update {
934 my ($self) = @_; 995 my ($self) = @_;
935 996
… …
938 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
939 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
940 $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]);
941} 1002}
942 1003
943sub size_allocate { 1004sub invoke_size_allocate {
944 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
945
946 $self->SUPER::size_allocate ($w, $h);
947 1006
948 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
949 $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)
950} 1011}
951 1012
952#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
953# update viewport offset on scroll 1014# update viewport offset on scroll
954 1015
… …
974 1035
975 if ($self->{bg}) { 1036 if ($self->{bg}) {
976 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
977 1038
978 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
979 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
980 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
981 1042
982 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
983 glVertex 0 , 0; 1044 glVertex 0 , 0;
984 glVertex 0 , $h; 1045 glVertex 0 , $h;
985 glVertex $w, $h; 1046 glVertex $w, $h;
… …
998 1059
999our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
1000 1061
1001use CFClient::OpenGL; 1062use CFClient::OpenGL;
1002 1063
1003my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1004 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1005 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);
1006 1071
1007sub new { 1072sub new {
1008 my $class = shift; 1073 my ($class, %arg) = @_;
1009 1074
1010 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1011 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1012 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1013 border => 0.6, 1078 border => 0.6,
1014 is_toplevel => 1,
1015 can_events => 1, 1079 can_events => 1,
1016 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
1017 ); 1083 );
1018 1084
1019 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
1020 align => 0, 1086 align => 0,
1021 valign => 1, 1087 valign => 1,
1022 text => $self->{title}, 1088 text => $self->{title},
1023 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 }
1024 1100
1025 $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};
1026} 1110}
1027 1111
1028sub border { 1112sub border {
1029 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
1030} 1114}
1031 1115
1032sub size_request { 1116sub size_request {
1033 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};
1034 1124
1035 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1036 1126
1037 ( 1127 (
1038 $w + $self->border * 2, 1128 $w + $self->border * 2,
1039 $h + $self->border * 2, 1129 $h + $self->border * 2,
1040 ) 1130 )
1041} 1131}
1042 1132
1043sub size_allocate { 1133sub invoke_size_allocate {
1044 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
1045 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
1046 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1047 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1048 1146
1049 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1050 if $self->{title};
1051
1052 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1053}
1054 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1055sub button_down { 1155sub invoke_button_down {
1056 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1057 1157
1058 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1059 my $border = $self->border; 1159 my $border = $self->border;
1060 1160
… …
1073 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1074 1174
1075 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
1076 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
1077 1177
1078 $self->{user_x} = $wx + $dx * $mx;
1079 $self->{user_y} = $wy + $dy * $my;
1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082 $self->move ($self->{user_x}, $self->{user_y}); 1180
1083 $self->check_size; 1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1182 $self->realloc;
1084 }; 1183 };
1085 1184
1086 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
1087 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1090 $self->{motion} = sub { 1189 $self->{motion} = sub {
1091 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
1092 1191
1093 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1094 1193
1095 $self->{user_x} = $bx + $x - $ox; 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096 $self->{user_y} = $by + $y - $oy; 1195 # HACK: the next line is required to enforce placement
1097 1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
1101 } 1202 1
1102} 1203}
1103 1204
1104sub button_up { 1205sub invoke_button_up {
1105 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1106 1207
1107 delete $self->{motion}; 1208 ! ! delete $self->{motion}
1108} 1209}
1109 1210
1110sub mouse_motion { 1211sub invoke_mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1112 1213
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
1114} 1217}
1115 1218
1116sub _draw { 1219sub _draw {
1117 my ($self) = @_; 1220 my ($self) = @_;
1118 1221
1222 my $child = $self->{children}[0];
1223
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1226
1122 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1229
1125 my $border = $self->border; 1230 my $border = $self->border;
1126 1231
1127 glColor @{ $self->{border_bg} }; 1232 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1233 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1237
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1239 glColor @{ $self->{bg} };
1135 1240
1136 # TODO: repeat texture not scale 1241 # TODO: repeat texture not scale
1242 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1243 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1244 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1246 }
1147 1247
1148 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1149 1249
1150 $self->{title}->draw if $self->{title};
1151
1152 $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};
1153} 1261}
1154 1262
1155############################################################################# 1263#############################################################################
1156 1264
1157package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1287 my ($self, $x, $y, $child) = @_;
1180 1288
1181 $child->set_parent ($self); 1289 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1183 1291
1184 $self->check_size (1); 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1185} 1299}
1186 1300
1187# 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?
1188sub clear { 1302sub clear {
1189 my ($self) = @_; 1303 my ($self) = @_;
… …
1194 for (@children) { 1308 for (@children) {
1195 delete $_->{parent}; 1309 delete $_->{parent};
1196 $_->hide; 1310 $_->hide;
1197 } 1311 }
1198 1312
1199 $self->check_size (1); 1313 $self->realloc;
1200 $self->update;
1201} 1314}
1202 1315
1203sub get_wh { 1316sub get_wh {
1204 my ($self) = @_; 1317 my ($self) = @_;
1205 1318
… …
1231 (sum @$ws), 1344 (sum @$ws),
1232 (sum @$hs), 1345 (sum @$hs),
1233 ) 1346 )
1234} 1347}
1235 1348
1236sub size_allocate { 1349sub invoke_size_allocate {
1237 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1238 1351
1239 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1240 1353
1241 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
… …
1273 } 1386 }
1274 1387
1275 $y += $row_h; 1388 $y += $row_h;
1276 } 1389 }
1277 1390
1391 1
1278} 1392}
1279 1393
1280sub find_widget { 1394sub find_widget {
1281 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1282 1396
… …
1319 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1320 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1321 ) 1435 )
1322} 1436}
1323 1437
1324sub size_allocate { 1438sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1326 1440
1327 my $space = $self->{vertical} ? $h : $w; 1441 my $space = $self->{vertical} ? $h : $w;
1328 my $children = $self->{children}; 1442 my $children = $self->{children};
1329 1443
… …
1413 ellipsise => 3, # end 1527 ellipsise => 3, # end
1414 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1415 fontsize => 1, 1529 fontsize => 1,
1416 align => -1, 1530 align => -1,
1417 valign => -1, 1531 valign => -1,
1418 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1419 can_events => 0, 1534 can_events => 0,
1420 %arg 1535 %arg
1421 ); 1536 );
1422 1537
1423 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1450 1565
1451 delete $self->{texture}; 1566 delete $self->{texture};
1452 $self->SUPER::update; 1567 $self->SUPER::update;
1453} 1568}
1454 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1455sub set_text { 1577sub set_text {
1456 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1457 1579
1458 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1459 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1460 1582
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1463 1585
1586 delete $self->{size_req};
1587 $self->realloc;
1464 $self->update; 1588 $self->update;
1465 $self->check_size;
1466} 1589}
1467 1590
1468sub set_markup { 1591sub set_markup {
1469 my ($self, $markup) = @_; 1592 my ($self, $markup) = @_;
1470 1593
… …
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475 1598
1476 $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;
1477 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1478 1601
1602 delete $self->{size_req};
1603 $self->realloc;
1479 $self->update; 1604 $self->update;
1480 $self->check_size;
1481} 1605}
1482 1606
1483sub size_request { 1607sub size_request {
1484 my ($self) = @_; 1608 my ($self) = @_;
1485 1609
1610 $self->{size_req} ||= do {
1486 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1487 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1488 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1489 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1490 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1491 1616
1492 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1493 1618
1494 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1495 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1496 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1622
1498 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1499 1624
1500 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1501 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1502 } 1630 };
1503 1631
1504 ( 1632 @{ $self->{size_req} }
1505 $w + $self->{padding} * 2,
1506 $h + $self->{padding} * 2,
1507 )
1508} 1633}
1509 1634
1510sub size_allocate { 1635sub invoke_size_allocate {
1511 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1512 1637
1638 delete $self->{ox};
1639
1513 delete $self->{texture}; 1640 delete $self->{texture}
1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1514} 1644}
1515 1645
1516sub set_fontsize { 1646sub set_fontsize {
1517 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1518 1648
1519 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1520 delete $self->{texture}; 1650 delete $self->{texture};
1521 1651
1522 $self->update; 1652 $self->realloc;
1523 $self->check_size; 1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1524} 1661}
1525 1662
1526sub _draw { 1663sub _draw {
1527 my ($self) = @_; 1664 my ($self) = @_;
1528 1665
… …
1534 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1535 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538 1675
1539 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1540 1678
1679 unless (exists $self->{ox}) {
1541 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1542 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1543 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1544 1683
1545 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1546 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1547 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1548
1549 $tex
1550 }; 1687 };
1551 1688
1552 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1553 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};
1554 1693
1555 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1556 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1557 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1558 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1560 } 1701 }
1561 1702
1562 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1563} 1704}
1564 1705
… …
1581 can_hover => 1, 1722 can_hover => 1,
1582 can_focus => 1, 1723 can_focus => 1,
1583 valign => 0, 1724 valign => 0,
1584 can_events => 1, 1725 can_events => 1,
1585 #text => ... 1726 #text => ...
1727 #hidden => "*",
1586 @_ 1728 @_
1587 ) 1729 )
1588} 1730}
1589 1731
1590sub _set_text { 1732sub _set_text {
… …
1592 1734
1593 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1594 1736
1595 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1596 1738
1597 delete $self->{texture};
1598
1599 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1600 $self->{text} = $text; 1740 $self->{text} = $text;
1601 1741
1602 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1603 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1604 1745
1605 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1606} 1750}
1607 1751
1608sub set_text { 1752sub set_text {
1609 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1610 1754
1611 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1612 $self->_set_text ($text); 1756 $self->_set_text ($text);
1613 $self->update;
1614 $self->check_size;
1615} 1757}
1616 1758
1617sub get_text { 1759sub get_text {
1618 $_[0]{text} 1760 $_[0]{text}
1619} 1761}
… …
1624 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1625 1767
1626 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1627} 1769}
1628 1770
1629sub key_down { 1771sub invoke_key_down {
1630 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1631 1773
1632 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1633 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1634 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1646 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1647 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1648 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1649 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1650 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1651 $self->_emit ('escape'); 1793 $self->emit ('escape');
1652 } elsif ($uni) { 1794 } elsif ($uni) {
1653 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1654 } 1798 }
1655 1799
1656 $self->_set_text ($text); 1800 $self->_set_text ($text);
1657 $self->update;
1658 $self->check_size;
1659}
1660 1801
1802 $self->realloc;
1803
1804 1
1805}
1806
1661sub focus_in { 1807sub invoke_focus_in {
1662 my ($self) = @_; 1808 my ($self) = @_;
1663 1809
1664 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1665 1811
1666 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1667} 1813}
1668 1814
1669sub button_down { 1815sub invoke_button_down {
1670 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1671 1817
1672 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1673 1819
1674 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1675 1821
1676 # byte-index to char-index 1822 # byte-index to char-index
1677 my $text = $self->{text}; 1823 my $text = $self->{text};
1678 utf8::encode $text; 1824 utf8::encode $text;
1679 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1680 1826
1681 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1682 $self->update; 1828 $self->update;
1829
1830 1
1683} 1831}
1684 1832
1685sub mouse_motion { 1833sub invoke_mouse_motion {
1686 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1687# 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
1688} 1838}
1689 1839
1690sub _draw { 1840sub _draw {
1691 my ($self) = @_; 1841 my ($self) = @_;
1692 1842
1693 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1694 1844
1695 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1696 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1697 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1698 } else { 1848 } else {
1699 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1700 } 1850 }
1701 1851
1702 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1704 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1705 glVertex 0 , 0; 1855 glVertex 0 , 0;
1706 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1707 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1708 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1733 1883
1734our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1735 1885
1736use CFClient::OpenGL; 1886use CFClient::OpenGL;
1737 1887
1738sub key_down { 1888sub invoke_key_down {
1739 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1740 1890
1741 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1742 1892
1743 if ($sym == 13) { 1893 if ($sym == 13) {
1744 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1745 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1896
1746 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1747 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1748 $self->_emit (activate => $txt); 1899 $self->emit (activate => $txt);
1749 $self->update; 1900 $self->update;
1750 1901
1751 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1752 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1753 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1769 } else { 1920 } else {
1770 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1771 } 1922 }
1772 1923
1773 } else { 1924 } else {
1774 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::invoke_key_down ($ev)
1926 }
1927
1775 } 1928 1
1776
1777} 1929}
1778 1930
1779############################################################################# 1931#############################################################################
1780 1932
1781package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1790 1942
1791sub new { 1943sub new {
1792 my $class = shift; 1944 my $class = shift;
1793 1945
1794 $class->SUPER::new ( 1946 $class->SUPER::new (
1795 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1796 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1797 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1798 can_hover => 1, 1951 can_hover => 1,
1799 align => 0, 1952 align => 0,
1800 valign => 0, 1953 valign => 0,
1801 can_events => 1, 1954 can_events => 1,
1802 @_ 1955 @_
1803 ) 1956 )
1804} 1957}
1805 1958
1806sub activate { }
1807
1808sub button_up { 1959sub invoke_button_up {
1809 my ($self, $ev, $x, $y) = @_; 1960 my ($self, $ev, $x, $y) = @_;
1810 1961
1811 $self->emit ("activate") 1962 $self->emit ("activate")
1812 if $x >= 0 && $x < $self->{w} 1963 if $x >= 0 && $x < $self->{w}
1813 && $y >= 0 && $y < $self->{h}; 1964 && $y >= 0 && $y < $self->{h};
1965
1966 1
1814} 1967}
1815 1968
1816sub _draw { 1969sub _draw {
1817 my ($self) = @_; 1970 my ($self) = @_;
1818 1971
1819 local $self->{fg} = $self->{fg}; 1972 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1820
1821 if ($GRAB == $self) {
1822 $self->{fg} = $self->{active_fg};
1823 }
1824 1973
1825 glEnable GL_TEXTURE_2D; 1974 glEnable GL_TEXTURE_2D;
1826 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1827 glColor 0, 0, 0, 1; 1976 glColor 0, 0, 0, 1;
1828 1977
… …
1833 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1834} 1983}
1835 1984
1836############################################################################# 1985#############################################################################
1837 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
1838package CFClient::UI::CheckBox; 2023package CFClient::UI::CheckBox;
1839 2024
1840our @ISA = CFClient::UI::DrawBG::; 2025our @ISA = CFClient::UI::DrawBG::;
1841 2026
1842my @tex = 2027my @tex =
… …
1847 2032
1848sub new { 2033sub new {
1849 my $class = shift; 2034 my $class = shift;
1850 2035
1851 $class->SUPER::new ( 2036 $class->SUPER::new (
1852 padding => 2, 2037 padding_x => 2,
2038 padding_y => 2,
1853 fg => [1, 1, 1], 2039 fg => [1, 1, 1],
1854 active_fg => [1, 1, 0], 2040 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2], 2041 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5], 2042 active_bg => [1, 1, 1, 0.5],
1857 state => 0, 2043 state => 0,
… …
1861} 2047}
1862 2048
1863sub size_request { 2049sub size_request {
1864 my ($self) = @_; 2050 my ($self) = @_;
1865 2051
1866 ($self->{padding} * 2 + 6) x 2 2052 (6) x 2
1867} 2053}
1868 2054
1869sub button_down { 2055sub invoke_button_down {
1870 my ($self, $ev, $x, $y) = @_; 2056 my ($self, $ev, $x, $y) = @_;
1871 2057
1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874 $self->{state} = !$self->{state}; 2060 $self->{state} = !$self->{state};
1875 $self->_emit (changed => $self->{state}); 2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
1876 } 2066 1
1877} 2067}
1878 2068
1879sub _draw { 2069sub _draw {
1880 my ($self) = @_; 2070 my ($self) = @_;
1881 2071
1882 $self->SUPER::_draw; 2072 $self->SUPER::_draw;
1883 2073
1884 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2074 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885 2075
1886 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;
1887 2079
1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2080 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889 2081
1890 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2082 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891 2083
… …
2046 2238
2047 my $h1 = $self->{h} * (1 - $ycut1); 2239 my $h1 = $self->{h} * (1 - $ycut1);
2048 my $h2 = $self->{h} * (1 - $ycut2); 2240 my $h2 = $self->{h} * (1 - $ycut2);
2049 2241
2050 glEnable GL_BLEND; 2242 glEnable GL_BLEND;
2051 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;
2052 glEnable GL_TEXTURE_2D; 2245 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 2247
2055 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2248 glBindTexture GL_TEXTURE_2D, $t1->{name};
2056 glBegin GL_QUADS; 2249 glBegin GL_QUADS;
… …
2156 fg => [1, 1, 1], 2349 fg => [1, 1, 1],
2157 active_fg => [0, 0, 0], 2350 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2], 2351 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5], 2352 active_bg => [1, 1, 1, 0.5],
2160 range => [0, 0, 100, 10, 0], 2353 range => [0, 0, 100, 10, 0],
2161 req_w => $::WIDTH / 80, 2354 min_w => $::WIDTH / 80,
2162 req_h => $::WIDTH / 80, 2355 min_h => $::WIDTH / 80,
2163 vertical => 0, 2356 vertical => 0,
2164 can_hover => 1, 2357 can_hover => 1,
2165 inner_pad => 0.02, 2358 inner_pad => 0.02,
2166 @_ 2359 @_
2167 ); 2360 );
… …
2175sub set_range { 2368sub set_range {
2176 my ($self, $range) = @_; 2369 my ($self, $range) = @_;
2177 2370
2178 ($range, $self->{range}) = ($self->{range}, $range); 2371 ($range, $self->{range}) = ($self->{range}, $range);
2179 2372
2180 $self->update
2181 if "@$range" ne "@{$self->{range}}"; 2373 if ("@$range" ne "@{$self->{range}}") {
2374 $self->update;
2375 $self->set_value ($self->{range}[0]);
2376 }
2182} 2377}
2183 2378
2184sub set_value { 2379sub set_value {
2185 my ($self, $value) = @_; 2380 my ($self, $value) = @_;
2186 2381
… …
2197 if $unit; 2392 if $unit;
2198 2393
2199 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2394 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2200 2395
2201 if ($value != $old_value) { 2396 if ($value != $old_value) {
2202 $self->_emit (changed => $value); 2397 $self->emit (changed => $value);
2203 $self->update; 2398 $self->update;
2204 } 2399 }
2205} 2400}
2206 2401
2207sub size_request { 2402sub size_request {
2208 my ($self) = @_; 2403 my ($self) = @_;
2209 2404
2210 my $w = $self->{req_w}; 2405 ($self->{req_w}, $self->{req_h})
2211 my $h = $self->{req_h};
2212
2213 $self->{vertical} ? ($h, $w) : ($w, $h)
2214} 2406}
2215 2407
2216sub button_down { 2408sub invoke_button_down {
2217 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
2218 2410
2219 $self->SUPER::button_down ($ev, $x, $y); 2411 $self->SUPER::invoke_button_down ($ev, $x, $y);
2220 2412
2221 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222 2414
2223 $self->mouse_motion ($ev, $x, $y); 2415 $self->invoke_mouse_motion ($ev, $x, $y)
2224} 2416}
2225 2417
2226sub mouse_motion { 2418sub invoke_mouse_motion {
2227 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2228 2420
2229 if ($GRAB == $self) { 2421 if ($GRAB == $self) {
2230 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2422 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2231 2423
2232 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2424 my (undef, $lo, $hi, $page) = @{$self->{range}};
2233 2425
2234 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2426 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235 2427
2236 $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
2237 } 2433 1
2238} 2434}
2239 2435
2240sub update { 2436sub update {
2241 my ($self) = @_; 2437 my ($self) = @_;
2242 2438
2243 $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}) {
2244 $self->set_value ($self->{range}[0]); 2447 $self->set_value ($self->{range}[0]);
2245 2448
2246 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2449 my ($value, $lo, $hi, $page) = @{$self->{range}};
2247 my $range = ($hi - $page - $lo) || 1e-100; 2450 my $range = ($hi - $page - $lo) || 1e-100;
2248 2451
… …
2254 $value = ($value - $lo) / $range; 2457 $value = ($value - $lo) / $range;
2255 $value = $value * $self->{scale} + $self->{offset}; 2458 $value = $value * $self->{scale} + $self->{offset};
2256 2459
2257 $self->{knob_x} = $value - $knob_w * 0.5; 2460 $self->{knob_x} = $value - $knob_w * 0.5;
2258 $self->{knob_w} = $knob_w; 2461 $self->{knob_w} = $knob_w;
2259 }); 2462 }
2260
2261 $self->SUPER::update;
2262}
2263
2264sub _draw {
2265 my ($self) = @_;
2266 2463
2267 $self->SUPER::_draw (); 2464 $self->SUPER::_draw ();
2268 2465
2269 glScale $self->{w}, $self->{h}; 2466 glScale $self->{w}, $self->{h};
2270 2467
… …
2331sub set_range { shift->{slider}->set_range (@_) } 2528sub set_range { shift->{slider}->set_range (@_) }
2332sub set_value { shift->{slider}->set_value (@_) } 2529sub set_value { shift->{slider}->set_value (@_) }
2333 2530
2334############################################################################# 2531#############################################################################
2335 2532
2336package CFClient::UI::TextView; 2533package CFClient::UI::TextScroller;
2337 2534
2338our @ISA = CFClient::UI::HBox::; 2535our @ISA = CFClient::UI::HBox::;
2339 2536
2340use CFClient::OpenGL; 2537use CFClient::OpenGL;
2341 2538
… …
2343 my $class = shift; 2540 my $class = shift;
2344 2541
2345 my $self = $class->SUPER::new ( 2542 my $self = $class->SUPER::new (
2346 fontsize => 1, 2543 fontsize => 1,
2347 can_events => 0, 2544 can_events => 0,
2545 indent => 0,
2348 #font => default_font 2546 #font => default_font
2349 @_, 2547 @_,
2350 2548
2351 layout => (new CFClient::Layout 1), 2549 layout => (new CFClient::Layout 1),
2352 par => [], 2550 par => [],
… …
2367 2565
2368 $self->{fontsize} = $fontsize; 2566 $self->{fontsize} = $fontsize;
2369 $self->reflow; 2567 $self->reflow;
2370} 2568}
2371 2569
2372sub size_allocate { 2570sub invoke_size_allocate {
2373 my ($self, $w, $h) = @_; 2571 my ($self, $w, $h) = @_;
2374
2375 $self->SUPER::size_allocate ($w, $h);
2376 2572
2377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2573 $self->{layout}->set_font ($self->{font}) if $self->{font};
2378 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2379 $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});
2380 2577
2381 $self->reflow; 2578 $self->reflow;
2579
2580 $self->SUPER::invoke_size_allocate ($w, $h)
2382} 2581}
2383 2582
2384sub text_size { 2583sub text_size {
2385 my ($self, $text, $indent) = @_; 2584 my ($self, $text, $indent) = @_;
2386 2585
2387 my $layout = $self->{layout}; 2586 my $layout = $self->{layout};
2388 2587
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $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});
2391 $layout->set_markup ($text); 2591 $layout->set_markup ($text);
2392 2592
2393 $layout->size 2593 $layout->size
2394} 2594}
2395 2595
… …
2434 2634
2435 return unless $self->{h} > 0; 2635 return unless $self->{h} > 0;
2436 2636
2437 delete $self->{texture}; 2637 delete $self->{texture};
2438 2638
2439 $ROOT->on_post_alloc ($self, sub { 2639 $ROOT->on_post_alloc ($self => sub {
2440 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2441 2641
2442 if (delete $self->{need_reflow}) { 2642 if (delete $self->{need_reflow}) {
2443 my $height = 0; 2643 my $height = 0;
2444 2644
… …
2447 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2448 2648
2449 for (@{$self->{par}}) { 2649 for (@{$self->{par}}) {
2450 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2451 $layout->set_width ($W - $_->[3]); 2651 $layout->set_width ($W - $_->[3]);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2452 $layout->set_markup ($_->[4]); 2653 $layout->set_markup ($_->[4]);
2453 my ($w, $h) = $layout->size; 2654 my ($w, $h) = $layout->size;
2454 $_->[0] = $w + $_->[3]; 2655 $_->[0] = $w + $_->[3];
2455 $_->[1] = $h; 2656 $_->[1] = $h;
2456 } 2657 }
… …
2459 } 2660 }
2460 2661
2461 $self->{height} = $height; 2662 $self->{height} = $height;
2462 2663
2463 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2464 2665
2465 delete $self->{texture}; 2666 delete $self->{texture};
2466 } 2667 }
2467 2668
2468 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2469 glClearColor 0.5, 0.5, 0.5, 0; 2670 glClearColor 0, 0, 0, 0;
2470 glClear GL_COLOR_BUFFER_BIT; 2671 glClear GL_COLOR_BUFFER_BIT;
2471 2672
2472 my $top = int $self->{children}[1]{range}[0]; 2673 my $top = int $self->{children}[1]{range}[0];
2473 2674
2474 my $y0 = $top; 2675 my $y0 = $top;
… …
2488 my $h = $par->[1]; 2689 my $h = $par->[1];
2489 2690
2490 if ($y0 < $y + $h && $y < $y1) { 2691 if ($y0 < $y + $h && $y < $y1) {
2491 $layout->set_foreground (@{ $par->[2] }); 2692 $layout->set_foreground (@{ $par->[2] });
2492 $layout->set_width ($W - $par->[3]); 2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2493 $layout->set_markup ($par->[4]); 2695 $layout->set_markup ($par->[4]);
2494 2696
2495 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2697 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2496 2698
2497 glRasterPos $par->[3], $y - $y0; 2699 glRasterPos $par->[3], $y - $y0;
… …
2509sub _draw { 2711sub _draw {
2510 my ($self) = @_; 2712 my ($self) = @_;
2511 2713
2512 glEnable GL_TEXTURE_2D; 2714 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2716 glColor 0, 0, 0, 1;
2515 $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});
2516 glDisable GL_TEXTURE_2D; 2718 glDisable GL_TEXTURE_2D;
2517 2719
2518 $self->{children}[1]->draw; 2720 $self->{children}[1]->draw;
2519 2721
2520} 2722}
… …
2603} 2805}
2604 2806
2605sub set_tooltip_from { 2807sub set_tooltip_from {
2606 my ($self, $widget) = @_; 2808 my ($self, $widget) = @_;
2607 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
2608 $self->add (new CFClient::UI::Label 2822 $self->add (new CFClient::UI::Label
2609 markup => $widget->{tooltip}, 2823 markup => $tooltip,
2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8, 2825 fontsize => 0.8,
2612 fg => [0, 0, 0, 1], 2826 fg => [0, 0, 0, 1],
2613 ellipsise => 0, 2827 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP), 2828 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2621 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2835 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2622 2836
2623 ($w + 4, $h + 4) 2837 ($w + 4, $h + 4)
2624} 2838}
2625 2839
2626sub size_allocate { 2840sub invoke_size_allocate {
2627 my ($self, $w, $h) = @_; 2841 my ($self, $w, $h) = @_;
2628 2842
2629 $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 });
2630} 2862}
2631 2863
2632sub _draw { 2864sub _draw {
2633 my ($self) = @_; 2865 my ($self) = @_;
2634 2866
… …
2651 glVertex $w, $h; 2883 glVertex $w, $h;
2652 glVertex $w, 0; 2884 glVertex $w, 0;
2653 glEnd; 2885 glEnd;
2654 2886
2655 glTranslate 2 - 0.375, 2 - 0.375; 2887 glTranslate 2 - 0.375, 2 - 0.375;
2888
2656 $self->SUPER::_draw; 2889 $self->SUPER::_draw;
2657} 2890}
2658 2891
2659############################################################################# 2892#############################################################################
2660 2893
… …
2719 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2720 2953
2721 if ($tex) { 2954 if ($tex) {
2722 glEnable GL_TEXTURE_2D; 2955 glEnable GL_TEXTURE_2D;
2723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2724 glColor 1, 1, 1, 1; 2957 glColor 0, 0, 0, 1;
2725 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2726 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2727 } 2960 }
2728} 2961}
2729 2962
2730sub DESTROY { 2963sub destroy {
2731 my ($self) = @_; 2964 my ($self) = @_;
2732 2965
2733 $self->{timer}->cancel 2966 $self->{timer}->cancel
2734 if $self->{timer}; 2967 if $self->{timer};
2735 2968
2736 $self->SUPER::DESTROY; 2969 $self->SUPER::destroy;
2737} 2970}
2738 2971
2739############################################################################# 2972#############################################################################
2740 2973
2741package CFClient::UI::Inventory; 2974package CFClient::UI::Buttonbar;
2742 2975
2743our @ISA = CFClient::UI::ScrolledWindow::; 2976our @ISA = CFClient::UI::HBox::;
2744 2977
2745sub new { 2978# TODO: should actualyl wrap buttons and other goodies.
2746 my $class = shift;
2747
2748 my $self = $class->SUPER::new (
2749 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2750 @_,
2751 );
2752
2753 $self
2754}
2755
2756sub set_items {
2757 my ($self, $items) = @_;
2758
2759 $self->{scrolled}->clear;
2760 return unless $items;
2761
2762 my @items = sort {
2763 ($a->{type} <=> $b->{type})
2764 or ($a->{name} cmp $b->{name})
2765 } @$items;
2766
2767 $self->{real_items} = \@items;
2768
2769 my $row = 0;
2770 for my $item (@items) {
2771 CFClient::Item::update_widgets $item;
2772
2773 $self->{scrolled}->add (0, $row, $item->{face_widget});
2774 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2775 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2776
2777 $row++;
2778 }
2779}
2780 2979
2781############################################################################# 2980#############################################################################
2782 2981
2783package CFClient::UI::Menu; 2982package CFClient::UI::Menu;
2784 2983
… …
2796 ); 2995 );
2797 2996
2798 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2997 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2799 2998
2800 for my $item (@{ $self->{items} }) { 2999 for my $item (@{ $self->{items} }) {
2801 my ($widget, $cb) = @$item; 3000 my ($widget, $cb, $tooltip) = @$item;
2802 3001
2803 # handle various types of items, only text for now 3002 # handle various types of items, only text for now
2804 if (!ref $widget) { 3003 if (!ref $widget) {
2805 $widget = new CFClient::UI::Label 3004 $widget = new CFClient::UI::Label
2806 can_hover => 1, 3005 can_hover => 1,
2807 can_events => 1, 3006 can_events => 1,
2808 text => $widget; 3007 markup => $widget,
3008 tooltip => $tooltip
2809 } 3009 }
2810 3010
2811 $self->{item}{$widget} = $item; 3011 $self->{item}{$widget} = $item;
2812 3012
2813 $self->{vbox}->add ($widget); 3013 $self->{vbox}->add ($widget);
… …
2818 3018
2819# 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)
2820sub popup { 3020sub popup {
2821 my ($self, $ev) = @_; 3021 my ($self, $ev) = @_;
2822 3022
2823 $self->_emit ("popdown"); 3023 $self->emit ("popdown");
2824 3024
2825 # maybe save $GRAB? must be careful about events... 3025 # maybe save $GRAB? must be careful about events...
2826 $GRAB = $self; 3026 $GRAB = $self;
2827 $self->{button} = $ev->{button}; 3027 $self->{button} = $ev->{button};
2828 3028
2829 $self->show; 3029 $self->show;
2830 $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);
2831} 3031}
2832 3032
2833sub mouse_motion { 3033sub invoke_mouse_motion {
2834 my ($self, $ev, $x, $y) = @_; 3034 my ($self, $ev, $x, $y) = @_;
2835 3035
2836 # TODO: should use vbox->find_widget or so 3036 # TODO: should use vbox->find_widget or so
2837 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3037 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838 $self->{hover} = $self->{item}{$HOVER}; 3038 $self->{hover} = $self->{item}{$HOVER};
2839}
2840 3039
3040 0
3041}
3042
2841sub button_up { 3043sub invoke_button_up {
2842 my ($self, $ev, $x, $y) = @_; 3044 my ($self, $ev, $x, $y) = @_;
2843 3045
2844 if ($ev->{button} == $self->{button}) { 3046 if ($ev->{button} == $self->{button}) {
2845 undef $GRAB; 3047 undef $GRAB;
2846 $self->hide; 3048 $self->hide;
2847 3049
2848 $self->_emit ("popdown"); 3050 $self->emit ("popdown");
2849 $self->{hover}[1]->() if $self->{hover}; 3051 $self->{hover}[1]->() if $self->{hover};
3052 } else {
3053 return 0
3054 }
3055
2850 } 3056 1
2851} 3057}
2852 3058
2853############################################################################# 3059#############################################################################
2854 3060
2855package CFClient::UI::Statusbox; 3061package CFClient::UI::Multiplexer;
2856 3062
2857our @ISA = CFClient::UI::VBox::; 3063our @ISA = CFClient::UI::Container::;
2858 3064
2859sub new { 3065sub new {
2860 my $class = shift; 3066 my $class = shift;
2861 3067
2862 $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 (
2863 fontsize => 0.8, 3235 fontsize => 0.8,
2864 @_, 3236 @_,
2865 ) 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
2866} 3244}
2867 3245
2868sub reorder { 3246sub reorder {
2869 my ($self) = @_; 3247 my ($self) = @_;
2870 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} };
2871 3254
2872 while (my ($k, $v) = each %{ $self->{item} }) { 3255 while (my ($k, $v) = each %{ $self->{item} }) {
2873 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3256 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2874 } 3257 }
2875 3258
… …
2878 my @items = sort { 3261 my @items = sort {
2879 $a->{pri} <=> $b->{pri} 3262 $a->{pri} <=> $b->{pri}
2880 or $b->{id} <=> $a->{id} 3263 or $b->{id} <=> $a->{id}
2881 } values %{ $self->{item} }; 3264 } values %{ $self->{item} };
2882 3265
3266 $self->{timer}->interval (1);
3267
2883 my $count = 10 + 1; 3268 my $count = 10 + 1;
2884 for my $item (@items) { 3269 for my $item (@items) {
2885 last unless --$count; 3270 last unless --$count;
2886 3271
2887 push @widgets, $item->{label} ||= do { 3272 my $label = $item->{label} ||= do {
2888 # TODO: doesn't handle markup well (read as: at all) 3273 # TODO: doesn't handle markup well (read as: at all)
2889 my $short = $item->{count} > 1 3274 my $short = $item->{count} > 1
2890 ? "<b>$item->{count} ×</b> $item->{text}" 3275 ? "<b>$item->{count} ×</b> $item->{text}"
2891 : $item->{text}; 3276 : $item->{text};
2892 3277
… …
2900 tooltip => $item->{tooltip}, 3285 tooltip => $item->{tooltip},
2901 tooltip_font => $::FONT_PROP, 3286 tooltip_font => $::FONT_PROP,
2902 tooltip_width => 0.67, 3287 tooltip_width => 0.67,
2903 fontsize => $item->{fontsize} || $self->{fontsize}, 3288 fontsize => $item->{fontsize} || $self->{fontsize},
2904 max_w => $::WIDTH * 0.44, 3289 max_w => $::WIDTH * 0.44,
2905 fg => $item->{fg}, 3290 fg => [@{ $item->{fg} }],
2906 can_events => 1, 3291 can_events => 1,
2907 can_hover => 1 3292 can_hover => 1
2908 }; 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;
2909 } 3306 }
2910 3307
2911 $self->clear; 3308 $self->clear;
2912 $self->SUPER::add (reverse @widgets); 3309 $self->SUPER::add (reverse @widgets);
2913} 3310}
… …
2918 $text =~ s/^\s+//; 3315 $text =~ s/^\s+//;
2919 $text =~ s/\s+$//; 3316 $text =~ s/\s+$//;
2920 3317
2921 return unless $text; 3318 return unless $text;
2922 3319
2923 my $timeout = time + ((delete $arg{timeout}) || 60); 3320 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2924 3321
2925 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3322 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2926 3323
2927 if (my $item = $self->{item}{$group}) { 3324 if (my $item = $self->{item}{$group}) {
2928 if ($item->{text} eq $text) { 3325 if ($item->{text} eq $text) {
2929 $item->{count}++; 3326 $item->{count}++;
2930 } else { 3327 } else {
2931 $item->{count} = 1; 3328 $item->{count} = 1;
2932 $item->{text} = $item->{tooltip} = $text; 3329 $item->{text} = $item->{tooltip} = $text;
2933 } 3330 }
2934 $item->{id} = ++$self->{id}; 3331 $item->{id} += 0.2;#d#
2935 $item->{timeout} = $timeout; 3332 $item->{timeout} = $timeout;
2936 delete $item->{label}; 3333 delete $item->{label};
2937 } else { 3334 } else {
2938 $self->{item}{$group} = { 3335 $self->{item}{$group} = {
2939 id => ++$self->{id}, 3336 id => ++$self->{id},
… …
2958 3355
2959 $self->reorder; 3356 $self->reorder;
2960 $self->SUPER::reconfigure; 3357 $self->SUPER::reconfigure;
2961} 3358}
2962 3359
3360sub destroy {
3361 my ($self) = @_;
3362
3363 $self->{timer}->cancel;
3364
3365 $self->SUPER::destroy;
3366}
3367
2963############################################################################# 3368#############################################################################
2964 3369
2965package CFClient::UI::Root; 3370package CFClient::UI::Inventory;
2966 3371
2967our @ISA = CFClient::UI::Container::; 3372our @ISA = CFClient::UI::ScrolledWindow::;
2968
2969use CFClient::OpenGL;
2970 3373
2971sub new { 3374sub new {
2972 my $class = shift; 3375 my $class = shift;
2973 3376
2974 $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 (
2975 visible => 1, 3744 visible => 1,
2976 @_, 3745 @_,
2977 ) 3746 );
2978}
2979 3747
2980sub configure { 3748 Scalar::Util::weaken ($self->{root} = $self);
2981 my ($self, $x, $y, $w, $h) = @_;
2982 3749
2983 $self->{w} = $w; 3750 $self
2984 $self->{h} = $h;
2985}
2986
2987sub check_size {
2988 my ($self) = @_;
2989
2990 $self->size_allocate ($self->{w}, $self->{h})
2991 if $self->{w};
2992} 3751}
2993 3752
2994sub size_request { 3753sub size_request {
2995 my ($self) = @_; 3754 my ($self) = @_;
2996 3755
2997 ($self->{w}, $self->{h}) 3756 ($self->{w}, $self->{h})
2998} 3757}
2999 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
3000sub size_allocate { 3773sub invoke_size_allocate {
3001 my ($self, $w, $h) = @_; 3774 my ($self, $w, $h) = @_;
3002 3775
3003 for my $child ($self->children) { 3776 for my $child ($self->children) {
3004 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)};
3005 3778
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3779 $X = $child->{force_x} if exists $child->{force_x};
3007 if exists $child->{req_x}; 3780 $Y = $child->{force_y} if exists $child->{force_y};
3008 3781
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3782 $X = _to_pixel $X, $W, $self->{w};
3010 if exists $child->{req_y}; 3783 $Y = _to_pixel $Y, $H, $self->{h};
3011
3012 delete @$child{qw(req_x req_y)};
3013
3014 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3015 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3016 3784
3017 $child->configure ($X, $Y, $W, $H); 3785 $child->configure ($X, $Y, $W, $H);
3018 } 3786 }
3787
3788 1
3019} 3789}
3020 3790
3021sub coord2local { 3791sub coord2local {
3022 my ($self, $x, $y) = @_; 3792 my ($self, $x, $y) = @_;
3023 3793
… …
3031} 3801}
3032 3802
3033sub update { 3803sub update {
3034 my ($self) = @_; 3804 my ($self) = @_;
3035 3805
3036 $self->check_size;
3037 $::WANT_REFRESH++; 3806 $::WANT_REFRESH++;
3038} 3807}
3039 3808
3040sub add { 3809sub add {
3041 my ($self, @children) = @_; 3810 my ($self, @children) = @_;
3042 3811
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1; 3812 $_->{is_toplevel} = 1
3045 3813 for @children;
3046 # integerise window positions
3047 $child->{x} = int $child->{x};
3048 $child->{y} = int $child->{y};
3049 }
3050 3814
3051 $self->SUPER::add (@children); 3815 $self->SUPER::add (@children);
3052
3053 for (my @widgets = @children; my $w = pop @widgets; ) {
3054 push @widgets, $w->children;
3055 $w->set_visible;
3056 }
3057
3058} 3816}
3059 3817
3060sub remove { 3818sub remove {
3061 my ($self, @children) = @_; 3819 my ($self, @children) = @_;
3062 3820
3063 $self->SUPER::remove (@children); 3821 $self->SUPER::remove (@children);
3822
3823 delete $self->{is_toplevel}
3824 for @children;
3064 3825
3065 while (@children) { 3826 while (@children) {
3066 my $w = pop @children; 3827 my $w = pop @children;
3067 push @children, $w->children; 3828 push @children, $w->children;
3068 $w->set_invisible; 3829 $w->set_invisible;
… …
3087 while ($self->{refresh_hook}) { 3848 while ($self->{refresh_hook}) {
3088 $_->() 3849 $_->()
3089 for values %{delete $self->{refresh_hook}}; 3850 for values %{delete $self->{refresh_hook}};
3090 } 3851 }
3091 3852
3092 if ($self->{check_size}) { 3853 if ($self->{realloc}) {
3854 my %queue;
3093 my @queue; 3855 my @queue;
3856 my $widget;
3094 3857
3095 for (;;) { 3858 outer:
3096 if ($self->{check_size}) { 3859 while () {
3097 #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
3098 3863
3099 @queue = sort { $a->{visible} <=> $b->{visible} } 3864 $queue{$widget+0}++ and next; # duplicates are common
3100 @queue, values %{delete $self->{check_size}}; 3865
3866 push @{ $queue[$widget->{visible}] }, $widget;
3867 }
3101 } 3868 }
3102 3869
3870 while () {
3871 @queue or last outer;
3872
3103 my $widget = pop @queue || last; 3873 $widget = pop @{ $queue[-1] || [] }
3104 3874 and last;
3105 defined $widget->{visible} or last; # do not resize invisible widgets
3106
3107 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3108 ? @$widget{qw(def_w def_h)}
3109 : $widget->size_request;
3110
3111 if (delete $widget->{force_alloc}
3112 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3113 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3114 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}) {
3115 $widget->{req_w} = $w; 3894 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h; 3895 $widget->{req_h} = $h;
3117 3896
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3897 $self->{size_alloc}{$widget+0} = $widget;
3119 3898
3120 $widget->{parent}->check_size
3121 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 }
3122 } 3906 }
3907
3908 delete $self->{realloc}{$widget+0};
3123 } 3909 }
3124 } 3910 }
3125 3911
3126 while ($self->{size_alloc}) { 3912 while (my $size_alloc = delete $self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) { 3913 my @queue = sort { $b->{visible} <=> $a->{visible} }
3128 my ($widget, $w, $h) = @$_; 3914 values %$size_alloc;
3915
3916 while () {
3917 my $widget = pop @queue || last;
3918
3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129 3920
3130 $w = 0 if $w < 0; 3921 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0; 3922 $h = 0 if $h < 0;
3132 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
3133 $widget->{w} = $w; 3931 $widget->{w} = $w;
3134 $widget->{h} = $h; 3932 $widget->{h} = $h;
3933
3135 $widget->emit (size_allocate => $w, $h); 3934 $widget->emit (size_allocate => $w, $h);
3935 }
3136 } 3936 }
3137 } 3937 }
3138 3938
3139 while ($self->{post_alloc_hook}) { 3939 while ($self->{post_alloc_hook}) {
3140 $_->() 3940 $_->()
3141 for values %{delete $self->{post_alloc_hook}}; 3941 for values %{delete $self->{post_alloc_hook}};
3142 } 3942 }
3943
3143 3944
3144 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3945 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3946 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146 glClear GL_COLOR_BUFFER_BIT; 3947 glClear GL_COLOR_BUFFER_BIT;
3147 3948
… …
3149 glLoadIdentity; 3950 glLoadIdentity;
3150 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151 glMatrixMode GL_MODELVIEW; 3952 glMatrixMode GL_MODELVIEW;
3152 glLoadIdentity; 3953 glLoadIdentity;
3153 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
3154 $self->_draw; 3962 $self->_draw;
3155} 3963}
3156 3964
3157############################################################################# 3965#############################################################################
3158 3966

Diff Legend

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