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

Diff Legend

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