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.245 by elmex, Sat May 27 21:15:57 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}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
236} 238}
237 239
238sub destroy { 240sub destroy {
239 my ($self) = @_; 241 my ($self) = @_;
240 242
… …
242 %$self = (); 244 %$self = ();
243} 245}
244 246
245sub show { 247sub show {
246 my ($self) = @_; 248 my ($self) = @_;
249
247 return if $self->{parent}; 250 return if $self->{parent};
248 251
249 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
250} 253}
251 254
252sub show_centered { 255sub set_visible {
253 my ($self) = @_; 256 my ($self) = @_;
257
254 return if $self->{parent}; 258 return if $self->{visible};
255 259
256 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
257 262
258 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
259 "centered $self" => sub { 264
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
261 }, 266
262 ); 267 $_->set_visible for $self->children;
263} 268}
264 269
265sub set_invisible { 270sub set_invisible {
266 my ($self) = @_; 271 my ($self) = @_;
267 272
268 return unless $self->{visible}; 273 return unless $self->{visible};
269 274
270 # broken show/hide model 275 $_->set_invisible for $self->children;
271 276
277 delete $self->{visible};
272 delete $self->{root}; 278 delete $self->{root};
273 delete $self->{visible};
274 279
275 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
276 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
277 282
278 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
279 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
280 285
281 $self->focus_out; 286 $self->emit ("focus_out");
282
283 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
284} 305}
285 306
286sub hide { 307sub hide {
287 my ($self) = @_; 308 my ($self) = @_;
288 309
… …
290 311
291 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
292 if $self->{parent}; 313 if $self->{parent};
293} 314}
294 315
295sub move { 316sub move_abs {
296 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
297 318
298 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
299 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
300 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
301 322
302 $self->update; 323 $self->update;
303} 324}
304 325
305sub set_size { 326sub set_size {
306 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
307 328
308 $self->{user_w} = $w; 329 $self->{force_w} = $w;
309 $self->{user_h} = $h; 330 $self->{force_h} = $h;
310 331
311 $self->check_size; 332 $self->realloc;
312} 333}
313 334
314sub size_request { 335sub size_request {
315 require Carp; 336 require Carp;
316 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
318 339
319sub configure { 340sub configure {
320 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
321 342
322 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
323 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
324 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
325 348
326 # use alignment to adjust x, y 349 # use alignment to adjust x, y
327 350
328 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
329 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
330
331 ($w, $h) = ($w2, $h2);
332 } 353 }
333 354
334 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
335 $self->{x} = $x; 356 $self->{x} = $x;
336 $self->{y} = $y; 357 $self->{y} = $y;
337 $self->update; 358 $self->update;
338 } 359 }
339 360
340 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
341 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
342 }
343}
344 363
345sub size_allocate { 364 $self->{alloc_w} = $w;
346 # nothing to be done 365 $self->{alloc_h} = $h;
347}
348 366
349sub reconfigure { 367 $self->{root}{size_alloc}{$self+0} = $self;
350 my ($self) = @_; 368 }
351
352 $self->check_size (1);
353 $self->update;
354} 369}
355 370
356sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
357} 377}
358 378
359sub set_max_size { 379sub set_max_size {
360 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
361 381
362 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
363 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
364} 386}
365 387
366sub set_tooltip { 388sub set_tooltip {
367 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
368 390
… …
373 395
374 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
375 397
376 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
377 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
378 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
379 } 401 }
380} 402}
381 403
382# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
383sub coord2local { 405sub coord2local {
… …
391 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
392 414
393 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
394} 416}
395 417
396sub focus_in { 418sub invoke_focus_in {
397 my ($self) = @_; 419 my ($self) = @_;
398 420
399 return if $FOCUS == $self; 421 return if $FOCUS == $self;
400 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
401 423
402 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
403 425
404 $self->_emit (focus_in => $focus);
405
406 $focus->update if $focus; 426 $focus->update if $focus;
407 $FOCUS->update; 427 $FOCUS->update;
408}
409 428
429 0
430}
431
410sub focus_out { 432sub invoke_focus_out {
411 my ($self) = @_; 433 my ($self) = @_;
412 434
413 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
414 436
415 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
416 438
417 $self->_emit (focus_out => $focus);
418
419 $focus->update if $focus; #? 439 $focus->update if $focus; #?
420 440
421 $::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
422 unless $FOCUS; 442 unless $FOCUS;
423}
424 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
425sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
426sub button_up { } 454sub invoke_button_up { 1 }
427sub key_down { } 455sub invoke_key_down { 1 }
428sub key_up { } 456sub invoke_key_up { 1 }
429 457
430sub button_down { 458sub invoke_button_down {
431 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
432 460
433 $self->focus_in; 461 $self->grab_focus;
434}
435 462
436sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
437sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
438sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
439sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
440sub 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
441 530
442sub draw { 531sub draw {
443 my ($self) = @_; 532 my ($self) = @_;
444 533
445 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);
446 545
447 glPushMatrix; 546 glPushMatrix;
448 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
449 $self->_draw;
450 glPopMatrix;
451 548
452 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
453 my ($x, $y) = @$self{qw(x y)};
454
455 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
456 glEnable GL_BLEND; 551 glEnable GL_BLEND;
457 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
458 glBegin GL_QUADS; 553 glBegin GL_QUADS;
459 glVertex $x , $y; 554 glVertex 0 , 0;
460 glVertex $x + $self->{w}, $y; 555 glVertex $self->{w}, 0;
461 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $self->{w}, $self->{h};
462 glVertex $x , $y + $self->{h}; 557 glVertex 0 , $self->{h};
463 glEnd; 558 glEnd;
464 glDisable GL_BLEND; 559 glDisable GL_BLEND;
465 } 560 }
466 561
467 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
468 glPushMatrix; 563 glPushMatrix;
469 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate 0.375, 0.375;
471 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
472 glVertex 0 , 0; 567 glVertex 0 , 0;
473 glVertex $self->{w} - 1, 0; 568 glVertex $self->{w} - 1, 0;
474 glVertex $self->{w} - 1, $self->{h} - 1; 569 glVertex $self->{w} - 1, $self->{h} - 1;
475 glVertex 0 , $self->{h} - 1; 570 glVertex 0 , $self->{h} - 1;
476 glEnd; 571 glEnd;
477 glPopMatrix; 572 glPopMatrix;
478 #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;
479 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
480} 578}
481 579
482sub _draw { 580sub _draw {
483 my ($self) = @_; 581 my ($self) = @_;
484 582
485 warn "no draw defined for $self\n"; 583 warn "no draw defined for $self\n";
486} 584}
487 585
488sub find_widget {
489 my ($self, $x, $y) = @_;
490
491 return () unless $self->{can_events};
492
493 return $self
494 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497 ()
498}
499
500sub set_parent {
501 my ($self, $parent) = @_;
502
503 Scalar::Util::weaken ($self->{parent} = $parent);
504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555}
556
557sub DESTROY { 586sub DESTROY {
558 my ($self) = @_; 587 my ($self) = @_;
559 588
560 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
561 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
562} 593}
563 594
564############################################################################# 595#############################################################################
565 596
566package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
591 622
592 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
593 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
594 625
595 glEnable GL_BLEND; 626 glEnable GL_BLEND;
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
597 glColor @$color; 628 glColor_premultiply @$color;
598 629
599 glBegin GL_QUADS; 630 glBegin GL_QUADS;
600 glVertex 0 , 0; 631 glVertex 0 , 0;
601 glVertex 0 , $h; 632 glVertex 0 , $h;
602 glVertex $w, $h; 633 glVertex $w, $h;
… …
617 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
619} 650}
620 651
621sub size_request { 652sub size_request {
622 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
623} 656}
624 657
625sub draw { } 658sub draw { }
626 659
627############################################################################# 660#############################################################################
… …
631our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
632 665
633sub new { 666sub new {
634 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
635 668
636 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
637 670
638 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
639 children => [], 672 children => [],
640 can_events => 0, 673 can_events => 0,
641 %arg, 674 %arg,
642 ); 675 );
676
643 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
644 679
645 $self 680 $self
646} 681}
647 682
648sub add { 683sub add {
… …
656 $self->{children} = [ 691 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 692 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 693 @{$self->{children}}, @widgets
659 ]; 694 ];
660 695
661 $self->check_size (1); 696 $self->realloc;
662 $self->update;
663} 697}
664 698
665sub children { 699sub children {
666 @{ $_[0]{children} } 700 @{ $_[0]{children} }
667} 701}
… …
672 delete $child->{parent}; 706 delete $child->{parent};
673 $child->hide; 707 $child->hide;
674 708
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 709 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 710
677 $self->check_size (1); 711 $self->realloc;
678 $self->update;
679} 712}
680 713
681sub clear { 714sub clear {
682 my ($self) = @_; 715 my ($self) = @_;
683 716
… …
687 for (@$children) { 720 for (@$children) {
688 delete $_->{parent}; 721 delete $_->{parent};
689 $_->hide; 722 $_->hide;
690 } 723 }
691 724
692 $self->check_size; 725 $self->realloc;
693 $self->update;
694} 726}
695 727
696sub find_widget { 728sub find_widget {
697 my ($self, $x, $y) = @_; 729 my ($self, $x, $y) = @_;
698 730
699 $x -= $self->{x}; 731 $x -= $self->{x};
700 $y -= $self->{y}; 732 $y -= $self->{y};
701 733
702 my $res; 734 my $res;
703 735
704 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
705 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
706 and return $res; 738 and return $res;
707 } 739 }
708 740
709 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
730} 762}
731 763
732sub add { 764sub add {
733 my ($self, $child) = @_; 765 my ($self, $child) = @_;
734 766
735 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
736
737 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
738} 769}
739 770
740sub remove { 771sub remove {
741 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
750 781
751sub size_request { 782sub size_request {
752 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
753} 784}
754 785
755sub size_allocate { 786sub invoke_size_allocate {
756 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
757 788
758 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
759} 792}
760 793
761############################################################################# 794#############################################################################
795
796# back-buffered drawing area
762 797
763package CFClient::UI::Window; 798package CFClient::UI::Window;
764 799
765our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
766 801
… …
777 812
778 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
779 $self->SUPER::update; 814 $self->SUPER::update;
780} 815}
781 816
782sub size_allocate { 817sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
784 819
785 $self->SUPER::size_allocate ($w, $h);
786 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
787} 823}
788 824
789sub _render { 825sub _render {
826 my ($self) = @_;
827
790 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
791} 829}
792 830
793sub render_child { 831sub render_child {
794 my ($self) = @_; 832 my ($self) = @_;
795 833
796 $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 {
797 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
799 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
800 $self->_render; 845 $self->_render;
801 }; 846 };
802} 847}
803 848
804sub _draw { 849sub _draw {
805 my ($self) = @_; 850 my ($self) = @_;
806 851
807 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
808 853
809 my $tex = $self->{texture} 854 my $tex = $self->{texture}
810 or return; 855 or return;
811 856
812 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
815 860
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 862
818 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
819} 864}
… …
835} 880}
836 881
837sub size_request { 882sub size_request {
838 my ($self) = @_; 883 my ($self) = @_;
839 884
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 886
842 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
843} 888 $h = 10 if $self->{scroll_y};
844 889
890 ($w, $h)
891}
892
845sub size_allocate { 893sub invoke_size_allocate {
846 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
847 895
896 my $child = $self->child;
897
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 900
851 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
852 $self->update; 902 $self->update;
903
904 1
853} 905}
854 906
855sub set_offset { 907sub set_offset {
856 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
857 909
… …
890} 942}
891 943
892sub _render { 944sub _render {
893 my ($self) = @_; 945 my ($self) = @_;
894 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
895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896 951
897 $self->SUPER::_render; 952 $self->SUPER::_render;
898} 953}
899 954
… …
902package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
903 958
904our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
905 960
906sub new { 961sub new {
907 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
908 965
909 my $self; 966 my $self;
910 967
911 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
912 vertical => 1, 969 vertical => 1,
… …
917 ; 974 ;
918 975
919 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
920 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
921 slider => $slider, 978 slider => $slider,
922 @_, 979 %arg,
923 ); 980 );
924 981
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
928 984
929 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
930} 992}
931 993
932sub update { 994sub update {
933 my ($self) = @_; 995 my ($self) = @_;
934 996
… …
937 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
939 $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]);
940} 1002}
941 1003
942sub size_allocate { 1004sub invoke_size_allocate {
943 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
944
945 $self->SUPER::size_allocate ($w, $h);
946 1006
947 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
948 $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)
949} 1011}
950 1012
951#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
952# update viewport offset on scroll 1014# update viewport offset on scroll
953 1015
… …
973 1035
974 if ($self->{bg}) { 1036 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
976 1038
977 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
979 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
980 1042
981 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
982 glVertex 0 , 0; 1044 glVertex 0 , 0;
983 glVertex 0 , $h; 1045 glVertex 0 , $h;
984 glVertex $w, $h; 1046 glVertex $w, $h;
… …
997 1059
998our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
999 1061
1000use CFClient::OpenGL; 1062use CFClient::OpenGL;
1001 1063
1002my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1071
1006sub new { 1072sub new {
1007 my $class = shift; 1073 my ($class, %arg) = @_;
1008
1009 # TODO: user_x, user_y, overwrite moveto?
1010 1074
1011 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1078 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1079 can_events => 1,
1017 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
1018 ); 1083 );
1019 1084
1020 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
1021 align => 0, 1086 align => 0,
1022 valign => 1, 1087 valign => 1,
1023 text => $self->{title}, 1088 text => $self->{title},
1024 fontsize => $self->{border}; 1089 fontsize => $self->{border},
1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
1025 1100
1026 $self 1101 $self
1102}
1103
1104sub add {
1105 my ($self, @widgets) = @_;
1106
1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1027} 1110}
1028 1111
1029sub border { 1112sub border {
1030 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
1031} 1114}
1032 1115
1033sub size_request { 1116sub size_request {
1034 my ($self) = @_; 1117 my ($self) = @_;
1118
1119 $self->{title_widget}->size_request
1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
1035 1124
1036 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1037 1126
1038 ( 1127 (
1039 $w + $self->border * 2, 1128 $w + $self->border * 2,
1040 $h + $self->border * 2, 1129 $h + $self->border * 2,
1041 ) 1130 )
1042} 1131}
1043 1132
1044sub size_allocate { 1133sub invoke_size_allocate {
1045 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
1046 1135
1136 if ($self->{title_widget}) {
1137 $self->{title_widget}{w} = $w;
1138 $self->{title_widget}{h} = $h;
1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1140 }
1141
1142 my $border = $self->border;
1143
1047 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1049 1146
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051 if $self->{title};
1052
1053 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1054}
1055 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1056sub button_down { 1155sub invoke_button_down {
1057 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1058 1157
1059 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1060 my $border = $self->border; 1159 my $border = $self->border;
1061 1160
… …
1074 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1075 1174
1076 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
1078 1177
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1180
1084 $self->check_size; 1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1182 $self->realloc;
1085 }; 1183 };
1086 1184
1087 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1189 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
1093 1191
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1193
1096 $self->{user_x} = $bx + $x - $ox; 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy; 1195 # HACK: the next line is required to enforce placement
1098 $self->move ($self->{user_x}, $self->{user_y}); 1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1099 $self->update;
1100 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
1101 } 1202 1
1102} 1203}
1103 1204
1104sub button_up { 1205sub invoke_button_up {
1105 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1106 1207
1107 delete $self->{motion}; 1208 ! ! delete $self->{motion}
1108} 1209}
1109 1210
1110sub mouse_motion { 1211sub invoke_mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1112 1213
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
1114} 1217}
1115 1218
1116sub _draw { 1219sub _draw {
1117 my ($self) = @_; 1220 my ($self) = @_;
1118 1221
1222 my $child = $self->{children}[0];
1223
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1226
1122 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1229
1125 my $border = $self->border; 1230 my $border = $self->border;
1126 1231
1127 glColor @{ $self->{border_bg} }; 1232 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1233 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1237
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1239 glColor @{ $self->{bg} };
1135 1240
1136 # TODO: repeat texture not scale 1241 # TODO: repeat texture not scale
1242 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1243 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1244 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1246 }
1147 1247
1148 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1149 1249
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1250 $child->draw;
1251
1252 if ($self->{title_widget}) {
1253 glTranslate 0, $border - $self->{h};
1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1153} 1261}
1154 1262
1155############################################################################# 1263#############################################################################
1156 1264
1157package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1287 my ($self, $x, $y, $child) = @_;
1180 1288
1181 $child->set_parent ($self); 1289 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1183 1291
1184 $self->check_size (1); 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1185} 1299}
1186 1300
1187# TODO: move to container class maybe? send children a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1302sub clear {
1189 my ($self) = @_; 1303 my ($self) = @_;
… …
1194 for (@children) { 1308 for (@children) {
1195 delete $_->{parent}; 1309 delete $_->{parent};
1196 $_->hide; 1310 $_->hide;
1197 } 1311 }
1198 1312
1199 $self->check_size (1); 1313 $self->realloc;
1200 $self->update;
1201} 1314}
1202 1315
1203sub get_wh { 1316sub get_wh {
1204 my ($self) = @_; 1317 my ($self) = @_;
1205 1318
… …
1231 (sum @$ws), 1344 (sum @$ws),
1232 (sum @$hs), 1345 (sum @$hs),
1233 ) 1346 )
1234} 1347}
1235 1348
1236sub size_allocate { 1349sub invoke_size_allocate {
1237 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1238 1351
1239 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1240 1353
1241 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
… …
1273 } 1386 }
1274 1387
1275 $y += $row_h; 1388 $y += $row_h;
1276 } 1389 }
1277 1390
1391 1
1278} 1392}
1279 1393
1280sub find_widget { 1394sub find_widget {
1281 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1282 1396
… …
1301 } 1415 }
1302} 1416}
1303 1417
1304############################################################################# 1418#############################################################################
1305 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
1306package CFClient::UI::HBox; 1480package CFClient::UI::HBox;
1307 1481
1308# TODO: wrap into common Box base class
1309
1310our @ISA = CFClient::UI::Container::; 1482our @ISA = CFClient::UI::Box::;
1311 1483
1312sub size_request { 1484sub new {
1313 my ($self) = @_; 1485 my $class = shift;
1314 1486
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1487 $class->SUPER::new (
1316 1488 vertical => 0,
1317 ( 1489 @_,
1318 (List::Util::sum map $_->[0], @alloc),
1319 (List::Util::max map $_->[1], @alloc),
1320 ) 1490 )
1321} 1491}
1322 1492
1323sub size_allocate {
1324 my ($self, $w, $h) = @_;
1325
1326 ($h, $w) = ($w, $h);
1327
1328 my $children = $self->{children};
1329
1330 my @h = map $_->{req_w}, @$children;
1331
1332 my $req_h = List::Util::sum @h;
1333
1334 if ($req_h > $h) {
1335 # ah well, not enough space
1336 $_ *= $h / $req_h for @h;
1337 } else {
1338 my $exp = List::Util::sum map $_->{expand}, @$children;
1339 $exp ||= 1;
1340
1341 for (0 .. $#$children) {
1342 my $child = $children->[$_];
1343
1344 my $alloc_h = $h[$_];
1345 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346 $h[$_] = $alloc_h;
1347 }
1348 }
1349
1350 CFClient::UI::harmonize \@h;
1351
1352 my $y = 0;
1353 for (0 .. $#$children) {
1354 my $child = $children->[$_];
1355 my $h = $h[$_];
1356 $child->configure ($y, 0, $h, $w);
1357
1358 $y += $h;
1359 }
1360
1361 1
1362}
1363
1364############################################################################# 1493#############################################################################
1365 1494
1366package CFClient::UI::VBox; 1495package CFClient::UI::VBox;
1367 1496
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1497our @ISA = CFClient::UI::Box::;
1371 1498
1372sub size_request { 1499sub new {
1373 my ($self) = @_; 1500 my $class = shift;
1374 1501
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1502 $class->SUPER::new (
1376 1503 vertical => 1,
1377 ( 1504 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1505 )
1381}
1382
1383sub size_allocate {
1384 my ($self, $w, $h) = @_;
1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388 my $children = $self->{children};
1389
1390 my @h = map $_->{req_h}, @$children;
1391
1392 my $req_h = List::Util::sum @h;
1393
1394 if ($req_h > $h) {
1395 # ah well, not enough space
1396 $_ *= $h / $req_h for @h;
1397 } else {
1398 my $exp = List::Util::sum map $_->{expand}, @$children;
1399 $exp ||= 1;
1400
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403
1404 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405 }
1406 }
1407
1408 CFClient::UI::harmonize \@h;
1409
1410 my $y = 0;
1411 for (0 .. $#$children) {
1412 my $child = $children->[$_];
1413 my $h = $h[$_];
1414 $child->configure (0, $y, $w, $h);
1415
1416 $y += $h;
1417 }
1418
1419 1
1420} 1506}
1421 1507
1422############################################################################# 1508#############################################################################
1423 1509
1424package CFClient::UI::Label; 1510package CFClient::UI::Label;
… …
1441 ellipsise => 3, # end 1527 ellipsise => 3, # end
1442 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1443 fontsize => 1, 1529 fontsize => 1,
1444 align => -1, 1530 align => -1,
1445 valign => -1, 1531 valign => -1,
1446 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1447 can_events => 0, 1534 can_events => 0,
1448 %arg 1535 %arg
1449 ); 1536 );
1450 1537
1451 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1478 1565
1479 delete $self->{texture}; 1566 delete $self->{texture};
1480 $self->SUPER::update; 1567 $self->SUPER::update;
1481} 1568}
1482 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1483sub set_text { 1577sub set_text {
1484 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1485 1579
1486 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1487 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1488 1582
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1491 1585
1586 delete $self->{size_req};
1587 $self->realloc;
1492 $self->update; 1588 $self->update;
1493 $self->check_size;
1494} 1589}
1495 1590
1496sub set_markup { 1591sub set_markup {
1497 my ($self, $markup) = @_; 1592 my ($self, $markup) = @_;
1498 1593
… …
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1598
1504 $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;
1505 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1506 1601
1602 delete $self->{size_req};
1603 $self->realloc;
1507 $self->update; 1604 $self->update;
1508 $self->check_size;
1509} 1605}
1510 1606
1511sub size_request { 1607sub size_request {
1512 my ($self) = @_; 1608 my ($self) = @_;
1513 1609
1610 $self->{size_req} ||= do {
1514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1515 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1516 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1517 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1518 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1519 1616
1520 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1521 1618
1522 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1523 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1524 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1525 1622
1526 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1527 1624
1528 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1529 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1530 } 1630 };
1531 1631
1532 ( 1632 @{ $self->{size_req} }
1533 $w + $self->{padding} * 2,
1534 $h + $self->{padding} * 2,
1535 )
1536} 1633}
1537 1634
1538sub size_allocate { 1635sub invoke_size_allocate {
1539 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1540 1637
1638 delete $self->{ox};
1639
1541 delete $self->{texture}; 1640 delete $self->{texture}
1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1542} 1644}
1543 1645
1544sub set_fontsize { 1646sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1546 1648
1547 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1548 delete $self->{texture}; 1650 delete $self->{texture};
1549 1651
1550 $self->update; 1652 $self->realloc;
1551 $self->check_size; 1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1552} 1661}
1553 1662
1554sub _draw { 1663sub _draw {
1555 my ($self) = @_; 1664 my ($self) = @_;
1556 1665
… …
1562 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1563 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1564 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1675
1567 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1568 1678
1679 unless (exists $self->{ox}) {
1569 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1570 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1571 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1572 1683
1573 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1574 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1575 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1576
1577 $tex
1578 }; 1687 };
1579 1688
1580 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1581 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};
1582 1693
1583 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1584 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1585 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1586 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1587 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1588 } 1701 }
1589 1702
1590 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1591} 1704}
1592 1705
… …
1609 can_hover => 1, 1722 can_hover => 1,
1610 can_focus => 1, 1723 can_focus => 1,
1611 valign => 0, 1724 valign => 0,
1612 can_events => 1, 1725 can_events => 1,
1613 #text => ... 1726 #text => ...
1727 #hidden => "*",
1614 @_ 1728 @_
1615 ) 1729 )
1616} 1730}
1617 1731
1618sub _set_text { 1732sub _set_text {
… …
1620 1734
1621 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1622 1736
1623 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1624 1738
1625 delete $self->{texture};
1626
1627 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1628 $self->{text} = $text; 1740 $self->{text} = $text;
1629 1741
1630 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1631 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1632 1745
1633 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1634} 1750}
1635 1751
1636sub set_text { 1752sub set_text {
1637 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1638 1754
1639 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1756 $self->_set_text ($text);
1641 $self->update;
1642 $self->check_size;
1643} 1757}
1644 1758
1645sub get_text { 1759sub get_text {
1646 $_[0]{text} 1760 $_[0]{text}
1647} 1761}
… …
1652 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1653 1767
1654 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1655} 1769}
1656 1770
1657sub key_down { 1771sub invoke_key_down {
1658 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1659 1773
1660 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1661 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1662 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1674 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1675 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1676 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1677 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1678 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1679 $self->_emit ('escape'); 1793 $self->emit ('escape');
1680 } elsif ($uni) { 1794 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1682 } 1798 }
1683 1799
1684 $self->_set_text ($text); 1800 $self->_set_text ($text);
1685 $self->update;
1686 $self->check_size;
1687}
1688 1801
1802 $self->realloc;
1803
1804 1
1805}
1806
1689sub focus_in { 1807sub invoke_focus_in {
1690 my ($self) = @_; 1808 my ($self) = @_;
1691 1809
1692 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1693 1811
1694 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1695} 1813}
1696 1814
1697sub button_down { 1815sub invoke_button_down {
1698 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1699 1817
1700 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1701 1819
1702 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1703 1821
1704 # byte-index to char-index 1822 # byte-index to char-index
1705 my $text = $self->{text}; 1823 my $text = $self->{text};
1706 utf8::encode $text; 1824 utf8::encode $text;
1707 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1708 1826
1709 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1710 $self->update; 1828 $self->update;
1829
1830 1
1711} 1831}
1712 1832
1713sub mouse_motion { 1833sub invoke_mouse_motion {
1714 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1715# 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
1716} 1838}
1717 1839
1718sub _draw { 1840sub _draw {
1719 my ($self) = @_; 1841 my ($self) = @_;
1720 1842
1721 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1722 1844
1723 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1724 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1725 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1726 } else { 1848 } else {
1727 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1728 } 1850 }
1729 1851
1730 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1732 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1733 glVertex 0 , 0; 1855 glVertex 0 , 0;
1734 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1735 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1736 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1761 1883
1762our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1763 1885
1764use CFClient::OpenGL; 1886use CFClient::OpenGL;
1765 1887
1766sub key_down { 1888sub invoke_key_down {
1767 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1768 1890
1769 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1770 1892
1771 if ($sym == 13) { 1893 if ($sym == 13) {
1772 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1773 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1774 $self->{history_pointer} = -1; 1896 $self->{history_pointer} = -1;
1775 $self->{history_saveback} = ''; 1897 $self->{history_saveback} = '';
1776 $self->_emit (activate => $txt); 1898 $self->emit (activate => $txt);
1777 $self->update; 1899 $self->update;
1778 1900
1779 } elsif ($sym == CFClient::SDLK_UP) { 1901 } elsif ($sym == CFClient::SDLK_UP) {
1780 if ($self->{history_pointer} < 0) { 1902 if ($self->{history_pointer} < 0) {
1781 $self->{history_saveback} = $self->get_text; 1903 $self->{history_saveback} = $self->get_text;
… …
1797 } else { 1919 } else {
1798 $self->set_text ($self->{history_saveback}); 1920 $self->set_text ($self->{history_saveback});
1799 } 1921 }
1800 1922
1801 } else { 1923 } else {
1802 $self->SUPER::key_down ($ev); 1924 return $self->SUPER::invoke_key_down ($ev)
1925 }
1926
1803 } 1927 1
1804
1805} 1928}
1806 1929
1807############################################################################# 1930#############################################################################
1808 1931
1809package CFClient::UI::Button; 1932package CFClient::UI::Button;
… …
1818 1941
1819sub new { 1942sub new {
1820 my $class = shift; 1943 my $class = shift;
1821 1944
1822 $class->SUPER::new ( 1945 $class->SUPER::new (
1823 padding => 4, 1946 padding_x => 4,
1947 padding_y => 4,
1824 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1825 active_fg => [0, 0, 1], 1949 active_fg => [0, 0, 1],
1826 can_hover => 1, 1950 can_hover => 1,
1827 align => 0, 1951 align => 0,
1828 valign => 0, 1952 valign => 0,
1829 can_events => 1, 1953 can_events => 1,
1830 @_ 1954 @_
1831 ) 1955 )
1832} 1956}
1833 1957
1834sub activate { }
1835
1836sub button_up { 1958sub invoke_button_up {
1837 my ($self, $ev, $x, $y) = @_; 1959 my ($self, $ev, $x, $y) = @_;
1838 1960
1839 $self->emit ("activate") 1961 $self->emit ("activate")
1840 if $x >= 0 && $x < $self->{w} 1962 if $x >= 0 && $x < $self->{w}
1841 && $y >= 0 && $y < $self->{h}; 1963 && $y >= 0 && $y < $self->{h};
1964
1965 1
1842} 1966}
1843 1967
1844sub _draw { 1968sub _draw {
1845 my ($self) = @_; 1969 my ($self) = @_;
1846 1970
1847 local $self->{fg} = $self->{fg}; 1971 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1848
1849 if ($GRAB == $self) {
1850 $self->{fg} = $self->{active_fg};
1851 }
1852 1972
1853 glEnable GL_TEXTURE_2D; 1973 glEnable GL_TEXTURE_2D;
1854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1974 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1855 glColor 0, 0, 0, 1; 1975 glColor 0, 0, 0, 1;
1856 1976
… …
1861 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1862} 1982}
1863 1983
1864############################################################################# 1984#############################################################################
1865 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
1866package CFClient::UI::CheckBox; 2022package CFClient::UI::CheckBox;
1867 2023
1868our @ISA = CFClient::UI::DrawBG::; 2024our @ISA = CFClient::UI::DrawBG::;
1869 2025
1870my @tex = 2026my @tex =
… …
1875 2031
1876sub new { 2032sub new {
1877 my $class = shift; 2033 my $class = shift;
1878 2034
1879 $class->SUPER::new ( 2035 $class->SUPER::new (
1880 padding => 2, 2036 padding_x => 2,
2037 padding_y => 2,
1881 fg => [1, 1, 1], 2038 fg => [1, 1, 1],
1882 active_fg => [1, 1, 0], 2039 active_fg => [1, 1, 0],
1883 bg => [0, 0, 0, 0.2], 2040 bg => [0, 0, 0, 0.2],
1884 active_bg => [1, 1, 1, 0.5], 2041 active_bg => [1, 1, 1, 0.5],
1885 state => 0, 2042 state => 0,
… …
1889} 2046}
1890 2047
1891sub size_request { 2048sub size_request {
1892 my ($self) = @_; 2049 my ($self) = @_;
1893 2050
1894 ($self->{padding} * 2 + 6) x 2 2051 (6) x 2
1895} 2052}
1896 2053
1897sub button_down { 2054sub invoke_button_down {
1898 my ($self, $ev, $x, $y) = @_; 2055 my ($self, $ev, $x, $y) = @_;
1899 2056
1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902 $self->{state} = !$self->{state}; 2059 $self->{state} = !$self->{state};
1903 $self->_emit (changed => $self->{state}); 2060 $self->emit (changed => $self->{state});
2061 } else {
2062 return 0
2063 }
2064
1904 } 2065 1
1905} 2066}
1906 2067
1907sub _draw { 2068sub _draw {
1908 my ($self) = @_; 2069 my ($self) = @_;
1909 2070
1910 $self->SUPER::_draw; 2071 $self->SUPER::_draw;
1911 2072
1912 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2073 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913 2074
1914 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;
1915 2078
1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2079 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917 2080
1918 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2081 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919 2082
… …
2074 2237
2075 my $h1 = $self->{h} * (1 - $ycut1); 2238 my $h1 = $self->{h} * (1 - $ycut1);
2076 my $h2 = $self->{h} * (1 - $ycut2); 2239 my $h2 = $self->{h} * (1 - $ycut2);
2077 2240
2078 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
2079 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;
2080 glEnable GL_TEXTURE_2D; 2244 glEnable GL_TEXTURE_2D;
2081 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2082 2246
2083 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2247 glBindTexture GL_TEXTURE_2D, $t1->{name};
2084 glBegin GL_QUADS; 2248 glBegin GL_QUADS;
… …
2184 fg => [1, 1, 1], 2348 fg => [1, 1, 1],
2185 active_fg => [0, 0, 0], 2349 active_fg => [0, 0, 0],
2186 bg => [0, 0, 0, 0.2], 2350 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5], 2351 active_bg => [1, 1, 1, 0.5],
2188 range => [0, 0, 100, 10, 0], 2352 range => [0, 0, 100, 10, 0],
2189 req_w => $::WIDTH / 80, 2353 min_w => $::WIDTH / 80,
2190 req_h => $::WIDTH / 80, 2354 min_h => $::WIDTH / 80,
2191 vertical => 0, 2355 vertical => 0,
2192 can_hover => 1, 2356 can_hover => 1,
2193 inner_pad => 0.02, 2357 inner_pad => 0.02,
2194 @_ 2358 @_
2195 ); 2359 );
… …
2203sub set_range { 2367sub set_range {
2204 my ($self, $range) = @_; 2368 my ($self, $range) = @_;
2205 2369
2206 ($range, $self->{range}) = ($self->{range}, $range); 2370 ($range, $self->{range}) = ($self->{range}, $range);
2207 2371
2208 $self->update
2209 if "@$range" ne "@{$self->{range}}"; 2372 if ("@$range" ne "@{$self->{range}}") {
2373 $self->update;
2374 $self->set_value ($self->{range}[0]);
2375 }
2210} 2376}
2211 2377
2212sub set_value { 2378sub set_value {
2213 my ($self, $value) = @_; 2379 my ($self, $value) = @_;
2214 2380
… …
2225 if $unit; 2391 if $unit;
2226 2392
2227 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2393 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2228 2394
2229 if ($value != $old_value) { 2395 if ($value != $old_value) {
2230 $self->_emit (changed => $value); 2396 $self->emit (changed => $value);
2231 $self->update; 2397 $self->update;
2232 } 2398 }
2233} 2399}
2234 2400
2235sub size_request { 2401sub size_request {
2236 my ($self) = @_; 2402 my ($self) = @_;
2237 2403
2238 my $w = $self->{req_w}; 2404 ($self->{req_w}, $self->{req_h})
2239 my $h = $self->{req_h};
2240
2241 $self->{vertical} ? ($h, $w) : ($w, $h)
2242} 2405}
2243 2406
2244sub button_down { 2407sub invoke_button_down {
2245 my ($self, $ev, $x, $y) = @_; 2408 my ($self, $ev, $x, $y) = @_;
2246 2409
2247 $self->SUPER::button_down ($ev, $x, $y); 2410 $self->SUPER::invoke_button_down ($ev, $x, $y);
2248 2411
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250 2413
2251 $self->mouse_motion ($ev, $x, $y); 2414 $self->mouse_motion ($ev, $x, $y)
2252} 2415}
2253 2416
2254sub mouse_motion { 2417sub invoke_mouse_motion {
2255 my ($self, $ev, $x, $y) = @_; 2418 my ($self, $ev, $x, $y) = @_;
2256 2419
2257 if ($GRAB == $self) { 2420 if ($GRAB == $self) {
2258 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2421 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2259 2422
2260 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2423 my (undef, $lo, $hi, $page) = @{$self->{range}};
2261 2424
2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2425 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263 2426
2264 $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
2265 } 2432 1
2266} 2433}
2267 2434
2268sub update { 2435sub update {
2269 my ($self) = @_; 2436 my ($self) = @_;
2270 2437
2271 $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}) {
2272 $self->set_value ($self->{range}[0]); 2446 $self->set_value ($self->{range}[0]);
2273 2447
2274 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2448 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100; 2449 my $range = ($hi - $page - $lo) || 1e-100;
2276 2450
… …
2282 $value = ($value - $lo) / $range; 2456 $value = ($value - $lo) / $range;
2283 $value = $value * $self->{scale} + $self->{offset}; 2457 $value = $value * $self->{scale} + $self->{offset};
2284 2458
2285 $self->{knob_x} = $value - $knob_w * 0.5; 2459 $self->{knob_x} = $value - $knob_w * 0.5;
2286 $self->{knob_w} = $knob_w; 2460 $self->{knob_w} = $knob_w;
2287 }); 2461 }
2288
2289 $self->SUPER::update;
2290}
2291
2292sub _draw {
2293 my ($self) = @_;
2294 2462
2295 $self->SUPER::_draw (); 2463 $self->SUPER::_draw ();
2296 2464
2297 glScale $self->{w}, $self->{h}; 2465 glScale $self->{w}, $self->{h};
2298 2466
… …
2359sub set_range { shift->{slider}->set_range (@_) } 2527sub set_range { shift->{slider}->set_range (@_) }
2360sub set_value { shift->{slider}->set_value (@_) } 2528sub set_value { shift->{slider}->set_value (@_) }
2361 2529
2362############################################################################# 2530#############################################################################
2363 2531
2364package CFClient::UI::TextView; 2532package CFClient::UI::TextScroller;
2365 2533
2366our @ISA = CFClient::UI::HBox::; 2534our @ISA = CFClient::UI::HBox::;
2367 2535
2368use CFClient::OpenGL; 2536use CFClient::OpenGL;
2369 2537
… …
2371 my $class = shift; 2539 my $class = shift;
2372 2540
2373 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2374 fontsize => 1, 2542 fontsize => 1,
2375 can_events => 0, 2543 can_events => 0,
2544 indent => 0,
2376 #font => default_font 2545 #font => default_font
2377 @_, 2546 @_,
2378 2547
2379 layout => (new CFClient::Layout 1), 2548 layout => (new CFClient::Layout 1),
2380 par => [], 2549 par => [],
… …
2395 2564
2396 $self->{fontsize} = $fontsize; 2565 $self->{fontsize} = $fontsize;
2397 $self->reflow; 2566 $self->reflow;
2398} 2567}
2399 2568
2400sub size_allocate { 2569sub invoke_size_allocate {
2401 my ($self, $w, $h) = @_; 2570 my ($self, $w, $h) = @_;
2402
2403 $self->SUPER::size_allocate ($w, $h);
2404 2571
2405 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2572 $self->{layout}->set_font ($self->{font}) if $self->{font};
2406 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $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});
2408 2576
2409 $self->reflow; 2577 $self->reflow;
2578
2579 $self->SUPER::invoke_size_allocate ($w, $h)
2410} 2580}
2411 2581
2412sub text_size { 2582sub text_size {
2413 my ($self, $text, $indent) = @_; 2583 my ($self, $text, $indent) = @_;
2414 2584
2415 my $layout = $self->{layout}; 2585 my $layout = $self->{layout};
2416 2586
2417 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2418 $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});
2419 $layout->set_markup ($text); 2590 $layout->set_markup ($text);
2420 2591
2421 $layout->size 2592 $layout->size
2422} 2593}
2423 2594
… …
2462 2633
2463 return unless $self->{h} > 0; 2634 return unless $self->{h} > 0;
2464 2635
2465 delete $self->{texture}; 2636 delete $self->{texture};
2466 2637
2467 $ROOT->on_post_alloc ($self, sub { 2638 $ROOT->on_post_alloc ($self => sub {
2468 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2469 2640
2470 if (delete $self->{need_reflow}) { 2641 if (delete $self->{need_reflow}) {
2471 my $height = 0; 2642 my $height = 0;
2472 2643
… …
2475 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2476 2647
2477 for (@{$self->{par}}) { 2648 for (@{$self->{par}}) {
2478 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2479 $layout->set_width ($W - $_->[3]); 2650 $layout->set_width ($W - $_->[3]);
2651 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2480 $layout->set_markup ($_->[4]); 2652 $layout->set_markup ($_->[4]);
2481 my ($w, $h) = $layout->size; 2653 my ($w, $h) = $layout->size;
2482 $_->[0] = $w + $_->[3]; 2654 $_->[0] = $w + $_->[3];
2483 $_->[1] = $h; 2655 $_->[1] = $h;
2484 } 2656 }
… …
2487 } 2659 }
2488 2660
2489 $self->{height} = $height; 2661 $self->{height} = $height;
2490 2662
2491 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2492 2664
2493 delete $self->{texture}; 2665 delete $self->{texture};
2494 } 2666 }
2495 2667
2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2497 glClearColor 0.5, 0.5, 0.5, 0; 2669 glClearColor 0, 0, 0, 0;
2498 glClear GL_COLOR_BUFFER_BIT; 2670 glClear GL_COLOR_BUFFER_BIT;
2499 2671
2500 my $top = int $self->{children}[1]{range}[0]; 2672 my $top = int $self->{children}[1]{range}[0];
2501 2673
2502 my $y0 = $top; 2674 my $y0 = $top;
… …
2516 my $h = $par->[1]; 2688 my $h = $par->[1];
2517 2689
2518 if ($y0 < $y + $h && $y < $y1) { 2690 if ($y0 < $y + $h && $y < $y1) {
2519 $layout->set_foreground (@{ $par->[2] }); 2691 $layout->set_foreground (@{ $par->[2] });
2520 $layout->set_width ($W - $par->[3]); 2692 $layout->set_width ($W - $par->[3]);
2693 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521 $layout->set_markup ($par->[4]); 2694 $layout->set_markup ($par->[4]);
2522 2695
2523 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2696 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2524 2697
2525 glRasterPos $par->[3], $y - $y0; 2698 glRasterPos $par->[3], $y - $y0;
… …
2537sub _draw { 2710sub _draw {
2538 my ($self) = @_; 2711 my ($self) = @_;
2539 2712
2540 glEnable GL_TEXTURE_2D; 2713 glEnable GL_TEXTURE_2D;
2541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2542 glColor 1, 1, 1, 1; 2715 glColor 0, 0, 0, 1;
2543 $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});
2544 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2545 2718
2546 $self->{children}[1]->draw; 2719 $self->{children}[1]->draw;
2547 2720
2548} 2721}
… …
2631} 2804}
2632 2805
2633sub set_tooltip_from { 2806sub set_tooltip_from {
2634 my ($self, $widget) = @_; 2807 my ($self, $widget) = @_;
2635 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
2636 $self->add (new CFClient::UI::Label 2821 $self->add (new CFClient::UI::Label
2637 markup => $widget->{tooltip}, 2822 markup => $tooltip,
2638 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2823 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639 fontsize => 0.8, 2824 fontsize => 0.8,
2640 fg => [0, 0, 0, 1], 2825 fg => [0, 0, 0, 1],
2641 ellipsise => 0, 2826 ellipsise => 0,
2642 font => ($widget->{tooltip_font} || $::FONT_PROP), 2827 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2649 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2834 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2650 2835
2651 ($w + 4, $h + 4) 2836 ($w + 4, $h + 4)
2652} 2837}
2653 2838
2654sub size_allocate { 2839sub invoke_size_allocate {
2655 my ($self, $w, $h) = @_; 2840 my ($self, $w, $h) = @_;
2656 2841
2657 $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 });
2658} 2861}
2659 2862
2660sub _draw { 2863sub _draw {
2661 my ($self) = @_; 2864 my ($self) = @_;
2662 2865
… …
2679 glVertex $w, $h; 2882 glVertex $w, $h;
2680 glVertex $w, 0; 2883 glVertex $w, 0;
2681 glEnd; 2884 glEnd;
2682 2885
2683 glTranslate 2 - 0.375, 2 - 0.375; 2886 glTranslate 2 - 0.375, 2 - 0.375;
2887
2684 $self->SUPER::_draw; 2888 $self->SUPER::_draw;
2685} 2889}
2686 2890
2687############################################################################# 2891#############################################################################
2688 2892
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2951 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 2952
2749 if ($tex) { 2953 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 2954 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 2956 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2957 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 2958 glDisable GL_TEXTURE_2D;
2755 } 2959 }
2756} 2960}
2757 2961
2758sub DESTROY { 2962sub destroy {
2759 my ($self) = @_; 2963 my ($self) = @_;
2760 2964
2761 $self->{timer}->cancel 2965 $self->{timer}->cancel
2762 if $self->{timer}; 2966 if $self->{timer};
2763 2967
2764 $self->SUPER::DESTROY; 2968 $self->SUPER::destroy;
2765} 2969}
2766 2970
2767############################################################################# 2971#############################################################################
2768 2972
2769package CFClient::UI::Inventory; 2973package CFClient::UI::Buttonbar;
2770 2974
2771our @ISA = CFClient::UI::ScrolledWindow::; 2975our @ISA = CFClient::UI::HBox::;
2772 2976
2773sub new { 2977# TODO: should actualyl wrap buttons and other goodies.
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812}
2813 2978
2814############################################################################# 2979#############################################################################
2815 2980
2816package CFClient::UI::Menu; 2981package CFClient::UI::Menu;
2817 2982
… …
2829 ); 2994 );
2830 2995
2831 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2996 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2832 2997
2833 for my $item (@{ $self->{items} }) { 2998 for my $item (@{ $self->{items} }) {
2834 my ($widget, $cb) = @$item; 2999 my ($widget, $cb, $tooltip) = @$item;
2835 3000
2836 # handle various types of items, only text for now 3001 # handle various types of items, only text for now
2837 if (!ref $widget) { 3002 if (!ref $widget) {
2838 $widget = new CFClient::UI::Label 3003 $widget = new CFClient::UI::Label
2839 can_hover => 1, 3004 can_hover => 1,
2840 can_events => 1, 3005 can_events => 1,
2841 text => $widget; 3006 markup => $widget,
3007 tooltip => $tooltip
2842 } 3008 }
2843 3009
2844 $self->{item}{$widget} = $item; 3010 $self->{item}{$widget} = $item;
2845 3011
2846 $self->{vbox}->add ($widget); 3012 $self->{vbox}->add ($widget);
… …
2851 3017
2852# 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)
2853sub popup { 3019sub popup {
2854 my ($self, $ev) = @_; 3020 my ($self, $ev) = @_;
2855 3021
2856 $self->_emit ("popdown"); 3022 $self->emit ("popdown");
2857 3023
2858 # maybe save $GRAB? must be careful about events... 3024 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 3025 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 3026 $self->{button} = $ev->{button};
2861 3027
2862 $self->show; 3028 $self->show;
2863 $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);
2864} 3030}
2865 3031
2866sub mouse_motion { 3032sub invoke_mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 3033 my ($self, $ev, $x, $y) = @_;
2868 3034
2869 # TODO: should use vbox->find_widget or so 3035 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3036 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 3037 $self->{hover} = $self->{item}{$HOVER};
2872}
2873 3038
3039 0
3040}
3041
2874sub button_up { 3042sub invoke_button_up {
2875 my ($self, $ev, $x, $y) = @_; 3043 my ($self, $ev, $x, $y) = @_;
2876 3044
2877 if ($ev->{button} == $self->{button}) { 3045 if ($ev->{button} == $self->{button}) {
2878 undef $GRAB; 3046 undef $GRAB;
2879 $self->hide; 3047 $self->hide;
2880 3048
2881 $self->_emit ("popdown"); 3049 $self->emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 3050 $self->{hover}[1]->() if $self->{hover};
3051 } else {
3052 return 0
3053 }
3054
2883 } 3055 1
2884} 3056}
2885 3057
2886############################################################################# 3058#############################################################################
2887 3059
2888package CFClient::UI::Statusbox; 3060package CFClient::UI::Multiplexer;
2889 3061
2890our @ISA = CFClient::UI::VBox::; 3062our @ISA = CFClient::UI::Container::;
2891 3063
2892sub new { 3064sub new {
2893 my $class = shift; 3065 my $class = shift;
2894 3066
2895 $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 (
2896 fontsize => 0.8, 3234 fontsize => 0.8,
2897 @_, 3235 @_,
2898 ) 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
2899} 3243}
2900 3244
2901sub reorder { 3245sub reorder {
2902 my ($self) = @_; 3246 my ($self) = @_;
2903 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} };
2904 3253
2905 while (my ($k, $v) = each %{ $self->{item} }) { 3254 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3255 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 } 3256 }
2908 3257
… …
2911 my @items = sort { 3260 my @items = sort {
2912 $a->{pri} <=> $b->{pri} 3261 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id} 3262 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} }; 3263 } values %{ $self->{item} };
2915 3264
3265 $self->{timer}->interval (1);
3266
2916 my $count = 10 + 1; 3267 my $count = 10 + 1;
2917 for my $item (@items) { 3268 for my $item (@items) {
2918 last unless --$count; 3269 last unless --$count;
2919 3270
2920 push @widgets, $item->{label} ||= do { 3271 my $label = $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all) 3272 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1 3273 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}" 3274 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text}; 3275 : $item->{text};
2925 3276
… …
2933 tooltip => $item->{tooltip}, 3284 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP, 3285 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67, 3286 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize}, 3287 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44, 3288 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg}, 3289 fg => [@{ $item->{fg} }],
2939 can_events => 1, 3290 can_events => 1,
2940 can_hover => 1 3291 can_hover => 1
2941 }; 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;
2942 } 3305 }
2943 3306
2944 $self->clear; 3307 $self->clear;
2945 $self->SUPER::add (reverse @widgets); 3308 $self->SUPER::add (reverse @widgets);
2946} 3309}
… …
2951 $text =~ s/^\s+//; 3314 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3315 $text =~ s/\s+$//;
2953 3316
2954 return unless $text; 3317 return unless $text;
2955 3318
2956 my $timeout = time + ((delete $arg{timeout}) || 60); 3319 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957 3320
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3321 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959 3322
2960 if (my $item = $self->{item}{$group}) { 3323 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) { 3324 if ($item->{text} eq $text) {
2962 $item->{count}++; 3325 $item->{count}++;
2963 } else { 3326 } else {
2964 $item->{count} = 1; 3327 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text; 3328 $item->{text} = $item->{tooltip} = $text;
2966 } 3329 }
2967 $item->{id} = ++$self->{id}; 3330 $item->{id} += 0.2;#d#
2968 $item->{timeout} = $timeout; 3331 $item->{timeout} = $timeout;
2969 delete $item->{label}; 3332 delete $item->{label};
2970 } else { 3333 } else {
2971 $self->{item}{$group} = { 3334 $self->{item}{$group} = {
2972 id => ++$self->{id}, 3335 id => ++$self->{id},
… …
2991 3354
2992 $self->reorder; 3355 $self->reorder;
2993 $self->SUPER::reconfigure; 3356 $self->SUPER::reconfigure;
2994} 3357}
2995 3358
3359sub destroy {
3360 my ($self) = @_;
3361
3362 $self->{timer}->cancel;
3363
3364 $self->SUPER::destroy;
3365}
3366
2996############################################################################# 3367#############################################################################
2997 3368
2998package CFClient::UI::Root; 3369package CFClient::UI::Inventory;
2999 3370
3000our @ISA = CFClient::UI::Container::; 3371our @ISA = CFClient::UI::ScrolledWindow::;
3001
3002use CFClient::OpenGL;
3003 3372
3004sub new { 3373sub new {
3005 my $class = shift; 3374 my $class = shift;
3006 3375
3007 $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 (
3008 visible => 1, 3743 visible => 1,
3009 @_, 3744 @_,
3010 ) 3745 );
3011}
3012 3746
3013sub configure { 3747 Scalar::Util::weaken ($self->{root} = $self);
3014 my ($self, $x, $y, $w, $h) = @_;
3015 3748
3016 $self->{w} = $w; 3749 $self
3017 $self->{h} = $h;
3018}
3019
3020sub check_size {
3021 my ($self) = @_;
3022
3023 $self->size_allocate ($self->{w}, $self->{h})
3024 if $self->{w};
3025} 3750}
3026 3751
3027sub size_request { 3752sub size_request {
3028 my ($self) = @_; 3753 my ($self) = @_;
3029 3754
3030 ($self->{w}, $self->{h}) 3755 ($self->{w}, $self->{h})
3031} 3756}
3032 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
3033sub size_allocate { 3772sub invoke_size_allocate {
3034 my ($self, $w, $h) = @_; 3773 my ($self, $w, $h) = @_;
3035 3774
3036 for my $child ($self->children) { 3775 for my $child ($self->children) {
3037 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)};
3038 3777
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3778 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3779 $Y = $child->{force_y} if exists $child->{force_y};
3041 3780
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3781 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3782 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3783
3051 $child->configure ($X, $Y, $W, $H); 3784 $child->configure ($X, $Y, $W, $H);
3052 } 3785 }
3786
3787 1
3053} 3788}
3054 3789
3055sub coord2local { 3790sub coord2local {
3056 my ($self, $x, $y) = @_; 3791 my ($self, $x, $y) = @_;
3057 3792
… …
3065} 3800}
3066 3801
3067sub update { 3802sub update {
3068 my ($self) = @_; 3803 my ($self) = @_;
3069 3804
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3805 $::WANT_REFRESH++;
3072} 3806}
3073 3807
3074sub add { 3808sub add {
3075 my ($self, @children) = @_; 3809 my ($self, @children) = @_;
3076 3810
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082
3083 for my $child (@children) {
3084 $child->{is_toplevel} = 1; 3811 $_->{is_toplevel} = 1
3085 3812 for @children;
3086 # integerise window positions
3087 $child->{x} = int $child->{x};
3088 $child->{y} = int $child->{y};
3089 }
3090 3813
3091 $self->SUPER::add (@children); 3814 $self->SUPER::add (@children);
3092} 3815}
3093 3816
3094sub remove { 3817sub remove {
3095 my ($self, @children) = @_; 3818 my ($self, @children) = @_;
3096 3819
3097 $self->SUPER::remove (@children); 3820 $self->SUPER::remove (@children);
3821
3822 delete $self->{is_toplevel}
3823 for @children;
3098 3824
3099 while (@children) { 3825 while (@children) {
3100 my $w = pop @children; 3826 my $w = pop @children;
3101 push @children, $w->children; 3827 push @children, $w->children;
3102 $w->set_invisible; 3828 $w->set_invisible;
… …
3121 while ($self->{refresh_hook}) { 3847 while ($self->{refresh_hook}) {
3122 $_->() 3848 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3849 for values %{delete $self->{refresh_hook}};
3124 } 3850 }
3125 3851
3126 if ($self->{check_size}) { 3852 if ($self->{realloc}) {
3853 my %queue;
3127 my @queue; 3854 my @queue;
3855 my $widget;
3128 3856
3129 for (;;) { 3857 outer:
3130 if ($self->{check_size}) { 3858 while () {
3131 #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
3132 3862
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3863 $queue{$widget+0}++ and next; # duplicates are common
3134 @queue, values %{delete $self->{check_size}}; 3864
3865 push @{ $queue[$widget->{visible}] }, $widget;
3866 }
3135 } 3867 }
3136 3868
3869 while () {
3870 @queue or last outer;
3871
3137 my $widget = pop @queue || last; 3872 $widget = pop @{ $queue[-1] || [] }
3138 3873 and last;
3139 defined $widget->{visible} or last; # do not resize invisible widgets
3140
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3142 ? @$widget{qw(user_w user_h)}
3143 : $widget->size_request;
3144
3145 if (delete $widget->{force_alloc}
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148 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}) {
3149 $widget->{req_w} = $w; 3893 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3894 $widget->{req_h} = $h;
3151 3895
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3896 $self->{size_alloc}{$widget+0} = $widget;
3153 3897
3154 $widget->{parent}->check_size
3155 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 }
3156 } 3905 }
3906
3907 delete $self->{realloc}{$widget+0};
3157 } 3908 }
3158 } 3909 }
3159 3910
3160 while ($self->{size_alloc}) { 3911 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3912 my @queue = sort { $b->{visible} <=> $a->{visible} }
3162 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)};
3163 3919
3164 $w = 0 if $w < 0; 3920 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3921 $h = 0 if $h < 0;
3166 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
3167 $widget->{w} = $w; 3930 $widget->{w} = $w;
3168 $widget->{h} = $h; 3931 $widget->{h} = $h;
3932
3169 $widget->emit (size_allocate => $w, $h); 3933 $widget->emit (size_allocate => $w, $h);
3934 }
3170 } 3935 }
3171 } 3936 }
3172 3937
3173 while ($self->{post_alloc_hook}) { 3938 while ($self->{post_alloc_hook}) {
3174 $_->() 3939 $_->()
3175 for values %{delete $self->{post_alloc_hook}}; 3940 for values %{delete $self->{post_alloc_hook}};
3176 } 3941 }
3942
3177 3943
3178 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3944 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3945 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180 glClear GL_COLOR_BUFFER_BIT; 3946 glClear GL_COLOR_BUFFER_BIT;
3181 3947
… …
3183 glLoadIdentity; 3949 glLoadIdentity;
3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3950 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185 glMatrixMode GL_MODELVIEW; 3951 glMatrixMode GL_MODELVIEW;
3186 glLoadIdentity; 3952 glLoadIdentity;
3187 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
3188 $self->_draw; 3961 $self->_draw;
3189} 3962}
3190 3963
3191############################################################################# 3964#############################################################################
3192 3965

Diff Legend

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