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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
144 157
145 $_->update 158 $_->update
146 for @widgets; 159 for @widgets;
147} 160}
148 161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
149# call when resolution changes etc. 170# call when resolution changes etc.
150sub rescale_widgets { 171sub rescale_widgets {
151 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
152 173
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $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}; 180 $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}; 181 $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}; 182 $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}; 183 $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}; 184 $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}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
166 } 189 }
167
168 $widget->reconfigure;
169 } 190 }
191
192 reconfigure_widgets;
170} 193}
171 194
172############################################################################# 195#############################################################################
173 196
174package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
… …
212 return if $self->{parent}; 249 return if $self->{parent};
213 250
214 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
215} 252}
216 253
217sub hide { 254sub set_visible {
218 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
219 278
220 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
221 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
222 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
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;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
223 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
224 if $self->{parent}; 313 if $self->{parent};
225} 314}
226 315
227sub move { 316sub move_abs {
228 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
229 318
230 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
231 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
232 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
233 322
234 $self->update; 323 $self->update;
235} 324}
236 325
237sub set_size { 326sub set_size {
238 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
239 328
240 $self->{user_w} = $w; 329 $self->{force_w} = $w;
241 $self->{user_h} = $h; 330 $self->{force_h} = $h;
242 331
243 $self->check_size; 332 $self->realloc;
244} 333}
245 334
246sub size_request { 335sub size_request {
247 require Carp; 336 require Carp;
248 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
250 339
251sub configure { 340sub configure {
252 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
253 342
254 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
255 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
256 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
257 348
258 # use alignment to adjust x, y 349 # use alignment to adjust x, y
259 350
260 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
261 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
262
263 ($w, $h) = ($w2, $h2);
264 } 353 }
265 354
266 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
267 $self->{x} = $x; 356 $self->{x} = $x;
268 $self->{y} = $y; 357 $self->{y} = $y;
269 $self->update; 358 $self->update;
270 } 359 }
271 360
272 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
273 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
274 } 368 }
275} 369}
276 370
277sub size_allocate { 371sub size_allocate {
278 # nothing to be done 372 # nothing to be done
279} 373}
280 374
281sub reconfigure {
282 my ($self) = @_;
283
284 $self->check_size (1);
285 $self->update;
286}
287
288sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
289} 381}
290 382
291sub set_max_size { 383sub set_max_size {
292 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
293 385
294 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
295 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
388
389 $self->realloc;
296} 390}
297 391
298sub set_tooltip { 392sub set_tooltip {
299 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
300 399
301 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
302 401
303 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
… …
326 return if $FOCUS == $self; 425 return if $FOCUS == $self;
327 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
328 427
329 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
330 429
331 $self->emit (focus_in => $focus); 430 $self->_emit (focus_in => $focus);
332 431
333 $focus->update if $focus; 432 $focus->update if $focus;
334 $FOCUS->update; 433 $FOCUS->update;
335} 434}
336 435
… …
339 438
340 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
341 440
342 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
343 442
344 $self->emit (focus_out => $focus); 443 $self->_emit (focus_out => $focus);
345 444
346 $focus->update if $focus; #? 445 $focus->update if $focus; #?
347}
348 446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
448 unless $FOCUS;
449}
450
349sub mouse_motion { } 451sub mouse_motion { 0 }
350sub button_up { } 452sub button_up { 0 }
351sub key_down { } 453sub key_down { 0 }
352sub key_up { } 454sub key_up { 0 }
353 455
354sub button_down { 456sub button_down {
355 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
356 458
357 $self->focus_in; 459 $self->focus_in;
358}
359 460
360sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
361sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
362sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
363sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
364sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 465 my ($self, $x, $y) = @_;
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475
476sub set_parent {
477 my ($self, $parent) = @_;
478
479 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
365 537
366sub draw { 538sub draw {
367 my ($self) = @_; 539 my ($self) = @_;
368 540
369 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
370 552
371 glPushMatrix; 553 glPushMatrix;
372 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
373 $self->_draw;
374 glPopMatrix;
375 555
376 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
377 my ($x, $y) = @$self{qw(x y)};
378
379 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
380 glEnable GL_BLEND; 558 glEnable GL_BLEND;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
382 glBegin GL_QUADS; 560 glBegin GL_QUADS;
383 glVertex $x , $y;
384 glVertex $x + $self->{w}, $y;
385 glVertex $x + $self->{w}, $y + $self->{h};
386 glVertex $x , $y + $self->{h};
387 glEnd;
388 glDisable GL_BLEND;
389 }
390
391 if ($ENV{PCLIENT_DEBUG}) {
392 glPushMatrix;
393 glColor 1, 1, 0, 1;
394 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395 glBegin GL_LINE_LOOP;
396 glVertex 0 , 0; 561 glVertex 0 , 0;
397 glVertex $self->{w}, 0; 562 glVertex $self->{w}, 0;
398 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w}, $self->{h};
399 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h};
400 glEnd; 565 glEnd;
566 glDisable GL_BLEND;
567 }
568
569 if ($ENV{CFPLUS_DEBUG} & 1) {
570 glPushMatrix;
571 glColor 1, 1, 0, 1;
572 glTranslate 0.375, 0.375;
573 glBegin GL_LINE_LOOP;
574 glVertex 0 , 0;
575 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1;
578 glEnd;
401 glPopMatrix; 579 glPopMatrix;
402 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
403 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
404} 585}
405 586
406sub _draw { 587sub _draw {
407 my ($self) = @_; 588 my ($self) = @_;
408 589
409 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
410}
411
412sub find_widget {
413 my ($self, $x, $y) = @_;
414
415 return () unless $self->{can_events};
416
417 return $self
418 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
419 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
420
421 ()
422}
423
424sub set_parent {
425 my ($self, $parent) = @_;
426
427 Scalar::Util::weaken ($self->{parent} = $parent);
428
429 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size
431 unless exists $self->{req_w};
432}
433
434sub check_size {
435 my ($self, $forced) = @_;
436
437 $self->{force_alloc} = 1 if $forced;
438 $CFClient::UI::ROOT->{check_size}{$self} = $self;
439}
440
441sub update {
442 my ($self) = @_;
443
444 $self->{parent}->update
445 if $self->{parent};
446}
447
448sub connect {
449 my ($self, $signal, $cb) = @_;
450
451 push @{ $self->{signal_cb}{$signal} }, $cb;
452}
453
454sub emit {
455 my ($self, $signal, @args) = @_;
456
457 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
458} 591}
459 592
460sub DESTROY { 593sub DESTROY {
461 my ($self) = @_; 594 my ($self) = @_;
462 595
… …
494 627
495 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
496 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
497 630
498 glEnable GL_BLEND; 631 glEnable GL_BLEND;
499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
500 glColor @$color; 633 glColor_premultiply @$color;
501 634
502 glBegin GL_QUADS; 635 glBegin GL_QUADS;
503 glVertex 0 , 0; 636 glVertex 0 , 0;
504 glVertex 0 , $h; 637 glVertex 0 , $h;
505 glVertex $w, $h; 638 glVertex $w, $h;
… …
520 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
521 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
522} 655}
523 656
524sub size_request { 657sub size_request {
525 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
526} 661}
527 662
528sub draw { } 663sub draw { }
529 664
530############################################################################# 665#############################################################################
… …
534our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
535 670
536sub new { 671sub new {
537 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
538 673
539 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
540 675
541 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
542 children => [], 677 children => [],
543 can_events => 0, 678 can_events => 0,
544 %arg, 679 %arg,
545 ); 680 );
681
546 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
547 684
548 $self 685 $self
549} 686}
550 687
551sub add { 688sub add {
… …
559 $self->{children} = [ 696 $self->{children} = [
560 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
561 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
562 ]; 699 ];
563 700
564 $self->check_size (1); 701 $self->realloc;
565 $self->update;
566} 702}
567 703
568sub children { 704sub children {
569 @{ $_[0]{children} } 705 @{ $_[0]{children} }
570} 706}
… …
575 delete $child->{parent}; 711 delete $child->{parent};
576 $child->hide; 712 $child->hide;
577 713
578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579 715
580 $self->check_size; 716 $self->realloc;
581 $self->update;
582} 717}
583 718
584sub clear { 719sub clear {
585 my ($self) = @_; 720 my ($self) = @_;
586 721
… …
590 for (@$children) { 725 for (@$children) {
591 delete $_->{parent}; 726 delete $_->{parent};
592 $_->hide; 727 $_->hide;
593 } 728 }
594 729
595 $self->check_size; 730 $self->realloc;
596 $self->update;
597} 731}
598 732
599sub find_widget { 733sub find_widget {
600 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
601 735
602 $x -= $self->{x}; 736 $x -= $self->{x};
603 $y -= $self->{y}; 737 $y -= $self->{y};
604 738
605 my $res; 739 my $res;
606 740
607 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
608 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
609 and return $res; 743 and return $res;
610 } 744 }
611 745
612 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
661 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
662} 796}
663 797
664############################################################################# 798#############################################################################
665 799
800# back-buffered drawing area
801
666package CFClient::UI::Window; 802package CFClient::UI::Window;
667 803
668our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
669 805
670use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
688 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
689 $self->update; 825 $self->update;
690} 826}
691 827
692sub _render { 828sub _render {
829 my ($self) = @_;
830
693 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
694} 832}
695 833
696sub render_child { 834sub render_child {
697 my ($self) = @_; 835 my ($self) = @_;
698 836
699 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
700 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
701 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
702 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
703 $self->_render; 848 $self->_render;
704 }; 849 };
705} 850}
706 851
707sub _draw { 852sub _draw {
708 my ($self) = @_; 853 my ($self) = @_;
709 854
710 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
711 856
712 my $tex = $self->{texture} 857 my $tex = $self->{texture}
713 or return; 858 or return;
714 859
715 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
717 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
718 863
719 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
720 865
721 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
722} 867}
… …
725 870
726package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
727 872
728our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
729 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
730sub size_request { 885sub size_request {
731 my ($self) = @_; 886 my ($self) = @_;
732 887
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 889
736 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
737} 894}
738 895
739sub size_allocate { 896sub size_allocate {
740 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
741 898
899 my $child = $self->child;
900
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903
904 $self->child->configure (0, 0, $w, $h);
742 $self->update; 905 $self->update;
743} 906}
744 907
745sub set_offset { 908sub set_offset {
746 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
… …
780} 943}
781 944
782sub _render { 945sub _render {
783 my ($self) = @_; 946 my ($self) = @_;
784 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
785 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
786 952
787 $self->SUPER::_render; 953 $self->SUPER::_render;
788} 954}
789 955
… …
792package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
793 959
794our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
795 961
796sub new { 962sub new {
797 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
798 966
799 my $self; 967 my $self;
800 968
801 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
802 vertical => 1, 970 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 972 on_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 973 $self->{vp}->set_offset (0, $_[1]);
806 }, 974 },
807 ; 975 ;
808 976
809 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
811 slider => $slider, 979 slider => $slider,
812 @_, 980 %arg,
813 ); 981 );
814 982
815 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
818 985
819 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
993}
994
995sub update {
996 my ($self) = @_;
997
998 $self->SUPER::update;
999
1000 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003}
1004
1005sub size_allocate {
1006 my ($self, $w, $h) = @_;
1007
1008 $self->SUPER::size_allocate ($w, $h);
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
820} 1012}
821 1013
822#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 1015# update viewport offset on scroll
824 1016
… …
844 1036
845 if ($self->{bg}) { 1037 if ($self->{bg}) {
846 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
847 1039
848 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
849 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
850 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
851 1043
852 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
853 glVertex 0 , 0; 1045 glVertex 0 , 0;
854 glVertex 0 , $h; 1046 glVertex 0 , $h;
855 glVertex $w, $h; 1047 glVertex $w, $h;
… …
868 1060
869our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
870 1062
871use CFClient::OpenGL; 1063use CFClient::OpenGL;
872 1064
873my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
874 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
875 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
876 1072
877sub new { 1073sub new {
878 my $class = shift; 1074 my ($class, %arg) = @_;
879 1075
880 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
881 1077
882 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
885 border => 0.6, 1081 border => 0.6,
886 toplevel => 1,
887 can_events => 1, 1082 can_events => 1,
888 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
889 ); 1086 );
890 1087
891 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
892 align => 0, 1089 align => 0,
893 valign => 1, 1090 valign => 1,
894 text => $self->{title}, 1091 text => $title,
895 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
896 1094
897 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
898} 1103}
899 1104
900sub border { 1105sub border {
901 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
902} 1107}
903 1108
904sub size_request { 1109sub size_request {
905 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
906 1114
907 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
908 1116
909 ( 1117 (
910 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
913} 1121}
914 1122
915sub size_allocate { 1123sub size_allocate {
916 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
917 1125
1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
918 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
919 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
920 1136
921 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
922 if $self->{title};
923
924 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
925} 1138}
926 1139
927sub button_down { 1140sub button_down {
928 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
929 1142
… …
945 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
946 1159
947 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
949 1162
950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
952 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
953 $self->check_size; 1167 $self->realloc;
954 }; 1168 };
955 1169
956 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
957 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
958 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
960 $self->{motion} = sub { 1174 $self->{motion} = sub {
961 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
962 1176
963 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
964 1178
965 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
966 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
967 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
968 } 1187 1
969} 1188}
970 1189
971sub button_up { 1190sub button_up {
972 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
973 1192
974 delete $self->{motion}; 1193 !!delete $self->{motion}
975} 1194}
976 1195
977sub mouse_motion { 1196sub mouse_motion {
978 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
979 1198
980 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
981} 1202}
982 1203
983sub _draw { 1204sub _draw {
984 my ($self) = @_; 1205 my ($self) = @_;
985 1206
1207 my $child = $self->{children}[0];
1208
986 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
987 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
988 1211
989 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991 1214
992 my $border = $self->border; 1215 my $border = $self->border;
993 1216
994 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
995 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
999 1222
1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1001 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1002 1225
1003 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1004 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1005 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1006
1007 glColor @{ $self->{bg} };
1008
1009 $bg->{s} = $rep_x;
1010 $bg->{t} = $rep_y;
1011 $bg->{wrap_mode} = 1;
1012 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 } 1231 }
1014 1232
1015 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1016 1234
1017 $self->{title}->draw if $self->{title};
1018
1019 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1020} 1241}
1021 1242
1022############################################################################# 1243#############################################################################
1023 1244
1024package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1032sub new { 1253sub new {
1033 my $class = shift; 1254 my $class = shift;
1034 1255
1035 $class->SUPER::new ( 1256 $class->SUPER::new (
1036 col_expand => [], 1257 col_expand => [],
1037 @_ 1258 @_,
1038 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1264}
1040 1265
1041sub add { 1266sub add {
1042 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1043 1268
1044 $child->set_parent ($self); 1269 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1046 1271
1047 $child->check_size; 1272 $self->realloc;
1048} 1273}
1049 1274
1050sub children {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1052}
1053
1054# TODO: move to container class maybe? send childs a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1055sub clear { 1276sub clear {
1056 my ($self) = @_; 1277 my ($self) = @_;
1057 1278
1058 my @children = $self->children; 1279 my @children = $self->children;
1059 delete $self->{children}; 1280 delete $self->{children};
… …
1061 for (@children) { 1282 for (@children) {
1062 delete $_->{parent}; 1283 delete $_->{parent};
1063 $_->hide; 1284 $_->hide;
1064 } 1285 }
1065 1286
1066 $self->update; 1287 $self->realloc;
1067} 1288}
1068 1289
1069sub get_wh { 1290sub get_wh {
1070 my ($self) = @_; 1291 my ($self) = @_;
1071 1292
… …
1102sub size_allocate { 1323sub size_allocate {
1103 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1104 1325
1105 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1106 1327
1107 my $req_w = sum @$ws; 1328 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1329 my $req_h = (sum @$hs) || 1;
1109 1330
1110 # TODO: nicer code && do row_expand 1331 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1332 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1333 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1334 my $col_expand = (sum @col_expand) || 1;
… …
1167 } 1388 }
1168} 1389}
1169 1390
1170############################################################################# 1391#############################################################################
1171 1392
1172package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1173
1174# TODO: wrap into common Box base class
1175 1394
1176our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1177 1396
1178sub size_request { 1397sub size_request {
1179 my ($self) = @_; 1398 my ($self) = @_;
1180 1399
1181 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1182 1401 ? (
1183 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1184 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1185 (List::Util::max map $_->[1], @alloc), 1404 )
1186 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1187} 1409}
1188 1410
1189sub size_allocate { 1411sub size_allocate {
1190 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1191 1413
1192 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1193
1194 my $children = $self->{children}; 1415 my $children = $self->{children};
1195 1416
1196 my @h = map $_->{req_w}, @$children; 1417 my @req;
1197 1418
1198 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1199 1420 @req = ($space / (@$children || 1)) x @$children;
1200 if ($req_h > $h) {
1201 # ah well, not enough space
1202 $_ *= $h / $req_h for @h;
1203 } else { 1421 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1423 my $req = List::Util::sum @req;
1424
1425 if ($req > $space) {
1426 # ah well, not enough space
1427 $_ *= $space / $req for @req;
1428 } else {
1204 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1205 $exp ||= 1;
1206 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1207 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1208 my $child = $children->[$_];
1209
1210 my $alloc_h = $h[$_];
1211 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1212 $h[$_] = $alloc_h;
1213 } 1435 }
1214 } 1436 }
1215 1437
1216 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1217 1439
1218 my $y = 0; 1440 my $pos = 0;
1219 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1220 my $child = $children->[$_];
1221 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1222 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1223 1444
1224 $y += $h; 1445 $pos += $alloc;
1225 } 1446 }
1226 1447
1227 1 1448 1
1228} 1449}
1229 1450
1230############################################################################# 1451#############################################################################
1231 1452
1453package CFClient::UI::HBox;
1454
1455our @ISA = CFClient::UI::Box::;
1456
1457sub new {
1458 my $class = shift;
1459
1460 $class->SUPER::new (
1461 vertical => 0,
1462 @_,
1463 )
1464}
1465
1466#############################################################################
1467
1232package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1233 1469
1234# TODO: wrap into common Box base class
1235
1236our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1237 1471
1238sub size_request { 1472sub new {
1239 my ($self) = @_; 1473 my $class = shift;
1240 1474
1241 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1242 1476 vertical => 1,
1243 ( 1477 @_,
1244 (List::Util::max map $_->[0], @alloc),
1245 (List::Util::sum map $_->[1], @alloc),
1246 ) 1478 )
1247}
1248
1249sub size_allocate {
1250 my ($self, $w, $h) = @_;
1251
1252 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1253
1254 my $children = $self->{children};
1255
1256 my @h = map $_->{req_h}, @$children;
1257
1258 my $req_h = List::Util::sum @h;
1259
1260 if ($req_h > $h) {
1261 # ah well, not enough space
1262 $_ *= $h / $req_h for @h;
1263 } else {
1264 my $exp = List::Util::sum map $_->{expand}, @$children;
1265 $exp ||= 1;
1266
1267 for (0 .. $#$children) {
1268 my $child = $children->[$_];
1269
1270 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1271 }
1272 }
1273
1274 CFClient::UI::harmonize \@h;
1275
1276 my $y = 0;
1277 for (0 .. $#$children) {
1278 my $child = $children->[$_];
1279 my $h = $h[$_];
1280 $child->configure (0, $y, $w, $h);
1281
1282 $y += $h;
1283 }
1284
1285 1
1286} 1479}
1287 1480
1288############################################################################# 1481#############################################################################
1289 1482
1290package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1307 ellipsise => 3, # end 1500 ellipsise => 3, # end
1308 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1309 fontsize => 1, 1502 fontsize => 1,
1310 align => -1, 1503 align => -1,
1311 valign => -1, 1504 valign => -1,
1312 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1313 can_events => 0, 1507 can_events => 0,
1314 %arg 1508 %arg
1315 ); 1509 );
1316 1510
1317 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1353 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1354 1548
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1357 1551
1552 $self->realloc;
1358 $self->update; 1553 $self->update;
1359 $self->check_size;
1360} 1554}
1361 1555
1362sub set_markup { 1556sub set_markup {
1363 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1364 1558
… …
1368 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369 1563
1370 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1371 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1372 1566
1567 $self->realloc;
1373 $self->update; 1568 $self->update;
1374 $self->check_size;
1375} 1569}
1376 1570
1377sub size_request { 1571sub size_request {
1378 my ($self) = @_; 1572 my ($self) = @_;
1379 1573
… …
1393 1587
1394 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1395 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1396 } 1590 }
1397 1591
1398 ( 1592 ($w, $h)
1399 $w + $self->{padding} * 2,
1400 $h + $self->{padding} * 2,
1401 )
1402} 1593}
1403 1594
1404sub size_allocate { 1595sub size_allocate {
1405 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1406 1597
1598 delete $self->{ox};
1599
1407 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1408} 1602}
1409 1603
1410sub set_fontsize { 1604sub set_fontsize {
1411 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1412 1606
1413 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1414 delete $self->{texture}; 1608 delete $self->{texture};
1415 1609
1416 $self->update; 1610 $self->realloc;
1417 $self->check_size;
1418} 1611}
1419 1612
1420sub _draw { 1613sub _draw {
1421 my ($self) = @_; 1614 my ($self) = @_;
1422 1615
… …
1428 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1429 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1430 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432 1625
1433 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1434 1628
1629 unless (exists $self->{ox}) {
1435 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1436 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1437 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1438 1633
1439 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1440 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1441 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1442
1443 $tex
1444 }; 1637 };
1445 1638
1446 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1448 1641
1642 glColor_premultiply @{$self->{fg}}
1449 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1450 glColor @{$self->{fg}}; 1644
1451 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1452 } else {
1453 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1454 }
1455 1646
1456 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1457} 1648}
1458 1649
1459############################################################################# 1650#############################################################################
… …
1474 active_fg => [0, 0, 0], 1665 active_fg => [0, 0, 0],
1475 can_hover => 1, 1666 can_hover => 1,
1476 can_focus => 1, 1667 can_focus => 1,
1477 valign => 0, 1668 valign => 0,
1478 can_events => 1, 1669 can_events => 1,
1670 #text => ...
1479 @_ 1671 @_
1480 ) 1672 )
1481} 1673}
1482 1674
1483sub _set_text { 1675sub _set_text {
… …
1485 1677
1486 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1487 1679
1488 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1489 1681
1490 delete $self->{texture};
1491
1492 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1493 $self->{text} = $text; 1683 $self->{text} = $text;
1494 1684
1495 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1497 1687
1498 $self->emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1499} 1690}
1500 1691
1501sub set_text { 1692sub set_text {
1502 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1503 1694
1504 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1505 $self->_set_text ($text); 1696 $self->_set_text ($text);
1506 $self->update; 1697
1507 $self->check_size; 1698 $self->realloc;
1508} 1699}
1509 1700
1510sub get_text { 1701sub get_text {
1511 $_[0]{text} 1702 $_[0]{text}
1512} 1703}
… …
1515 my ($self) = @_; 1706 my ($self) = @_;
1516 1707
1517 my ($w, $h) = $self->SUPER::size_request; 1708 my ($w, $h) = $self->SUPER::size_request;
1518 1709
1519 ($w + 1, $h) # add 1 for cursor 1710 ($w + 1, $h) # add 1 for cursor
1520}
1521
1522sub size_allocate {
1523 my ($self, $w, $h) = @_;
1524
1525 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526} 1711}
1527 1712
1528sub key_down { 1713sub key_down {
1529 my ($self, $ev) = @_; 1714 my ($self, $ev) = @_;
1530 1715
… …
1545 } elsif ($sym == CFClient::SDLK_HOME) { 1730 } elsif ($sym == CFClient::SDLK_HOME) {
1546 $self->{cursor} = 0; 1731 $self->{cursor} = 0;
1547 } elsif ($sym == CFClient::SDLK_END) { 1732 } elsif ($sym == CFClient::SDLK_END) {
1548 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1735 $self->_emit ('escape');
1551 } elsif ($uni) { 1736 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1553 } 1740 }
1554 1741
1555 $self->_set_text ($text); 1742 $self->_set_text ($text);
1556 $self->update; 1743
1557 $self->check_size; 1744 $self->realloc;
1745
1746 1
1558} 1747}
1559 1748
1560sub focus_in { 1749sub focus_in {
1561 my ($self) = @_; 1750 my ($self) = @_;
1562 1751
… …
1577 utf8::encode $text; 1766 utf8::encode $text;
1578 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1579 1768
1580 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1581 $self->update; 1770 $self->update;
1771
1772 1
1582} 1773}
1583 1774
1584sub mouse_motion { 1775sub mouse_motion {
1585 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1586# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1587} 1780}
1588 1781
1589sub _draw { 1782sub _draw {
1590 my ($self) = @_; 1783 my ($self) = @_;
1591 1784
1592 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1593 1786
1594 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1595 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1596 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1597 } else { 1790 } else {
1598 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1599 } 1792 }
1600 1793
1601 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1603 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1604 glVertex 0 , 0; 1797 glVertex 0 , 0;
1605 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1606 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1607 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1642 if ($sym == 13) { 1835 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1836 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1837 my $txt = $self->get_text;
1645 $self->{history_pointer} = -1; 1838 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1839 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1840 $self->_emit (activate => $txt);
1648 $self->update; 1841 $self->update;
1649 1842
1650 } elsif ($sym == CFClient::SDLK_UP) { 1843 } elsif ($sym == CFClient::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) { 1844 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text; 1845 $self->{history_saveback} = $self->get_text;
… …
1668 } else { 1861 } else {
1669 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1670 } 1863 }
1671 1864
1672 } else { 1865 } else {
1673 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1674 } 1869 1
1675
1676} 1870}
1677 1871
1678############################################################################# 1872#############################################################################
1679 1873
1680package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1689 1883
1690sub new { 1884sub new {
1691 my $class = shift; 1885 my $class = shift;
1692 1886
1693 $class->SUPER::new ( 1887 $class->SUPER::new (
1694 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1695 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1696 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1697 can_hover => 1, 1892 can_hover => 1,
1698 align => 0, 1893 align => 0,
1699 valign => 0, 1894 valign => 0,
1700 can_events => 1, 1895 can_events => 1,
1701 @_ 1896 @_
1702 ) 1897 )
1703} 1898}
1704 1899
1900sub activate { }
1901
1705sub button_up { 1902sub button_up {
1706 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1707 1904
1905 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1907 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate"); 1908
1711 } 1909 1
1712} 1910}
1713 1911
1714sub _draw { 1912sub _draw {
1715 my ($self) = @_; 1913 my ($self) = @_;
1716 1914
1717 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1718
1719 if ($GRAB == $self) {
1720 $self->{fg} = $self->{active_fg};
1721 }
1722 1916
1723 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1725 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1726 1920
… …
1745 1939
1746sub new { 1940sub new {
1747 my $class = shift; 1941 my $class = shift;
1748 1942
1749 $class->SUPER::new ( 1943 $class->SUPER::new (
1750 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1751 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1752 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1753 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1754 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1755 state => 0, 1950 state => 0,
… …
1759} 1954}
1760 1955
1761sub size_request { 1956sub size_request {
1762 my ($self) = @_; 1957 my ($self) = @_;
1763 1958
1764 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1765} 1960}
1766 1961
1767sub button_down { 1962sub button_down {
1768 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1769 1964
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1772 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1774 } 1973 1
1775} 1974}
1776 1975
1777sub _draw { 1976sub _draw {
1778 my ($self) = @_; 1977 my ($self) = @_;
1779 1978
1780 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1781 1980
1782 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1783 1982
1784 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1983 my ($w, $h) = @$self{qw(w h)};
1984
1985 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1785 1986
1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787 1988
1788 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789 1990
… …
1944 2145
1945 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
1946 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
1947 2148
1948 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
1949 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1950 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
1951 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1952 2154
1953 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
1954 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2053 my $self = $class->SUPER::new ( 2255 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2260 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2061 vertical => 0, 2263 vertical => 0,
2062 can_hover => 1, 2264 can_hover => 1,
2063 inner_pad => 0.02, 2265 inner_pad => 0.02,
2064 @_ 2266 @_
2065 ); 2267 );
… …
2068 $self->update; 2270 $self->update;
2069 2271
2070 $self 2272 $self
2071} 2273}
2072 2274
2275sub changed { }
2276
2277sub set_range {
2278 my ($self, $range) = @_;
2279
2280 ($range, $self->{range}) = ($self->{range}, $range);
2281
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}";
2284}
2285
2073sub set_value { 2286sub set_value {
2074 my ($self, $value) = @_; 2287 my ($self, $value) = @_;
2075 2288
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2289 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2290
2078 $hi = $lo + 1 if $hi <= $lo; 2291 $hi = $lo + 1 if $hi <= $lo;
2079 2292
2293 $page = $hi - $lo if $page > $hi - $lo;
2294
2080 $value = $lo if $value < $lo; 2295 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2296 $value = $hi - $page if $value > $hi - $page;
2082 2297
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2298 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2299 if $unit;
2085 2300
2086 $page = $hi - $lo if $page > $hi - $lo;
2087
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2301 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2302
2090 if ($value != $old_value) { 2303 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2304 $self->_emit (changed => $value);
2092 $self->update; 2305 $self->update;
2093 } 2306 }
2094} 2307}
2095 2308
2096sub size_request { 2309sub size_request {
2097 my ($self) = @_; 2310 my ($self) = @_;
2098 2311
2099 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2100 my $h = $self->{req_h};
2101
2102 $self->{vertical} ? ($h, $w) : ($w, $h)
2103} 2313}
2104 2314
2105sub button_down { 2315sub button_down {
2106 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2107 2317
2108 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2319
2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321
2109 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2110} 2323}
2111 2324
2112sub mouse_motion { 2325sub mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2114 2327
2115 if ($GRAB == $self) { 2328 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2329 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2330
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2332
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2334
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2335 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2336 } else {
2337 return 0;
2338 }
2339
2123 } 2340 1
2124} 2341}
2125 2342
2126sub update { 2343sub update {
2127 my ($self) = @_; 2344 my ($self) = @_;
2128 2345
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2130 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2131 2355
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2357 my $range = ($hi - $page - $lo) || 1e-100;
2133 2358
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2359 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2360
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2361 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2362 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2363
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2364 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2365 $value = $value * $self->{scale} + $self->{offset};
2140 2366
2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2368 $self->{knob_w} = $knob_w;
2148 }); 2369 }
2149
2150 $self->SUPER::update;
2151}
2152
2153sub _draw {
2154 my ($self) = @_;
2155 2370
2156 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2157 2372
2158 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2159 2374
… …
2176 # draw handle 2391 # draw handle
2177 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2392 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2178 2393
2179 glDisable GL_TEXTURE_2D; 2394 glDisable GL_TEXTURE_2D;
2180} 2395}
2396
2397#############################################################################
2398
2399package CFClient::UI::ValSlider;
2400
2401our @ISA = CFClient::UI::HBox::;
2402
2403sub new {
2404 my ($class, %arg) = @_;
2405
2406 my $range = delete $arg{range};
2407
2408 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift },
2412 from_value => sub { shift },
2413 %arg,
2414 );
2415
2416 $self->{slider}->connect (changed => sub {
2417 my ($self, $value) = @_;
2418 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2419 $self->{parent}->emit (changed => $value);
2420 });
2421
2422# $self->{entry}->connect (changed => sub {
2423# my ($self, $value) = @_;
2424# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2425# $self->{parent}->emit (changed => $value);
2426# });
2427
2428 $self->add ($self->{slider}, $self->{entry});
2429
2430 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2431
2432 $self
2433}
2434
2435sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) }
2181 2437
2182############################################################################# 2438#############################################################################
2183 2439
2184package CFClient::UI::TextView; 2440package CFClient::UI::TextView;
2185 2441
… …
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2483 $self->{layout}->set_width ($self->{children}[0]{w});
2228 2484
2229 $self->reflow; 2485 $self->reflow;
2230} 2486}
2231 2487
2232sub text_height { 2488sub text_size {
2233 my ($self, $text, $indent) = @_; 2489 my ($self, $text, $indent) = @_;
2234 2490
2235 my $layout = $self->{layout}; 2491 my $layout = $self->{layout};
2236 2492
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2494 $layout->set_width ($self->{children}[0]{w} - $indent);
2239 $layout->set_markup ($text); 2495 $layout->set_markup ($text);
2240 2496
2241 ($layout->size)[1] 2497 $layout->size
2242} 2498}
2243 2499
2244sub reflow { 2500sub reflow {
2245 my ($self) = @_; 2501 my ($self) = @_;
2246 2502
2247 $self->{need_reflow}++; 2503 $self->{need_reflow}++;
2248 $self->update; 2504 $self->update;
2249} 2505}
2250 2506
2507sub set_offset {
2508 my ($self, $offset) = @_;
2509
2510 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset);
2512}
2513
2514sub clear {
2515 my ($self) = @_;
2516
2517 $self->{par} = [];
2518 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520}
2521
2251sub add_paragraph { 2522sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2523 my ($self, $color, $text, $indent) = @_;
2253 2524
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2525 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2526 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2527 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2529 }
2261 2530
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263 $self->{children}[1]->update;
2264} 2532}
2265 2533
2266sub update { 2534sub update {
2267 my ($self) = @_; 2535 my ($self) = @_;
2268 2536
… …
2271 return unless $self->{h} > 0; 2539 return unless $self->{h} > 0;
2272 2540
2273 delete $self->{texture}; 2541 delete $self->{texture};
2274 2542
2275 $ROOT->on_post_alloc ($self, sub { 2543 $ROOT->on_post_alloc ($self, sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545
2276 if (delete $self->{need_reflow}) { 2546 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2547 my $height = 0;
2278 2548
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2280 for @{$self->{par}}; 2553 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h;
2560 }
2561
2562 $height += $_->[1];
2563 }
2281 2564
2282 $self->{height} = $height; 2565 $self->{height} = $height;
2283 2566
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update;
2286 2568
2287 delete $self->{texture}; 2569 delete $self->{texture};
2288 } 2570 }
2289 2571
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2293 2575
2294 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2295 2577
2296 my $y0 = $top; 2578 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2579 my $y1 = $top + $H;
2298 2580
2299 my $y = 0; 2581 my $y = 0;
2300 2582
2301 my $layout = $self->{layout}; 2583 my $layout = $self->{layout};
2302 2584
2303 $layout->set_font ($self->{font}) if $self->{font}; 2585 $layout->set_font ($self->{font}) if $self->{font};
2304 2586
2305 glEnable GL_BLEND; 2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2590
2308 for my $par (@{$self->{par}}) { 2591 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2592 my $h = $par->[1];
2310 2593
2311 if ($y0 < $y + $h && $y < $y1) { 2594 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2595 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2596 $layout->set_width ($W - $par->[3]);
2314 $layout->set_markup ($par->[3]); 2597 $layout->set_markup ($par->[4]);
2315 2598
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2599 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2600
2318 glRasterPos $par->[2], $y - $y0; 2601 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2603 }
2321 2604
2322 $y += $h; 2605 $y += $h;
2323 } 2606 }
… …
2330sub _draw { 2613sub _draw {
2331 my ($self) = @_; 2614 my ($self) = @_;
2332 2615
2333 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2336 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2338 2621
2339 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2340 2623
2341} 2624}
… …
2390 2673
2391sub new { 2674sub new {
2392 my $class = shift; 2675 my $class = shift;
2393 2676
2394 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2395 state => 0, 2678 state => 0,
2396 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2397 @_ 2680 @_
2398 ); 2681 );
2399 2682
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2683 $self
2406} 2684}
2407 2685
2408sub toggle_flopper { 2686sub toggle_flopper {
2409 my ($self) = @_; 2687 my ($self) = @_;
2410 2688
2411 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2412 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open");
2416 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close");
2419 }
2420
2421 $self->emit (changed => $self->{state});
2422} 2690}
2423 2691
2424############################################################################# 2692#############################################################################
2425 2693
2426package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2439} 2707}
2440 2708
2441sub set_tooltip_from { 2709sub set_tooltip_from {
2442 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2443 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2444 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2445 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447 fontsize => 0.8, 2724 fontsize => 0.8,
2448 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2449 ellipsise => 0, 2726 ellipsise => 0,
2450 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2461 2738
2462sub size_allocate { 2739sub size_allocate {
2463 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2464 2741
2465 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2466} 2761}
2467 2762
2468sub _draw { 2763sub _draw {
2469 my ($self) = @_; 2764 my ($self) = @_;
2470 2765
… …
2487 glVertex $w, $h; 2782 glVertex $w, $h;
2488 glVertex $w, 0; 2783 glVertex $w, 0;
2489 glEnd; 2784 glEnd;
2490 2785
2491 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2492 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2493} 2789}
2494 2790
2495############################################################################# 2791#############################################################################
2496 2792
… …
2502 2798
2503sub new { 2799sub new {
2504 my $class = shift; 2800 my $class = shift;
2505 2801
2506 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2507 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2508 @_, 2805 @_,
2509 ); 2806 );
2510 2807
2511 if ($self->{anim} && $self->{animspeed}) { 2808 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2809 Scalar::Util::weaken (my $widget = $self);
… …
2527 2824
2528sub size_request { 2825sub size_request {
2529 (32, 8) 2826 (32, 8)
2530} 2827}
2531 2828
2829sub update {
2830 my ($self) = @_;
2831
2832 return unless $self->{visible};
2833
2834 $self->SUPER::update;
2835}
2836
2532sub _draw { 2837sub _draw {
2533 my ($self) = @_; 2838 my ($self) = @_;
2534 2839
2535 return unless $::CONN;#d# manage and cache textures differently 2840 return unless $::CONN;
2536 2841
2537 my $face; 2842 my $face;
2538 2843
2539 if ($self->{frame}) { 2844 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2845 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2546 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2547 2852
2548 if ($tex) { 2853 if ($tex) {
2549 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2551 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2552 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2553 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2554 } 2859 }
2555} 2860}
2556 2861
… …
2563 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2564} 2869}
2565 2870
2566############################################################################# 2871#############################################################################
2567 2872
2568package CFClient::UI::InventoryItem; 2873package CFClient::UI::Buttonbar;
2569 2874
2570our @ISA = CFClient::UI::HBox::; 2875our @ISA = CFClient::UI::HBox::;
2571 2876
2572sub _item_to_desc { 2877# TODO: should actualyl wrap buttons and other goodies.
2573 my ($item) = @_;
2574
2575 my $desc =
2576 $item->{nrof} < 2
2577 ? $item->{name}
2578 : "$item->{nrof} × $item->{name_pl}";
2579
2580 $item->{flags} & Crossfire::Protocol::F_OPEN
2581 and $desc .= " (open)";
2582 $item->{flags} & Crossfire::Protocol::F_APPLIED
2583 and $desc .= " (applied)";
2584 $item->{flags} & Crossfire::Protocol::F_UNPAID
2585 and $desc .= " (unpaid)";
2586 $item->{flags} & Crossfire::Protocol::F_MAGIC
2587 and $desc .= " (magic)";
2588 $item->{flags} & Crossfire::Protocol::F_CURSED
2589 and $desc .= " (cursed)";
2590 $item->{flags} & Crossfire::Protocol::F_DAMNED
2591 and $desc .= " (damned)";
2592 $item->{flags} & Crossfire::Protocol::F_LOCKED
2593 and $desc .= " *";
2594
2595 $desc
2596}
2597
2598sub new {
2599 my $class = shift;
2600
2601 my %args = @_;
2602
2603 my $item = delete $args{item};
2604
2605 my $desc = _item_to_desc ($item);
2606
2607 my $self = $class->SUPER::new (
2608 can_hover => 1,
2609 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_;
2614
2615 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag};
2618
2619 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT;
2621 }
2622
2623 $::CONN->send ("move $targ $item->{tag} 0");
2624 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) {
2627 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631 (
2632 $item->{flags} & Crossfire::Protocol::F_LOCKED
2633 ? (
2634 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635 )
2636 : (
2637 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2640 ),
2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644 }
2645
2646 1
2647 },
2648 %args
2649 );
2650
2651
2652 $self->add (new CFClient::UI::Face
2653 can_events => 0,
2654 face => $item->{face},
2655 anim => $item->{anim},
2656 animspeed => $item->{animspeed},
2657 );
2658
2659 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661 $self->{item} = $item;
2662
2663 $self->update_item;
2664
2665 $self
2666}
2667
2668sub update_item {
2669 my ($self) = @_;
2670
2671 my $desc = _item_to_desc ($self->{item});
2672
2673 $self->{name_lbl}->set_text ($desc);
2674}
2675
2676#############################################################################
2677
2678package CFClient::UI::Inventory;
2679
2680our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub new {
2683 my $class = shift;
2684
2685 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox),
2687 @_,
2688 );
2689
2690 $self
2691}
2692
2693sub set_items {
2694 my ($self, $items) = @_;
2695
2696 $self->{scrolled}->clear;
2697 return unless $items;
2698
2699 my @items = sort {
2700 ($a->{type} <=> $b->{type})
2701 or ($a->{name} cmp $b->{name})
2702 } @$items;
2703
2704 $self->{real_items} = \@items;
2705
2706 for my $item (@items) {
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708 $item->update_item ();
2709 }
2710
2711 $self->{scrolled}->add (@items);
2712
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2714}
2715
2716sub size_request {
2717 my ($self) = @_;
2718 ($self->{req_w}, $self->{req_h});
2719}
2720 2878
2721############################################################################# 2879#############################################################################
2722 2880
2723package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2724 2882
… …
2758 2916
2759# popup given the event (must be a mouse button down event currently) 2917# popup given the event (must be a mouse button down event currently)
2760sub popup { 2918sub popup {
2761 my ($self, $ev) = @_; 2919 my ($self, $ev) = @_;
2762 2920
2763 $self->emit ("popdown"); 2921 $self->_emit ("popdown");
2764 2922
2765 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 2924 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2768 2926
2769 $self->show; 2927 $self->show;
2770 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2771} 2929}
2772 2930
2773sub mouse_motion { 2931sub mouse_motion {
2774 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2775 2933
2776 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2777 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2778 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2779} 2939}
2780 2940
2781sub button_up { 2941sub button_up {
2782 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2783 2943
2784 if ($ev->{button} == $self->{button}) { 2944 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 2945 undef $GRAB;
2786 $self->hide; 2946 $self->hide;
2787 2947
2788 $self->emit ("popdown"); 2948 $self->_emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2790 } 2954 1
2791} 2955}
2792 2956
2793############################################################################# 2957#############################################################################
2794 2958
2795package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2796 2960
2797our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2798 2962
2799sub new { 2963sub new {
2800 my $class = shift; 2964 my $class = shift;
2801 2965
2802 $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
3067package CFClient::UI::Statusbox;
3068
3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
2803 fontsize => 0.8, 3075 fontsize => 0.8,
2804 @_, 3076 @_,
2805 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
3082 $this->reorder;
3083 $this->update;
3084 });
3085
3086 $self
2806} 3087}
2807 3088
2808sub reorder { 3089sub reorder {
2809 my ($self) = @_; 3090 my ($self) = @_;
2810 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2811 3092
2812 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2813 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2814 } 3095 }
2815 3096
… …
2817 3098
2818 my @items = sort { 3099 my @items = sort {
2819 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2820 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2821 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2822 3105
2823 my $count = 10 + 1; 3106 my $count = 10 + 1;
2824 for my $item (@items) { 3107 for my $item (@items) {
2825 last unless --$count; 3108 last unless --$count;
2826 3109
… …
2841 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2842 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2843 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
2844 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
2845 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2846 can_events => 1, 3130 can_events => 1,
2847 can_hover => 1 3131 can_hover => 1
2848 }; 3132 };
3133
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update;
3141 $self->{timer}->interval (1/30);
3142 }
2849 } 3143 }
2850 3144
2851 $self->clear; 3145 $self->clear;
2852 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2853} 3147}
… …
2856 my ($self, $text, %arg) = @_; 3150 my ($self, $text, %arg) = @_;
2857 3151
2858 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2860 3154
3155 return unless $text;
3156
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2862 3158
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 3160
2865 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
2866 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
2896 3192
2897 $self->reorder; 3193 $self->reorder;
2898 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
2899} 3195}
2900 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
2901############################################################################# 3205#############################################################################
2902 3206
2903package CFClient::UI::Root; 3207package CFClient::UI::Inventory;
2904 3208
2905our @ISA = CFClient::UI::Container::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
2906
2907use CFClient::OpenGL;
2908 3210
2909sub new { 3211sub new {
2910 my $class = shift; 3212 my $class = shift;
2911 3213
2912 $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3216 @_,
3217 );
3218
3219 $self
3220}
3221
3222sub set_items {
3223 my ($self, $items) = @_;
3224
3225 $self->{child}->clear;
3226 return unless $items;
3227
3228 my @items = sort {
3229 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name})
3231 } @$items;
3232
3233 $self->{real_items} = \@items;
3234
3235 my $row = 0;
3236 for my $item (@items) {
3237 CFClient::Item::update_widgets $item;
3238
3239 $self->{child}->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget});
3242
3243 $row++;
3244 }
3245}
3246
3247#############################################################################
3248
3249package CFClient::UI::BindEditor;
3250
3251our @ISA = CFClient::UI::FancyFrame::;
3252
3253sub new {
3254 my $class = shift;
3255
3256 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258 $self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262 text => "start recording",
3263 tooltip => "Start/Stops recording of actions."
3264 ."All subsequent actions after the recording started will be captured."
3265 ."The actions are displayed after the record was stopped."
3266 ."To bind the action you have to click on the 'Bind' button",
3267 on_activate => sub {
3268 unless ($self->{recording}) {
3269 $self->start;
3270 } else {
3271 $self->stop;
3272 }
3273 });
3274
3275 $vb->add (new CFClient::UI::Label text => "Actions:");
3276 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3279 $vb->add (my $hb = new CFClient::UI::HBox);
3280 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281 $hb->add (new CFClient::UI::Button
3282 text => "bind",
3283 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284 on_activate => sub {
3285 $self->ask_for_bind;
3286 });
3287
3288 $vb->add (my $hb = new CFClient::UI::HBox);
3289 $hb->add (new CFClient::UI::Button
3290 text => "ok",
3291 expand => 1,
3292 tooltip => "This closes the binding editor and saves the binding",
3293 on_activate => sub {
3294 $self->hide;
3295 $self->commit;
3296 });
3297
3298 $hb->add (new CFClient::UI::Button
3299 text => "cancel",
3300 expand => 1,
3301 tooltip => "This closes the binding editor without saving",
3302 on_activate => sub {
3303 $self->hide;
3304 $self->{binding_cancel}->()
3305 if $self->{binding_cancel};
3306 });
3307
3308 $self->update_binding_widgets;
3309
3310 $self
3311}
3312
3313sub commit {
3314 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318 ."'. Don't forget 'Save Config'!");
3319 $self->{binding_change}->($mod, $sym, $cmds)
3320 if $self->{binding_change};
3321 } else {
3322 $::STATUSBOX->add ("No action bound, no key or action specified!");
3323 $self->{binding_cancel}->()
3324 if $self->{binding_cancel};
3325 }
3326}
3327
3328sub start {
3329 my ($self) = @_;
3330
3331 $self->{rec_btn}->set_text ("stop recording");
3332 $self->{recording} = 1;
3333 $self->clear_command_list;
3334 $::CONN->start_record if $::CONN;
3335}
3336
3337sub stop {
3338 my ($self) = @_;
3339
3340 $self->{rec_btn}->set_text ("start recording");
3341 $self->{recording} = 0;
3342
3343 my $rec;
3344 $rec = $::CONN->stop_record if $::CONN;
3345 return unless ref $rec eq 'ARRAY';
3346 $self->set_command_list ($rec);
3347}
3348
3349
3350sub ask_for_bind_and_commit {
3351 my ($self) = @_;
3352 $self->ask_for_bind (1);
3353}
3354
3355sub ask_for_bind {
3356 my ($self, $commit) = @_;
3357
3358 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets;
3362 $self->commit if $commit;
3363 });
3364}
3365
3366# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands)
3368# $cb is the callback that is executed on OK
3369# $ccb is the callback that is executed on CANCEL and
3370# when the binding was unsuccessful on OK
3371sub set_binding {
3372 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374 $self->clear_command_list;
3375 $self->{recording} = 0;
3376 $self->{rec_btn}->set_text ("start recording");
3377
3378 $self->{binding} = [$mod, $sym];
3379 $self->{commands} = $cmds;
3380
3381 $self->{binding_change} = $cb;
3382 $self->{binding_cancel} = $ccb;
3383
3384 $self->update_binding_widgets;
3385}
3386
3387# this is a shortcut method that asks for a binding
3388# and then just binds it.
3389sub do_quick_binding {
3390 my ($self, $cmds) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1);
3395}
3396
3397sub update_binding_widgets {
3398 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding;
3400 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401 $self->set_command_list ($cmds);
3402}
3403
3404sub get_binding {
3405 my ($self) = @_;
3406 return (
3407 $self->{binding}->[0],
3408 $self->{binding}->[1],
3409 [ grep { defined $_ } @{$self->{commands}} ]
3410 );
3411}
3412
3413sub clear_command_list {
3414 my ($self) = @_;
3415 $self->{cmdbox}->clear ();
3416}
3417
3418sub set_command_list {
3419 my ($self, $cmds) = @_;
3420
3421 $self->{cmdbox}->clear ();
3422 $self->{commands} = $cmds;
3423
3424 my $idx = 0;
3425
3426 for (@$cmds) {
3427 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429 my $i = $idx;
3430 $hb->add (new CFClient::UI::Label text => $_);
3431 $hb->add (new CFClient::UI::Button
3432 text => "delete",
3433 tooltip => "Deletes the action from the record",
3434 on_activate => sub {
3435 $self->{cmdbox}->remove ($hb);
3436 $cmds->[$i] = undef;
3437 });
3438
3439
3440 $idx++
3441 }
3442}
3443
3444#############################################################################
3445
3446package CFClient::UI::SpellList;
3447
3448our @ISA = CFClient::UI::Table::;
3449
3450sub new {
3451 my $class = shift;
3452
3453 my $self = $class->SUPER::new (
3454 binding => [],
3455 commands => [],
2913 @_, 3456 @_,
2914 ) 3457 )
2915} 3458}
2916 3459
2917sub configure { 3460# XXX: Do sorting? Argl...
2918 my ($self, $x, $y, $w, $h) = @_; 3461sub add_spell {
2919
2920 $self->{w} = $w;
2921 $self->{h} = $h;
2922}
2923
2924sub check_size {
2925 my ($self) = @_; 3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
2926 3464
2927 $self->size_allocate ($self->{w}, $self->{h}) 3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2928 if $self->{w}; 3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492}
3493
3494sub remove_spell {
3495 my ($self, $spell) = @_;
3496 delete $self->{spells}->{$spell->{name}};
3497 $self->rebuild_spell_list;
3498}
3499
3500#############################################################################
3501
3502package CFClient::UI::Root;
3503
3504our @ISA = CFClient::UI::Container::;
3505
3506use List::Util qw(min max);
3507
3508use CFClient::OpenGL;
3509
3510sub new {
3511 my $class = shift;
3512
3513 my $self = $class->SUPER::new (
3514 visible => 1,
3515 @_,
3516 );
3517
3518 Scalar::Util::weaken ($self->{root} = $self);
3519
3520 $self
2929} 3521}
2930 3522
2931sub size_request { 3523sub size_request {
2932 my ($self) = @_; 3524 my ($self) = @_;
2933 3525
2934 ($self->{w}, $self->{h}) 3526 ($self->{w}, $self->{h})
3527}
3528
3529sub _to_pixel {
3530 my ($coord, $size, $max) = @_;
3531
3532 $coord =
3533 $coord eq "center" ? ($max - $size) * 0.5
3534 : $coord eq "max" ? $max
3535 : $coord;
3536
3537 $coord = 0 if $coord < 0;
3538 $coord = $max - $size if $coord > $max - $size;
3539
3540 int $coord + 0.5
2935} 3541}
2936 3542
2937sub size_allocate { 3543sub size_allocate {
2938 my ($self, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
2939 3545
2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945
2946 for my $child ($self->children) { 3546 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 3548
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3549 $X = $child->{force_x} if exists $child->{force_x};
2950 if exists $child->{req_x}; 3550 $Y = $child->{force_y} if exists $child->{force_y};
2951 3551
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3552 $X = _to_pixel $X, $W, $self->{w};
2953 if exists $child->{req_y}; 3553 $Y = _to_pixel $Y, $H, $self->{h};
2954
2955 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2956 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2957 3554
2958 $child->configure ($X, $Y, $W, $H); 3555 $child->configure ($X, $Y, $W, $H);
2959 } 3556 }
2960} 3557}
2961 3558
… …
2972} 3569}
2973 3570
2974sub update { 3571sub update {
2975 my ($self) = @_; 3572 my ($self) = @_;
2976 3573
2977 $self->check_size;
2978 $::WANT_REFRESH++; 3574 $::WANT_REFRESH++;
2979} 3575}
2980 3576
2981sub add { 3577sub add {
2982 my ($self, @children) = @_; 3578 my ($self, @children) = @_;
2983 3579
2984 for my $child (@children) {
2985 $child->{toplevel} = 1; 3580 $_->{is_toplevel} = 1
2986 3581 for @children;
2987 # integerise window positions
2988 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y};
2990 }
2991 3582
2992 $self->SUPER::add (@children); 3583 $self->SUPER::add (@children);
3584}
3585
3586sub remove {
3587 my ($self, @children) = @_;
3588
3589 $self->SUPER::remove (@children);
3590
3591 delete $self->{is_toplevel}
3592 for @children;
3593
3594 while (@children) {
3595 my $w = pop @children;
3596 push @children, $w->children;
3597 $w->set_invisible;
3598 }
2993} 3599}
2994 3600
2995sub on_refresh { 3601sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3602 my ($self, $id, $cb) = @_;
2997 3603
… …
3010 while ($self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
3011 $_->() 3617 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
3013 } 3619 }
3014 3620
3015 if ($self->{check_size}) { 3621 if ($self->{realloc}) {
3016 my @queue = ([], []); 3622 my %queue;
3623 my @queue;
3624 my $widget;
3017 3625
3018 for (;;) { 3626 outer:
3019 if ($self->{check_size}) { 3627 while () {
3020 # heuristic: check containers last 3628 if (my $realloc = delete $self->{realloc}) {
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3629 for $widget (values %$realloc) {
3022 for values %{delete $self->{check_size}} 3630 $widget->{visible} or next; # do not resize invisible widgets
3631
3632 $queue{$widget+0}++ and next; # duplicates are common
3633
3634 push @{ $queue[$widget->{visible}] }, $widget;
3635 }
3023 } 3636 }
3024 3637
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3638 while () {
3639 @queue or last outer;
3026 3640
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3641 $widget = pop @{ $queue[-1] || [] }
3028 ? @$widget{qw(user_w user_h)} 3642 and last;
3029 : $widget->size_request;
3030
3031 if (delete $widget->{force_alloc}
3032 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3033 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3034 3643
3644 pop @queue;
3645 }
3646
3647 delete $queue{$widget+0};
3648
3649 my ($w, $h) = $widget->size_request;
3650
3651 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3652 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3653
3654 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3655 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3656
3657 $w = $widget->{force_w} if exists $widget->{force_w};
3658 $h = $widget->{force_h} if exists $widget->{force_h};
3659
3660 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3661 || delete $widget->{force_realloc}) {
3035 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
3037 3664
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3665 $self->{size_alloc}{$widget+0} = $widget;
3039 3666
3040 $widget->{parent}->check_size
3041 if $widget->{parent}; 3667 if (my $parent = $widget->{parent}) {
3668 $self->{realloc}{$parent+0} = $parent
3669 unless $queue{$parent+0};
3670
3671 $parent->{force_size_alloc} = 1;
3672 $self->{size_alloc}{$parent+0} = $parent;
3673 }
3042 } 3674 }
3675
3676 delete $self->{realloc}{$widget+0};
3043 } 3677 }
3044 } 3678 }
3045 3679
3046 while ($self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) { 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
3048 my ($widget, $w, $h) = @$_; 3682 values %$size_alloc;
3683
3684 while () {
3685 my $widget = pop @queue || last;
3686
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3049 3688
3050 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
3052 3691
3692 $w = int $w + 0.5;
3693 $h = int $h + 0.5;
3694
3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w};
3697 $widget->{old_h} = $widget->{h};
3698
3053 $widget->{w} = $w; 3699 $widget->{w} = $w;
3054 $widget->{h} = $h; 3700 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h); 3701
3056 $widget->emit (size_allocate => $w, $h); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
3057 } 3704 }
3058 } 3705 }
3059 3706
3060 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
3061 $_->() 3708 $_->()
3062 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
3063 } 3710 }
3711
3064 3712
3065 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3067 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
3068 3716
… …
3070 glLoadIdentity; 3718 glLoadIdentity;
3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3072 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
3073 glLoadIdentity; 3721 glLoadIdentity;
3074 3722
3723 {
3724 package CFClient::UI::Base;
3725
3726 ($draw_x, $draw_y, $draw_w, $draw_h) =
3727 (0, 0, $self->{w}, $self->{h});
3728 }
3729
3075 $self->_draw; 3730 $self->_draw;
3076} 3731}
3077 3732
3078############################################################################# 3733#############################################################################
3079 3734

Diff Legend

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