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

Diff Legend

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