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.190 by root, Mon May 8 22:17:38 2006 UTC vs.
Revision 1.263 by elmex, Wed May 31 14:04:52 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
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}
15 43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_markup ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 60 }
40 61
41 return; 62 return;
42 } 63 }
43 } 64 }
… …
47 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
48} 69}
49 70
50# class methods for events 71# class methods for events
51sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 74 if $FOCUS;
54} 75}
55 76
56sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 79 if $FOCUS;
59} 80}
60 81
61sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
62 my ($ev) = @_; 83 my ($ev) = @_;
… …
71 check_tooltip; 92 check_tooltip;
72 } 93 }
73 94
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 96
76 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 99}
81 100
82sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
83 my ($ev) = @_; 102 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
85 104
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 106
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 108
90 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 111
95 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 114 $grab->update if $grab;
98 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 132
116 check_tooltip; 133 check_tooltip;
117 } 134 }
118 135
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 137 if $HOVER;
123} 138}
124 139
125# convert position array to integers 140# convert position array to integers
126sub harmonize { 141sub harmonize {
127 my ($vals) = @_; 142 my ($vals) = @_;
… …
133 $rem += $_ - $i; 148 $rem += $_ - $i;
134 $_ = $i; 149 $_ = $i;
135 } 150 }
136} 151}
137 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
138############################################################################# 194#############################################################################
139 195
140package CFClient::UI::Base; 196package CFClient::UI::Base;
141 197
142use strict; 198use strict;
… …
145 201
146sub new { 202sub new {
147 my $class = shift; 203 my $class = shift;
148 204
149 my $self = bless { 205 my $self = bless {
150 x => 0, 206 x => "center",
151 y => 0, 207 y => "center",
152 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
153 can_events => 1, 211 can_events => 1,
154 @_ 212 @_
155 }, $class; 213 }, $class;
156 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
157 for (keys %$self) { 217 for (keys %$self) {
158 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
160 } 220 }
161 } 221 }
162 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
163 $self 235 $self
164} 236}
165 237
166sub destroy { 238sub destroy {
167 my ($self) = @_; 239 my ($self) = @_;
… …
176 return if $self->{parent}; 248 return if $self->{parent};
177 249
178 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
179} 251}
180 252
181sub hide { 253sub set_visible {
182 my ($self) = @_; 254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
183 277
184 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
186 280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
187 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
188 if $self->{parent}; 312 if $self->{parent};
189} 313}
190 314
191sub move { 315sub move_abs {
192 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
193 317
194 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
197 321
198 $self->update; 322 $self->update;
199} 323}
200 324
201sub set_size { 325sub set_size {
202 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
203 327
204 $self->{user_w} = $w; 328 $self->{force_w} = $w;
205 $self->{user_h} = $h; 329 $self->{force_h} = $h;
206 330
207 $self->check_size; 331 $self->realloc;
208} 332}
209 333
210sub size_request { 334sub size_request {
211 require Carp; 335 require Carp;
212 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
214 338
215sub configure { 339sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
217 341
218 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
221 347
222 # use alignment to adjust x, y 348 # use alignment to adjust x, y
223 349
224 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 352 }
229 353
230 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 355 $self->{x} = $x;
232 $self->{y} = $y; 356 $self->{y} = $y;
233 $self->update; 357 $self->update;
234 } 358 }
235 359
236 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
362
237 $self->{w} = $w; 363 $self->{alloc_w} = $w;
238 $self->{h} = $h; 364 $self->{alloc_h} = $h;
239 365
240 $self->size_allocate ($w, $h); 366 $self->{root}{size_alloc}{$self+0} = $self;
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 367 }
244} 368}
245 369
246sub size_allocate { 370sub size_allocate {
247 # nothing to be done 371 # nothing to be done
248} 372}
249 373
250sub children { 374sub children {
251} 375}
252 376
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263}
264
265sub set_max_size { 377sub set_max_size {
266 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
267 379
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 382}
271 383
272# return top left coordinates 384sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 385 my ($self, $tooltip) = @_;
275 386
276 $self->{parent} 387 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 388 $tooltip =~ s/\s+$//;
278 389
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
280} 398}
281 399
282# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
283sub coord2local { 401sub coord2local {
284 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
285 403
286 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 405}
289 406
290# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
291sub coord2global { 408sub coord2global {
292 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
293 410
294 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 412}
297 413
298sub focus_in { 414sub focus_in {
299 my ($self) = @_; 415 my ($self) = @_;
300 416
301 return if $FOCUS == $self; 417 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
303 419
304 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
305 421
306 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
307 423
308 $focus->update if $focus; 424 $focus->update if $focus;
309 $FOCUS->update; 425 $FOCUS->update;
310} 426}
311 427
… …
314 430
315 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
316 432
317 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
318 434
319 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
320 436
321 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
322} 441}
323 442
324sub mouse_motion { } 443sub mouse_motion { }
325sub button_up { } 444sub button_up { }
326sub key_down { } 445sub key_down { }
327sub key_up { } 446sub key_up { }
328 447
329sub button_down { 448sub button_down {
330 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
331 450
332 $self->focus_in; 451 $self->focus_in;
… …
335sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
336sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
337sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
338sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
339sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
340 529
341sub draw { 530sub draw {
342 my ($self) = @_; 531 my ($self) = @_;
343 532
344 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
361 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
362 glEnd; 551 glEnd;
363 glDisable GL_BLEND; 552 glDisable GL_BLEND;
364 } 553 }
365 554
366 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
367 glPushMatrix; 556 glPushMatrix;
368 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 560 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
373 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
374 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
375 glEnd; 564 glEnd;
376 glPopMatrix; 565 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 567 }
379} 568}
380 569
381sub _draw { 570sub _draw {
382 my ($self) = @_; 571 my ($self) = @_;
383 572
384 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
385} 574}
386 575
387sub find_widget {
388 my ($self, $x, $y) = @_;
389
390 return () unless $self->{can_events};
391
392 return $self
393 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
394 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
395
396 ()
397}
398
399sub set_parent {
400 my ($self, $parent) = @_;
401
402 Scalar::Util::weaken ($self->{parent} = $parent);
403}
404
405sub check_size {
406 my ($self) = @_;
407
408 $self->_check_size;
409 return;
410 #TODO: but needs a vastly more difficult algorithm
411 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
412
413 $check_size->{$self} = $self;
414
415 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
416 while (%$check_size) {
417 my @widgets = values %$check_size;
418 $_->_check_size
419 for @widgets;
420 }
421 });
422}
423
424sub _check_size {
425 my ($self) = @_;
426
427 delete $CFClient::UI::ROOT->{_check_size}{$self};
428
429 $self->{parent}
430 or return 1;
431
432 my ($w, $h) = $self->{user_w} && $self->{user_h}
433 ? @$self{qw(user_w user_h)}
434 : $self->size_request;
435
436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
437 $self->{req_w} = $w;
438 $self->{req_h} = $h;
439
440 $self->{parent}->_check_size
441 or $self->size_allocate (
442 (List::Util::max $self->{w}, $w),
443 (List::Util::max $self->{h}, $h),
444 );
445
446 1
447 } else {
448 0
449 }
450}
451
452sub update {
453 my ($self) = @_;
454
455 my $update = $CFClient::UI::ROOT->{_update} ||= {};
456
457 $update->{$self} = $self;
458
459 $CFClient::UI::ROOT->on_refresh (_update => sub {
460 while (%$update) {
461 my @widgets = values %$update;
462 %$update = ();
463
464 $_->{parent} && $_->{parent}->update
465 for @widgets;
466 }
467 });
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
480}
481
482sub DESTROY { 576sub DESTROY {
483 my ($self) = @_; 577 my ($self) = @_;
484 578
579 delete $WIDGET{$self+0};
485 #$self->deactivate; 580 #$self->deactivate;
486} 581}
487 582
488############################################################################# 583#############################################################################
489 584
… …
498 my $class = shift; 593 my $class = shift;
499 594
500 # range [value, low, high, page] 595 # range [value, low, high, page]
501 596
502 $class->SUPER::new ( 597 $class->SUPER::new (
503 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
504 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
505 @_ 600 @_
506 ) 601 )
507} 602}
508 603
509sub _draw { 604sub _draw {
510 my ($self) = @_; 605 my ($self) = @_;
511 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
512 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
513 613
514 glEnable GL_BLEND; 614 glEnable GL_BLEND;
515 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
516 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
517 617
518 glBegin GL_QUADS; 618 glBegin GL_QUADS;
519 glVertex 0 , 0; 619 glVertex 0 , 0;
520 glVertex 0 , $h; 620 glVertex 0 , $h;
521 glVertex $w, $h; 621 glVertex $w, $h;
522 glVertex $w, 0; 622 glVertex $w, 0;
523 glEnd; 623 glEnd;
524 624
525 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
526} 627}
527 628
528############################################################################# 629#############################################################################
529 630
530package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
535 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
536 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
537} 638}
538 639
539sub size_request { 640sub size_request {
540 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
541} 644}
542 645
543sub draw { } 646sub draw { }
544 647
545############################################################################# 648#############################################################################
… …
574 $self->{children} = [ 677 $self->{children} = [
575 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
576 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
577 ]; 680 ];
578 681
579 $_->check_size 682 $self->realloc;
580 for @widgets;
581
582 $self->update;
583} 683}
584 684
585sub children { 685sub children {
586 @{ $_[0]{children} } 686 @{ $_[0]{children} }
587} 687}
… …
592 delete $child->{parent}; 692 delete $child->{parent};
593 $child->hide; 693 $child->hide;
594 694
595 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
596 696
597 $self->check_size; 697 $self->realloc;
598 $self->update;
599} 698}
600 699
601sub clear { 700sub clear {
602 my ($self) = @_; 701 my ($self) = @_;
603 702
… …
607 for (@$children) { 706 for (@$children) {
608 delete $_->{parent}; 707 delete $_->{parent};
609 $_->hide; 708 $_->hide;
610 } 709 }
611 710
612 $self->check_size; 711 $self->realloc;
613 $self->update;
614} 712}
615 713
616sub find_widget { 714sub find_widget {
617 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
618 716
… …
693} 791}
694 792
695sub update { 793sub update {
696 my ($self) = @_; 794 my ($self) = @_;
697 795
698 $ROOT->on_refresh ($self => sub { $self->render_child }); 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
699 $self->SUPER::update; 797 $self->SUPER::update;
700} 798}
701 799
702sub size_allocate { 800sub size_allocate {
703 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
… …
716 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
717 glClearColor 0, 0, 0, 0; 815 glClearColor 0, 0, 0, 0;
718 glClear GL_COLOR_BUFFER_BIT; 816 glClear GL_COLOR_BUFFER_BIT;
719 817
720 $self->_render; 818 $self->_render;
721# glColorMask 1, 1, 1, 0;
722# glEnable GL_BLEND;
723# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
724# glRasterPos 0, 0;
725# glCopyPixels 0, 0, $self->{w}, $self->{h};
726# glDisable GL_BLEND;
727# glColorMask 1, 1, 1, 1;
728 }; 819 };
729} 820}
730 821
731sub _draw { 822sub _draw {
732 my ($self) = @_; 823 my ($self) = @_;
… …
734 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
735 826
736 my $tex = $self->{texture} 827 my $tex = $self->{texture}
737 or return; 828 or return;
738 829
739 glEnable GL_BLEND;
740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1; 832 glColor 1, 1, 1, 1;
744 833
745 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
746 835
747 glDisable GL_BLEND;
748 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
749} 837}
750 838
751############################################################################# 839#############################################################################
752 840
753package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
754 842
755our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
756 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
757sub size_request { 855sub size_request {
758 my ($self) = @_; 856 my ($self) = @_;
759 857
760 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
761 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
762 859
763 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
764} 864}
765 865
766sub size_allocate { 866sub size_allocate {
767 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
768 868
869 my $child = $self->child;
870
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873
874 $self->child->configure (0, 0, $w, $h);
769 $self->update; 875 $self->update;
770} 876}
771 877
772sub set_offset { 878sub set_offset {
773 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
776 $self->{view_y} = int $y; 882 $self->{view_y} = int $y;
777 883
778 $self->update; 884 $self->update;
779} 885}
780 886
781# hmm, this does not work for topleft of $self... but we should not aks for that 887# hmm, this does not work for topleft of $self... but we should not ask for that
782sub _topleft { 888sub coord2local {
783 my ($self, $x, $y) = @_; 889 my ($self, $x, $y) = @_;
784 890
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 891 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
892}
893
894sub coord2global {
895 my ($self, $x, $y) = @_;
896
897 $x = List::Util::min $self->{w}, $x - $self->{view_x};
898 $y = List::Util::min $self->{h}, $y - $self->{view_y};
899
900 $self->SUPER::coord2global ($x, $y)
786} 901}
787 902
788sub find_widget { 903sub find_widget {
789 my ($self, $x, $y) = @_; 904 my ($self, $x, $y) = @_;
790 905
… …
815 my $class = shift; 930 my $class = shift;
816 931
817 my $self; 932 my $self;
818 933
819 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
820 vertical => 1, 935 vertical => 1,
821 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
822 connect_changed => sub { 937 on_changed => sub {
823 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
824 }, 939 },
825 ; 940 ;
826 941
827 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
828 vp => (new CFClient::UI::ViewPort), 943 vp => (new CFClient::UI::ViewPort expand => 1),
829 slider => $slider, 944 slider => $slider,
830 @_, 945 @_,
831 ); 946 );
832 947
833 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
… …
835 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
836 951
837 $self 952 $self
838} 953}
839 954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972}
973
840#TODO# update range on size_allocate depeneing on child 974#TODO# update range on size_allocate depending on child
841# update viewport offset on scroll 975# update viewport offset on scroll
842 976
843############################################################################# 977#############################################################################
844 978
845package CFClient::UI::Frame; 979package CFClient::UI::Frame;
… …
849use CFClient::OpenGL; 983use CFClient::OpenGL;
850 984
851sub new { 985sub new {
852 my $class = shift; 986 my $class = shift;
853 987
854 my $self = $class->SUPER::new ( 988 $class->SUPER::new (
855 bg => [1, 1, 1, 1], 989 bg => undef,
856 border_bg => [1, 1, 1, 1],
857 border => 0.8,
858 @_ 990 @_,
859 ); 991 )
860
861 $self
862} 992}
863 993
864sub _draw { 994sub _draw {
865 my ($self) = @_; 995 my ($self) = @_;
866 996
867 my ($w, $h) = ($self->{w}, $self->{h}); 997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
868 999
869 glEnable GL_BLEND; 1000 glEnable GL_BLEND;
870 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
871 glEnable GL_TEXTURE_2D; 1002 glColor @{ $self->{bg} };
872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
873 1003
874# glBegin GL_QUADS; 1004 glBegin GL_QUADS;
875# glColor 0, 0, 0, 0;
876# glVertex 0 , 0; 1005 glVertex 0 , 0;
877# glVertex 0 , $h; 1006 glVertex 0 , $h;
878# glVertex $w, $h; 1007 glVertex $w, $h;
879# glVertex $w, 0; 1008 glVertex $w, 0;
880# glEnd; 1009 glEnd;
881 1010
882
883 $self->child->draw;
884 glDisable GL_BLEND; 1011 glDisable GL_BLEND;
885 glDisable GL_TEXTURE_2D; 1012 }
1013
1014 $self->SUPER::_draw;
886} 1015}
887 1016
888############################################################################# 1017#############################################################################
889 1018
890package CFClient::UI::FancyFrame; 1019package CFClient::UI::FancyFrame;
891 1020
892our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
893 1022
894use CFClient::OpenGL; 1023use CFClient::OpenGL;
895 1024
896my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
897 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
898 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
899 1032
900sub new { 1033sub new {
901 my $class = shift; 1034 my $class = shift;
902 1035
903 # TODO: user_x, user_y, overwrite moveto?
904
905 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
906 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
907 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
908 border => 0.6, 1039 border => 0.6,
909 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
910 @_ 1043 @_
911 ); 1044 );
912 1045
913 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
914 align => 0, 1047 align => 0,
… …
938 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
939 1072
940 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
941 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
942 1075
943 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
944 if $self->{title}; 1077 if $self->{title};
945 1078
946 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
947} 1080}
948 1081
… …
967 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
968 1101
969 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
970 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
971 1104
972 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
973 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
974 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
975 $self->check_size;
976 }; 1110 };
977 1111
978 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
979 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
980 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
982 $self->{motion} = sub { 1116 $self->{motion} = sub {
983 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
984 1118
985 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
986 1120
987 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
988 $self->update;
989 }; 1122 };
990 } 1123 }
991} 1124}
992 1125
993sub button_up { 1126sub button_up {
… …
1006 my ($self) = @_; 1139 my ($self) = @_;
1007 1140
1008 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
1009 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1010 1143
1011 glEnable GL_BLEND;
1012 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1013 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
1014 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1015 1146
1016 my $border = $self->border; 1147 my $border = $self->border;
1017 1148
1018 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1019 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1020 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1022 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1023 1154
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1025 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1026 1157
1027 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1028 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1029 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1030
1031 glColor @{ $self->{bg} };
1032
1033 $bg->{s} = $rep_x;
1034 $bg->{t} = $rep_y;
1035 $bg->{wrap_mode} = 1;
1036 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
1037 1164
1038 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1039 glDisable GL_BLEND;
1040 }
1041 1166
1042 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1043 1168
1044 $self->child->draw; 1169 $self->child->draw;
1045} 1170}
… …
1057sub new { 1182sub new {
1058 my $class = shift; 1183 my $class = shift;
1059 1184
1060 $class->SUPER::new ( 1185 $class->SUPER::new (
1061 col_expand => [], 1186 col_expand => [],
1062 @_ 1187 @_,
1063 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1064} 1193}
1065 1194
1066sub add { 1195sub add {
1067 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1068 1197
1069 $child->set_parent ($self); 1198 $child->set_parent ($self);
1070 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1071 1200
1072 $child->check_size; 1201 $self->realloc;
1073} 1202}
1074 1203
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
1079# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
1080sub clear { 1205sub clear {
1081 my ($self) = @_; 1206 my ($self) = @_;
1082 1207
1083 my @children = $self->children; 1208 my @children = $self->children;
1084 delete $self->{children}; 1209 delete $self->{children};
… …
1086 for (@children) { 1211 for (@children) {
1087 delete $_->{parent}; 1212 delete $_->{parent};
1088 $_->hide; 1213 $_->hide;
1089 } 1214 }
1090 1215
1091 $self->update; 1216 $self->realloc;
1092} 1217}
1093 1218
1094sub get_wh { 1219sub get_wh {
1095 my ($self) = @_; 1220 my ($self) = @_;
1096 1221
… …
1127sub size_allocate { 1252sub size_allocate {
1128 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1129 1254
1130 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1131 1256
1132 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1133 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1134 1259
1135 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1136 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1137 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1138 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1192 } 1317 }
1193} 1318}
1194 1319
1195############################################################################# 1320#############################################################################
1196 1321
1197package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1198
1199# TODO: wrap into common Box base class
1200 1323
1201our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1202 1325
1203sub size_request { 1326sub size_request {
1204 my ($self) = @_; 1327 my ($self) = @_;
1205 1328
1206 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1207 1330 ? (
1208 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1209 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1210 (List::Util::max map $_->[1], @alloc), 1333 )
1211 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1212} 1338}
1213 1339
1214sub size_allocate { 1340sub size_allocate {
1215 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1216 1342
1217 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1218
1219 my $children = $self->{children}; 1344 my $children = $self->{children};
1220 1345
1221 my @h = map $_->{req_w}, @$children; 1346 my @req;
1222 1347
1223 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1224 1349 @req = ($space / (@$children || 1)) x @$children;
1225 if ($req_h > $h) {
1226 # ah well, not enough space
1227 $_ *= $h / $req_h for @h;
1228 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1229 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1230 $exp ||= 1;
1231 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1232 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1233 my $child = $children->[$_];
1234
1235 my $alloc_h = $h[$_];
1236 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1237 $h[$_] = $alloc_h;
1238 } 1364 }
1239 } 1365 }
1240 1366
1241 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1242 1368
1243 my $y = 0; 1369 my $pos = 0;
1244 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1245 my $child = $children->[$_];
1246 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1247 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1248 1373
1249 $y += $h; 1374 $pos += $alloc;
1250 } 1375 }
1251 1376
1252 1 1377 1
1253} 1378}
1254 1379
1255############################################################################# 1380#############################################################################
1256 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1257package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1258 1398
1259# TODO: wrap into common Box base class
1260
1261our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1262 1400
1263sub size_request { 1401sub new {
1264 my ($self) = @_; 1402 my $class = shift;
1265 1403
1266 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1267 1405 vertical => 1,
1268 ( 1406 @_,
1269 (List::Util::max map $_->[0], @alloc),
1270 (List::Util::sum map $_->[1], @alloc),
1271 ) 1407 )
1272} 1408}
1273 1409
1274sub size_allocate {
1275 my ($self, $w, $h) = @_;
1276
1277 my $children = $self->{children};
1278
1279 my @h = map $_->{req_h}, @$children;
1280
1281 my $req_h = List::Util::sum @h;
1282
1283 if ($req_h > $h) {
1284 # ah well, not enough space
1285 $_ *= $h / $req_h for @h;
1286 } else {
1287 my $exp = List::Util::sum map $_->{expand}, @$children;
1288 $exp ||= 1;
1289
1290 for (0 .. $#$children) {
1291 my $child = $children->[$_];
1292
1293 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1294 }
1295 }
1296
1297 CFClient::UI::harmonize \@h;
1298
1299 my $y = 0;
1300 for (0 .. $#$children) {
1301 my $child = $children->[$_];
1302 my $h = $h[$_];
1303 $child->configure (0, $y, $w, $h);
1304
1305 $y += $h;
1306 }
1307
1308 1
1309}
1310
1311############################################################################# 1410#############################################################################
1312 1411
1313package CFClient::UI::Label; 1412package CFClient::UI::Label;
1314 1413
1315our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1316 1415
1317use CFClient::OpenGL; 1416use CFClient::OpenGL;
1318 1417
1319sub new { 1418sub new {
1320 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1321 1420
1322 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1323 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1324 #font => default_font 1425 #font => default_font
1426 #text => initial text
1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1430 layout => (new CFClient::Layout),
1325 fontsize => 1, 1431 fontsize => 1,
1326 text => "",
1327 align => -1, 1432 align => -1,
1328 valign => -1, 1433 valign => -1,
1329 padding => 2, 1434 padding_x => 2,
1330 layout => new CFClient::Layout, 1435 padding_y => 2,
1331 can_events => 0, 1436 can_events => 0,
1332 %arg 1437 %arg
1333 ); 1438 );
1334 1439
1335 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1336 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1337 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1338 $self->{template} = $layout; 1443 $self->{template} = $layout;
1339 } 1444 }
1340 1445
1341 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1342 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1447 $self->set_markup (delete $self->{markup});
1448 } else {
1449 $self->set_text (delete $self->{text});
1450 }
1343 1451
1344 $self 1452 $self
1345} 1453}
1346 1454
1347sub escape { 1455sub escape($) {
1348 local $_ = $_[1]; 1456 local $_ = $_[0];
1349 1457
1350 s/&/&amp;/g; 1458 s/&/&amp;/g;
1351 s/>/&gt;/g; 1459 s/>/&gt;/g;
1352 s/</&lt;/g; 1460 s/</&lt;/g;
1353 1461
1354 $_[1] 1462 $_
1355} 1463}
1356 1464
1357sub update { 1465sub update {
1358 my ($self) = @_; 1466 my ($self) = @_;
1359 1467
… …
1365 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1366 1474
1367 return if $self->{text} eq "T$text"; 1475 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1369 1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1371 1480
1372 delete $self->{texture}; 1481 $self->realloc;
1373 $self->update; 1482 $self->update;
1374 $self->check_size;
1375} 1483}
1376 1484
1377sub set_markup { 1485sub set_markup {
1378 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1379 1487
1380 return if $self->{text} eq "M$markup"; 1488 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup"; 1489 $self->{text} = "M$markup";
1382 1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1383 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1384 1495
1385 delete $self->{texture}; 1496 $self->realloc;
1386 $self->update; 1497 $self->update;
1387 $self->check_size;
1388} 1498}
1389 1499
1390sub size_request { 1500sub size_request {
1391 my ($self) = @_; 1501 my ($self) = @_;
1392 1502
1393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1394 $self->{layout}->set_width ($self->{max_w} || -1); 1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1396 1508
1397 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1398 1510
1399 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1404 1516
1405 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1406 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1407 } 1519 }
1408 1520
1409 ( 1521 ($w, $h)
1410 $w + $self->{padding} * 2,
1411 $h + $self->{padding} * 2,
1412 )
1413} 1522}
1414 1523
1415sub size_allocate { 1524sub size_allocate {
1416 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1417 1526
… …
1422 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1423 1532
1424 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1425 delete $self->{texture}; 1534 delete $self->{texture};
1426 1535
1427 $self->update; 1536 $self->realloc;
1428 $self->check_size;
1429} 1537}
1430 1538
1431sub _draw { 1539sub _draw {
1432 my ($self) = @_; 1540 my ($self) = @_;
1433 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1434 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1435 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1436 $self->{layout}->set_width ($self->{w}); 1547 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1437 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1438 new_from_layout CFClient::Texture $self->{layout} 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1553
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5);
1557
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1439 }; 1563 };
1440 1564
1441 glEnable GL_BLEND;
1442 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1443 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1445 1567
1568 if ($tex->{format} == GL_ALPHA) {
1446 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
1447
1448 $self->{ox} = int (
1449 $self->{align} < 0 ? $self->{padding}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1451 : ($self->{w} - $tex->{w}) * 0.5
1452 );
1453
1454 $self->{oy} = int (
1455 $self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5
1458 );
1459
1460 $tex->draw_quad ($self->{ox}, $self->{oy}); 1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1461 1574
1462 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1463 glDisable GL_BLEND;
1464} 1576}
1465 1577
1466############################################################################# 1578#############################################################################
1467 1579
1468package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
… …
1481 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1482 can_hover => 1, 1594 can_hover => 1,
1483 can_focus => 1, 1595 can_focus => 1,
1484 valign => 0, 1596 valign => 0,
1485 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1486 @_ 1599 @_
1487 ) 1600 )
1488} 1601}
1489 1602
1490sub _set_text { 1603sub _set_text {
… …
1500 $self->{text} = $text; 1613 $self->{text} = $text;
1501 1614
1502 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1503 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1504 1617
1505 $self->emit (changed => $self->{text}); 1618 $self->_emit (changed => $self->{text});
1619}
1620
1621sub set_text {
1622 my ($self, $text) = @_;
1623
1624 $self->{cursor} = length $text;
1625 $self->_set_text ($text);
1626
1627 $self->realloc;
1506} 1628}
1507 1629
1508sub get_text { 1630sub get_text {
1509 $_[0]{text} 1631 $_[0]{text}
1510} 1632}
… …
1513 my ($self) = @_; 1635 my ($self) = @_;
1514 1636
1515 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1516 1638
1517 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1518}
1519
1520sub size_allocate {
1521 my ($self, $w, $h) = @_;
1522
1523 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1524}
1525
1526sub set_text {
1527 my ($self, $text) = @_;
1528
1529 $self->{cursor} = length $text;
1530 $self->_set_text ($text);
1531 $self->update;
1532} 1640}
1533 1641
1534sub key_down { 1642sub key_down {
1535 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1536 1644
… …
1538 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1539 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1540 1648
1541 my $text = $self->get_text; 1649 my $text = $self->get_text;
1542 1650
1543 if ($sym == 8) { 1651 if ($uni == 8) {
1544 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1545 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1546 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1547 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1548 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1549 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1550 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1551 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1552 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1553 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1554 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1555 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1556 $self->emit ('escape'); 1664 $self->_emit ('escape');
1557 } elsif ($uni) { 1665 } elsif ($uni) {
1558 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1559 } 1667 }
1560 1668
1561 $self->_set_text ($text); 1669 $self->_set_text ($text);
1562 $self->update; 1670
1671 $self->realloc;
1563} 1672}
1564 1673
1565sub focus_in { 1674sub focus_in {
1566 my ($self) = @_; 1675 my ($self) = @_;
1567 1676
… …
1647 if ($sym == 13) { 1756 if ($sym == 13) {
1648 unshift @{$self->{history}}, 1757 unshift @{$self->{history}},
1649 my $txt = $self->get_text; 1758 my $txt = $self->get_text;
1650 $self->{history_pointer} = -1; 1759 $self->{history_pointer} = -1;
1651 $self->{history_saveback} = ''; 1760 $self->{history_saveback} = '';
1652 $self->emit (activate => $txt); 1761 $self->_emit (activate => $txt);
1653 $self->update; 1762 $self->update;
1654 1763
1655 } elsif ($sym == CFClient::SDLK_UP) { 1764 } elsif ($sym == CFClient::SDLK_UP) {
1656 if ($self->{history_pointer} < 0) { 1765 if ($self->{history_pointer} < 0) {
1657 $self->{history_saveback} = $self->get_text; 1766 $self->{history_saveback} = $self->get_text;
… …
1694 1803
1695sub new { 1804sub new {
1696 my $class = shift; 1805 my $class = shift;
1697 1806
1698 $class->SUPER::new ( 1807 $class->SUPER::new (
1699 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1700 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1701 bg => [1, 1, 1, 0.2],
1702 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1703 can_hover => 1, 1812 can_hover => 1,
1704 align => 0, 1813 align => 0,
1705 valign => 0, 1814 valign => 0,
1706 can_events => 1, 1815 can_events => 1,
1707 @_ 1816 @_
1708 ) 1817 )
1709} 1818}
1710 1819
1820sub activate { }
1821
1711sub button_up { 1822sub button_up {
1712 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1713 1824
1825 $self->emit ("activate")
1714 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1715 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1716 $self->emit ("activate");
1717 }
1718} 1828}
1719 1829
1720sub _draw { 1830sub _draw {
1721 my ($self) = @_; 1831 my ($self) = @_;
1722 1832
… …
1724 1834
1725 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1726 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1727 } 1837 }
1728 1838
1729 glEnable GL_BLEND;
1730 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1731 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1732 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1733 glColor 0, 0, 0, 1; 1841 glColor 0, 0, 0, 1;
1734 1842
1735 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1736 1844
1737 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1738 glDisable GL_BLEND;
1739 1846
1740 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1741} 1848}
1742 1849
1743############################################################################# 1850#############################################################################
… …
1754 1861
1755sub new { 1862sub new {
1756 my $class = shift; 1863 my $class = shift;
1757 1864
1758 $class->SUPER::new ( 1865 $class->SUPER::new (
1759 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1760 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1761 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1870 bg => [0, 0, 0, 0.2],
1871 active_bg => [1, 1, 1, 0.5],
1762 state => 0, 1872 state => 0,
1763 can_hover => 1, 1873 can_hover => 1,
1764 @_ 1874 @_
1765 ) 1875 )
1766} 1876}
1767 1877
1768sub size_request { 1878sub size_request {
1769 my ($self) = @_; 1879 my ($self) = @_;
1770 1880
1771 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1772} 1882}
1773 1883
1774sub button_down { 1884sub button_down {
1775 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1776 1886
1777 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1778 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1779 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1780 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1781 } 1891 }
1782} 1892}
1783 1893
1784sub _draw { 1894sub _draw {
1785 my ($self) = @_; 1895 my ($self) = @_;
1786 1896
1787 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1788 1898
1789 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1790 1900
1791 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1792 1904
1793 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1794 1906
1795 glEnable GL_BLEND; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1796 glEnable GL_TEXTURE_2D; 1909 glEnable GL_TEXTURE_2D;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798
1799 my $tex = $self->{state} ? $tex[1] : $tex[0];
1800
1801 $tex->draw_quad (0, 0, $s, $s); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1802
1803 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805} 1912}
1806 1913
1807############################################################################# 1914#############################################################################
1808 1915
1809package CFClient::UI::Image; 1916package CFClient::UI::Image;
… …
1852 glTranslate 0, -$self->{w}, 0; 1959 glTranslate 0, -$self->{w}, 0;
1853 1960
1854 ($w, $h) = ($h, $w); 1961 ($w, $h) = ($h, $w);
1855 } 1962 }
1856 1963
1857 glEnable GL_BLEND;
1858 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1859 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 1966
1862 $tex->draw_quad (0, 0, $w, $h); 1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1863 1968
1864 glDisable GL_BLEND;
1865 glDisable GL_TEXTURE_2D; 1969 glDisable GL_TEXTURE_2D;
1866} 1970}
1867 1971
1868############################################################################# 1972#############################################################################
1869 1973
… …
2058 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
2059 2163
2060sub new { 2164sub new {
2061 my $class = shift; 2165 my $class = shift;
2062 2166
2063 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
2064 2168
2065 # TODO: 0-width page 2169 # TODO: 0-width page
2066 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
2067 # TODO: calculations are off 2171 # TODO: calculations are off
2068 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
2069 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2070 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2175 bg => [0, 0, 0, 0.2],
2176 active_bg => [1, 1, 1, 0.5],
2071 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
2072 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2073 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2074 vertical => 0, 2180 vertical => 0,
2075 can_hover => 1, 2181 can_hover => 1,
2076 inner_pad => 5, 2182 inner_pad => 0.02,
2077 @_ 2183 @_
2078 ); 2184 );
2079 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
2080 $self 2189 $self
2081} 2190}
2082 2191
2192sub changed { }
2193
2194sub set_range {
2195 my ($self, $range) = @_;
2196
2197 ($range, $self->{range}) = ($self->{range}, $range);
2198
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}";
2201}
2202
2203sub set_value {
2204 my ($self, $value) = @_;
2205
2206 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2207
2208 $hi = $lo + 1 if $hi <= $lo;
2209
2210 $page = $hi - $lo if $page > $hi - $lo;
2211
2212 $value = $lo if $value < $lo;
2213 $value = $hi - $page if $value > $hi - $page;
2214
2215 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2216 if $unit;
2217
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219
2220 if ($value != $old_value) {
2221 $self->_emit (changed => $value);
2222 $self->update;
2223 }
2224}
2225
2083sub size_request { 2226sub size_request {
2084 my ($self) = @_; 2227 my ($self) = @_;
2085 2228
2086 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2087 my $h = $self->{req_h};
2088
2089 $self->{vertical} ? ($h, $w) : ($w, $h)
2090} 2230}
2091 2231
2092sub button_down { 2232sub button_down {
2093 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2094 2234
2095 $self->SUPER::button_down ($ev, $x, $y); 2235 $self->SUPER::button_down ($ev, $x, $y);
2236
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238
2096 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
2097} 2240}
2098 2241
2099sub mouse_motion { 2242sub mouse_motion {
2100 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
2101 2244
2102 if ($GRAB == $self) { 2245 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247
2248 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2253 }
2254}
2255
2256sub update {
2257 my ($self) = @_;
2258
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2260 $self->set_value ($self->{range}[0]);
2261
2103 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
2104 2264
2105 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2106 2266
2107 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2108 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2109 2269
2110 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
2111 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
2112 $x = $lo if $x < $lo;
2113 $x = $hi - $page if $x > $hi - $page;
2114 $self->{range}[0] = $x;
2115 2272
2116 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
2117 $self->update; 2274 $self->{knob_w} = $knob_w;
2118 } 2275 });
2119}
2120 2276
2121# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
2122# so that the handle doesn't leave the texture. This calculation isn't 100%
2123# correct propably, but it does the job for now
2124sub _calc_inner_pad_px {
2125 my ($self, $w) = @_;
2126 ($w / 100) * $self->{inner_pad} # % to pixels
2127} 2278}
2128 2279
2129sub _draw { 2280sub _draw {
2130 my ($self) = @_; 2281 my ($self) = @_;
2131 2282
2132 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
2133 2284
2134 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
2135 2286
2136 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
2137 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
2138 2289
2290 glTranslate 1, 0, 0;
2139 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
2140 glTranslate 0, -$self->{w}, 0;
2141
2142 ($w, $h) = ($h, $w);
2143 } 2292 }
2144 2293
2145 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2146 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2147 2296
2148 my ($value, $lo, $hi, $page) = @{$self->{range}};
2149
2150 $hi = $value + 1 if $lo == $hi;
2151
2152 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2153 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2154
2155 $page = int $page * $inner_w / ($hi - $lo);
2156 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2157
2158 $w -= $page;
2159 $page &= ~1;
2160 glTranslate $page * 0.5, 0, 0;
2161 $page ||= 2;
2162
2163 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2164 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2165
2166 glEnable GL_BLEND;
2167 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2168 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 2299
2171 # draw background 2300 # draw background
2172 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2173 2302
2174 # draw handle 2303 # draw handle
2175 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2304 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2176 2305
2177 glDisable GL_BLEND;
2178 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
2179} 2307}
2308
2309#############################################################################
2310
2311package CFClient::UI::ValSlider;
2312
2313our @ISA = CFClient::UI::HBox::;
2314
2315sub new {
2316 my ($class, %arg) = @_;
2317
2318 my $range = delete $arg{range};
2319
2320 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift },
2324 from_value => sub { shift },
2325 %arg,
2326 );
2327
2328 $self->{slider}->connect (changed => sub {
2329 my ($self, $value) = @_;
2330 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2331 $self->{parent}->emit (changed => $value);
2332 });
2333
2334# $self->{entry}->connect (changed => sub {
2335# my ($self, $value) = @_;
2336# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2337# $self->{parent}->emit (changed => $value);
2338# });
2339
2340 $self->add ($self->{slider}, $self->{entry});
2341
2342 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2343
2344 $self
2345}
2346
2347sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) }
2180 2349
2181############################################################################# 2350#############################################################################
2182 2351
2183package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
2184 2353
… …
2193 fontsize => 1, 2362 fontsize => 1,
2194 can_events => 0, 2363 can_events => 0,
2195 #font => default_font 2364 #font => default_font
2196 @_, 2365 @_,
2197 2366
2198 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
2199 par => [], 2368 par => [],
2200 height => 0, 2369 height => 0,
2201 children => [ 2370 children => [
2202 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
2203 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
… …
2214 2383
2215 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2385 $self->reflow;
2217} 2386}
2218 2387
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_text ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2388sub size_allocate {
2239 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2240 2390
2241 $self->SUPER::size_allocate ($w, $h); 2391 $self->SUPER::size_allocate ($w, $h);
2242 2392
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2396
2247 $self->reflow; 2397 $self->reflow;
2248} 2398}
2249 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
2250sub add_paragraph { 2434sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2252 2436
2253 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2254 2438 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2258 2442
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262 $self->{children}[1]->update;
2263} 2444}
2264 2445
2265sub update { 2446sub update {
2266 my ($self) = @_; 2447 my ($self) = @_;
2267 2448
… …
2269 2450
2270 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2271 2452
2272 delete $self->{texture}; 2453 delete $self->{texture};
2273 2454
2274 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2275 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2459 my $height = 0;
2277 2460
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2279 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2280 2476
2281 $self->{height} = $height; 2477 $self->{height} = $height;
2282 2478
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2480
2285 delete $self->{texture}; 2481 delete $self->{texture};
2286 } 2482 }
2287 2483
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2291 2487
2488 my $top = int $self->{children}[1]{range}[0];
2489
2490 my $y0 = $top;
2491 my $y1 = $top + $H;
2492
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2292 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296
2297 my $top = int $self->{children}[1]{range}[0];
2298
2299 my $y0 = $top;
2300 my $y1 = $top + $self->{h};
2301
2302 my $y = 0;
2303
2304 my $layout = $self->{layout};
2305
2306 $layout->set_font ($self->{font}) if $self->{font};
2307 2502
2308 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2504 my $h = $par->[1];
2310 2505
2311 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2312 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2313 2510
2314 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2315 my ($W, $H) = $layout->size; 2512
2316 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2317 } 2515 }
2318 2516
2319 $y += $h; 2517 $y += $h;
2320 } 2518 }
2321 2519
2322 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2324 }; 2521 };
2325 }); 2522 });
2326} 2523}
2327 2524
2328sub _draw { 2525sub _draw {
2329 my ($self) = @_; 2526 my ($self) = @_;
2330 2527
2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2333 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2338 glDisable GL_BLEND;
2339 2533
2340 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2341 2535
2342} 2536}
2343 2537
… …
2391 2585
2392sub new { 2586sub new {
2393 my $class = shift; 2587 my $class = shift;
2394 2588
2395 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2396 state => 0, 2590 state => 0,
2397 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2398 @_ 2592 @_
2399 ); 2593 );
2400 2594
2401 if ($self->{state}) {
2402 $self->{state} = 0;
2403 $self->toggle_flopper;
2404 }
2405
2406 $self 2595 $self
2407} 2596}
2408 2597
2409sub toggle_flopper { 2598sub toggle_flopper {
2410 my ($self) = @_; 2599 my ($self) = @_;
2411 2600
2412 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2413 if ($self->{state} = !$self->{state}) {
2414 $CFClient::UI::ROOT->add ($self->{other});
2415 $self->{other}->move ($self->coord2global (0, $self->{h}));
2416 $self->emit ("open");
2417 } else {
2418 $CFClient::UI::ROOT->remove ($self->{other});
2419 $self->emit ("close");
2420 }
2421
2422 $self->emit (changed => $self->{state});
2423} 2602}
2424 2603
2425############################################################################# 2604#############################################################################
2426 2605
2427package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2437 @_, 2616 @_,
2438 can_events => 0, 2617 can_events => 0,
2439 ) 2618 )
2440} 2619}
2441 2620
2442sub set_markup { 2621sub set_tooltip_from {
2443 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2444 2623
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 my $tooltip = $widget->{tooltip};
2446 $self->{label}->set_markup ($text); 2625
2447 $self->add ($self->{label}); 2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2633 $self->add (new CFClient::UI::Label
2634 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8,
2637 fg => [0, 0, 0, 1],
2638 ellipsise => 0,
2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
2640 );
2448} 2641}
2449 2642
2450sub size_request { 2643sub size_request {
2451 my ($self) = @_; 2644 my ($self) = @_;
2452
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454 2645
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456 2647
2457 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2458} 2649}
… …
2461 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2462 2653
2463 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2464} 2655}
2465 2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2673}
2674
2466sub _draw { 2675sub _draw {
2467 my ($self) = @_; 2676 my ($self) = @_;
2468 2677
2469 glPushMatrix;
2470 glTranslate 0.375, 0.375; 2678 glTranslate 0.375, 0.375;
2471 2679
2472 my ($w, $h) = @$self{qw(w h)}; 2680 my ($w, $h) = @$self{qw(w h)};
2473 2681
2474 glColor 1, 0.8, 0.4; 2682 glColor 1, 0.8, 0.4;
… …
2485 glVertex 0 , $h; 2693 glVertex 0 , $h;
2486 glVertex $w, $h; 2694 glVertex $w, $h;
2487 glVertex $w, 0; 2695 glVertex $w, 0;
2488 glEnd; 2696 glEnd;
2489 2697
2490 glPopMatrix; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2491 2699
2492 glTranslate 2, 2;
2493 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2494} 2701}
2495 2702
2496############################################################################# 2703#############################################################################
2497 2704
… …
2502use CFClient::OpenGL; 2709use CFClient::OpenGL;
2503 2710
2504sub new { 2711sub new {
2505 my $class = shift; 2712 my $class = shift;
2506 2713
2507 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2508 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2509 @_, 2717 @_,
2510 ) 2718 );
2719
2720 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self);
2722
2723 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1,
2726 interval => $self->{animspeed},
2727 cb => sub {
2728 ++$widget->{frame};
2729 $widget->update;
2730 },
2731 );
2732 }
2733
2734 $self
2511} 2735}
2512 2736
2513sub size_request { 2737sub size_request {
2514 (32, 8) 2738 (32, 8)
2515} 2739}
2516 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2517sub _draw { 2749sub _draw {
2518 my ($self) = @_; 2750 my ($self) = @_;
2519 2751
2520 return unless $::CONN;#d# manage and cache textures differently 2752 return unless $::CONN;
2753
2754 my $face;
2755
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}];
2758
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762
2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2522 2764
2523 # TODO animation
2524 if ($tex) { 2765 if ($tex) {
2525 glEnable GL_BLEND;
2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2530 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2531 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2532 glDisable GL_BLEND;
2533 } 2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2534} 2781}
2535 2782
2536############################################################################# 2783#############################################################################
2537 2784
2538package CFClient::UI::InventoryItem; 2785package CFClient::UI::Inventory;
2539 2786
2540our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFClient::UI::ScrolledWindow::;
2541 2788
2542sub new { 2789sub new {
2543 my $class = shift; 2790 my $class = shift;
2544 2791
2545 my %args = @_;
2546
2547 my $item = $args{item};
2548
2549 my $desc = $item->{nrof} < 2
2550 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}";
2552
2553
2554 my $self = $class->SUPER::new ( 2792 my $self = $class->SUPER::new (
2555 can_hover => 1, 2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2556 can_events => 1,
2557 tooltip => (CFClient::UI::Label->escape ($desc)
2558 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2559 connect_button_down => sub {
2560 my ($self, $ev, $x, $y) = @_;
2561
2562 # todo: maybe put examine on 1? but should just be a tooltip :(
2563 if ($ev->{button} == 1) {
2564 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2565 } elsif ($ev->{button} == 2) {
2566 $::CONN->send ("apply $item->{tag}");
2567 } elsif ($ev->{button} == 3) {
2568 CFClient::UI::Menu->new (
2569 items => [
2570 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571 [
2572 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2573 sub { $::CONN->send ("lock $item->{tag}") },
2574 ],
2575 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2576 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2577 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2578 ],
2579 )->popup ($ev);
2580 }
2581
2582 1
2583 },
2584 %args
2585 );
2586 $self->add(new CFClient::UI::Face
2587 can_events => 0,
2588 face => $item->{face},
2589 anim => $item->{anim},
2590 animspeed => $item->{animspeed});
2591 $self->add(new CFClient::UI::Label
2592 can_events => 0,
2593 text => $desc);
2594
2595 $self
2596}
2597
2598#############################################################################
2599
2600package CFClient::UI::Inventory;
2601
2602our @ISA = CFClient::UI::ScrolledWindow::;
2603
2604sub new {
2605 my $class = shift;
2606
2607 my $self = $class->SUPER::new (
2608 scrolled => (new CFClient::UI::VBox),
2609 @_, 2794 @_,
2610 ); 2795 );
2611 2796
2612 $self 2797 $self
2613} 2798}
… …
2616 my ($self, $items) = @_; 2801 my ($self, $items) = @_;
2617 2802
2618 $self->{scrolled}->clear; 2803 $self->{scrolled}->clear;
2619 return unless $items; 2804 return unless $items;
2620 2805
2621 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2622 2810
2623 $self->{real_items} = \@items; 2811 $self->{real_items} = \@items;
2624 2812
2813 my $row = 0;
2625 for my $item (@items) { 2814 for my $item (@items) {
2626 my $desc = $item->{nrof} < 2 2815 CFClient::Item::update_widgets $item;
2627 ? $item->{name}
2628 : "$item->{nrof} $item->{name_pl}";
2629 2816
2630 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2631 } 2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2632 2820
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2821 $row++;
2634} 2822 }
2635
2636sub size_request {
2637 my ($self) = @_;
2638 ($self->{req_w}, $self->{req_h});
2639} 2823}
2640 2824
2641############################################################################# 2825#############################################################################
2642 2826
2643package CFClient::UI::Menu; 2827package CFClient::UI::Menu;
… …
2678 2862
2679# popup given the event (must be a mouse button down event currently) 2863# popup given the event (must be a mouse button down event currently)
2680sub popup { 2864sub popup {
2681 my ($self, $ev) = @_; 2865 my ($self, $ev) = @_;
2682 2866
2683 $self->emit ("popdown"); 2867 $self->_emit ("popdown");
2684 2868
2685 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2686 $GRAB = $self; 2870 $GRAB = $self;
2687 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2688 2872
2689 $self->show; 2873 $self->show;
2690 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2691} 2875}
2692 2876
2693sub mouse_motion { 2877sub mouse_motion {
2694 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2695 2879
… …
2703 2887
2704 if ($ev->{button} == $self->{button}) { 2888 if ($ev->{button} == $self->{button}) {
2705 undef $GRAB; 2889 undef $GRAB;
2706 $self->hide; 2890 $self->hide;
2707 2891
2708 $self->emit ("popdown"); 2892 $self->_emit ("popdown");
2709 $self->{hover}[1]->() if $self->{hover}; 2893 $self->{hover}[1]->() if $self->{hover};
2710 } 2894 }
2711} 2895}
2712 2896
2713############################################################################# 2897#############################################################################
2714 2898
2899package CFClient::UI::Statusbox;
2900
2901our @ISA = CFClient::UI::VBox::;
2902
2903sub new {
2904 my $class = shift;
2905
2906 $class->SUPER::new (
2907 fontsize => 0.8,
2908 @_,
2909 )
2910}
2911
2912sub reorder {
2913 my ($self) = @_;
2914 my $NOW = time;
2915
2916 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 }
2919
2920 my @widgets;
2921
2922 my @items = sort {
2923 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} };
2926
2927 my $count = 10 + 1;
2928 for my $item (@items) {
2929 last unless --$count;
2930
2931 push @widgets, $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text};
2936
2937 for ($short) {
2938 s/^\s+//;
2939 s/\s+/ /g;
2940 }
2941
2942 new CFClient::UI::Label
2943 markup => $short,
2944 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg},
2950 can_events => 1,
2951 can_hover => 1
2952 };
2953 }
2954
2955 $self->clear;
2956 $self->SUPER::add (reverse @widgets);
2957}
2958
2959sub add {
2960 my ($self, $text, %arg) = @_;
2961
2962 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2966
2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2968
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970
2971 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) {
2973 $item->{count}++;
2974 } else {
2975 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text;
2977 }
2978 $item->{id} = ++$self->{id};
2979 $item->{timeout} = $timeout;
2980 delete $item->{label};
2981 } else {
2982 $self->{item}{$group} = {
2983 id => ++$self->{id},
2984 text => $text,
2985 timeout => $timeout,
2986 tooltip => $text,
2987 fg => [0.8, 0.8, 0.8, 0.8],
2988 pri => 0,
2989 count => 1,
2990 %arg,
2991 };
2992 }
2993
2994 $self->reorder;
2995}
2996
2997sub reconfigure {
2998 my ($self) = @_;
2999
3000 delete $_->{label}
3001 for values %{ $self->{item} || {} };
3002
3003 $self->reorder;
3004 $self->SUPER::reconfigure;
3005}
3006
3007#############################################################################
3008
2715package CFClient::UI::Root; 3009package CFClient::UI::Root;
2716 3010
2717our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2718 3012
2719use CFClient::OpenGL; 3013use CFClient::OpenGL;
2720 3014
2721sub check_size { 3015sub new {
2722 my ($self) = @_; 3016 my $class = shift;
2723 3017
2724 $self->configure (0, 0, $self->{w}, $self->{h}); 3018 my $self = $class->SUPER::new (
3019 visible => 1,
3020 @_,
3021 );
3022
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self
2725} 3026}
2726 3027
2727sub size_request { 3028sub size_request {
2728 my ($self) = @_; 3029 my ($self) = @_;
2729 3030
2730 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
2731} 3046}
2732 3047
2733sub size_allocate { 3048sub size_allocate {
2734 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2735 3050
2736 my $old_w = $self->{old_w};
2737 my $old_h = $self->{old_h};
2738
2739 if ($old_w && $old_h) {
2740 for my $child ($self->children) {
2741 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2742 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2743 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2744 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2745 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2746 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2747 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2748 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2749 }
2750 }
2751
2752 $self->{old_w} = $w;
2753 $self->{old_h} = $h;
2754}
2755
2756sub configure {
2757 my ($self, $x, $y, $w, $h) = @_;
2758
2759 $self->SUPER::configure ($x, $y, $w, $h);
2760
2761 for my $child ($self->children) { 3051 for my $child ($self->children) {
2762 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2763 3053
2764 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3054 $X = $child->{force_x} if exists $child->{force_x};
2765 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3055 $Y = $child->{force_y} if exists $child->{force_y};
3056
3057 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h};
3059
2766 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
2767 } 3061 }
2768} 3062}
2769 3063
2770sub _topleft { 3064sub coord2local {
2771 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2772 3066
2773 ($x, $y) 3067 ($x, $y)
2774} 3068}
2775 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2776sub update { 3076sub update {
2777 my ($self) = @_; 3077 my ($self) = @_;
2778 3078
2779 $self->check_size; 3079 $::WANT_REFRESH++;
2780 ::refresh ();
2781} 3080}
2782 3081
2783sub add { 3082sub add {
2784 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2785 3084
2786 # integerize window positions 3085 $_->{is_toplevel} = 1
2787 $child->{x} = int $child->{x}; 3086 for @children;
2788 $child->{y} = int $child->{y};
2789 3087
2790 $self->SUPER::add ($child); 3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
2791} 3104}
2792 3105
2793sub on_refresh { 3106sub on_refresh {
2794 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2795 3108
2796 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2797} 3110}
2798 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2799sub draw { 3118sub draw {
2800 my ($self) = @_; 3119 my ($self) = @_;
2801 3120
2802 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2803 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2804 } 3124 }
3125
3126 if ($self->{realloc}) {
3127 my @queue;
3128
3129 while () {
3130 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach
3132
3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3137 }
3138
3139 my $widget = pop @queue || last;
3140
3141 $widget->{visible} or last; # do not resize invisible widgets
3142
3143 my ($w, $h) = $widget->size_request;
3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152 || delete $widget->{force_realloc}) {
3153 $widget->{req_w} = $w;
3154 $widget->{req_h} = $h;
3155
3156 $self->{size_alloc}{$widget+0} = $widget;
3157
3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3167 }
3168 }
3169
3170 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178
3179 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0;
3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h);
3190 }
3191 }
3192 }
3193
3194 while ($self->{post_alloc_hook}) {
3195 $_->()
3196 for values %{delete $self->{post_alloc_hook}};
3197 }
3198
2805 3199
2806 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2807 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2808 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2809 3203
2810 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2811 glLoadIdentity; 3205 glLoadIdentity;
2812 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2813 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2814 glLoadIdentity; 3208 glLoadIdentity;
2815 3209
2816 $self->_draw; 3210 $self->_draw;
2817} 3211}
2818 3212
2819############################################################################# 3213#############################################################################
2820 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315# if $commit is true, the binding will be set after the user entered a key combo
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405
3406#############################################################################
3407
3408package CFClient::UI::SpellList;
3409
3410our @ISA = CFClient::UI::FancyFrame::;
3411
3412sub new {
3413 my $class = shift;
3414
3415 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3416
3417 $self->add (new CFClient::UI::ScrolledWindow
3418 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3419
3420 $self;
3421}
3422
3423# XXX: Do sorting? Argl...
3424sub add_spell {
3425 my ($self, $spell) = @_;
3426 $self->{spells}->{$spell->{name}} = $spell;
3427
3428 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3429 face => $spell->{face},
3430 can_hover => 1,
3431 can_events => 1,
3432 tooltip => $spell->{message});
3433
3434 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3435 text => $spell->{name},
3436 can_hover => 1,
3437 can_events => 1,
3438 tooltip => $spell->{message},
3439 expand => 1);
3440
3441 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3443 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3444 expand => 1);
3445
3446 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3447 text => "bind to key",
3448 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3449}
3450
3451sub rebuild_spell_list {
3452 my ($self) = @_;
3453 $self->{tbl_idx} = 0;
3454 $self->add_spell ($_) for values %{$self->{spells}};
3455}
3456
3457sub remove_spell {
3458 my ($self, $spell) = @_;
3459 delete $self->{spells}->{$spell->{name}};
3460 $self->rebuild_spell_list;
3461}
3462
3463#############################################################################
3464
2821package CFClient::UI; 3465package CFClient::UI;
2822 3466
2823$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
2824$TOOLTIP = new CFClient::UI::Tooltip; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2825 3469
28261 34701
2827 3471

Diff Legend

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