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

Diff Legend

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