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

Diff Legend

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