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.163 by root, Mon Apr 24 06:40:29 2006 UTC vs.
Revision 1.262 by elmex, Wed May 31 13:44:26 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 => 1, 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
… …
1241sub set_fontsize { 1530sub set_fontsize {
1242 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1243 1532
1244 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1245 delete $self->{texture}; 1534 delete $self->{texture};
1246 $self->check_size; 1535
1247 $self->update; 1536 $self->realloc;
1248} 1537}
1249 1538
1250sub _draw { 1539sub _draw {
1251 my ($self) = @_; 1540 my ($self) = @_;
1252 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1253 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1254 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1255 $self->{layout}->set_width ($self->{w}); 1547 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1256 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1257 new_from_layout CFClient::Texture $self->{layout} 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1553
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5);
1557
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1258 }; 1563 };
1259 1564
1260 glEnable GL_BLEND;
1261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1262 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1264 1567
1568 if ($tex->{format} == GL_ALPHA) {
1265 glColor @{$self->{fg}}; 1569 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}); 1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1280 1574
1281 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1282 glDisable GL_BLEND;
1283} 1576}
1284 1577
1285############################################################################# 1578#############################################################################
1286 1579
1287package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
… …
1292 1585
1293sub new { 1586sub new {
1294 my $class = shift; 1587 my $class = shift;
1295 1588
1296 $class->SUPER::new ( 1589 $class->SUPER::new (
1297 fg => [1, 1, 1], 1590 fg => [1, 1, 1],
1298 bg => [0, 0, 0, 0.2], 1591 bg => [0, 0, 0, 0.2],
1299 active_bg => [1, 1, 1, 0.5], 1592 active_bg => [1, 1, 1, 0.5],
1300 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1301 can_hover => 1, 1594 can_hover => 1,
1302 can_focus => 1, 1595 can_focus => 1,
1303 valign => 0, 1596 valign => 0,
1304 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1305 @_ 1599 @_
1306 ) 1600 )
1307} 1601}
1308 1602
1309sub _set_text { 1603sub _set_text {
… …
1319 $self->{text} = $text; 1613 $self->{text} = $text;
1320 1614
1321 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1322 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1323 1617
1324 $self->emit (changed => $self->{text}); 1618 $self->_emit (changed => $self->{text});
1619}
1620
1621sub set_text {
1622 my ($self, $text) = @_;
1623
1624 $self->{cursor} = length $text;
1625 $self->_set_text ($text);
1626
1627 $self->realloc;
1325} 1628}
1326 1629
1327sub get_text { 1630sub get_text {
1328 $_[0]{text} 1631 $_[0]{text}
1329} 1632}
… …
1332 my ($self) = @_; 1635 my ($self) = @_;
1333 1636
1334 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1335 1638
1336 ($w + 1, $h) # add 1 for cursor 1639 ($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} 1640}
1352 1641
1353sub key_down { 1642sub key_down {
1354 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1355 1644
… …
1357 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1358 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1359 1648
1360 my $text = $self->get_text; 1649 my $text = $self->get_text;
1361 1650
1362 if ($sym == 8) { 1651 if ($uni == 8) {
1363 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1364 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1365 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1366 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1367 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1368 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1369 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1370 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1371 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1372 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1373 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1374 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1375 $self->emit ('escape'); 1664 $self->_emit ('escape');
1376 } elsif ($uni) { 1665 } elsif ($uni) {
1377 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1378 } 1667 }
1379 1668
1380 $self->_set_text ($text); 1669 $self->_set_text ($text);
1381 $self->update; 1670
1671 $self->realloc;
1382} 1672}
1383 1673
1384sub focus_in { 1674sub focus_in {
1385 my ($self) = @_; 1675 my ($self) = @_;
1386 1676
… …
1462 my ($self, $ev) = @_; 1752 my ($self, $ev) = @_;
1463 1753
1464 my $sym = $ev->{sym}; 1754 my $sym = $ev->{sym};
1465 1755
1466 if ($sym == 13) { 1756 if ($sym == 13) {
1757 unshift @{$self->{history}},
1758 my $txt = $self->get_text;
1759 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = '';
1467 $self->emit (activate => $self->get_text); 1761 $self->_emit (activate => $txt);
1468 $self->update; 1762 $self->update;
1763
1764 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text;
1767 }
1768 if (@{$self->{history} || []} > 0) {
1769 $self->{history_pointer}++;
1770 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1771 $self->{history_pointer} = @{$self->{history} || []} - 1;
1772 }
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 }
1775
1776 } elsif ($sym == CFClient::SDLK_DOWN) {
1777 $self->{history_pointer}--;
1778 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1779
1780 if ($self->{history_pointer} >= 0) {
1781 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1782 } else {
1783 $self->set_text ($self->{history_saveback});
1784 }
1469 1785
1470 } else { 1786 } else {
1471 $self->SUPER::key_down ($ev); 1787 $self->SUPER::key_down ($ev);
1472 } 1788 }
1473 1789
… …
1487 1803
1488sub new { 1804sub new {
1489 my $class = shift; 1805 my $class = shift;
1490 1806
1491 $class->SUPER::new ( 1807 $class->SUPER::new (
1492 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1493 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1494 bg => [1, 1, 1, 0.2],
1495 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1496 can_hover => 1, 1812 can_hover => 1,
1497 align => 0, 1813 align => 0,
1498 valign => 0, 1814 valign => 0,
1499 can_events => 1, 1815 can_events => 1,
1500 @_ 1816 @_
1501 ) 1817 )
1502} 1818}
1503 1819
1820sub activate { }
1821
1504sub button_up { 1822sub button_up {
1505 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1506 1824
1825 $self->emit ("activate")
1507 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1508 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1509 $self->emit ("activate");
1510 }
1511} 1828}
1512 1829
1513sub _draw { 1830sub _draw {
1514 my ($self) = @_; 1831 my ($self) = @_;
1515 1832
… …
1517 1834
1518 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1519 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1520 } 1837 }
1521 1838
1522 glEnable GL_BLEND;
1523 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1524 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1526 glColor 0, 0, 0, 1; 1841 glColor 0, 0, 0, 1;
1527 1842
1528 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1529 1844
1530 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1531 glDisable GL_BLEND;
1532 1846
1533 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1534} 1848}
1535 1849
1536############################################################################# 1850#############################################################################
… …
1547 1861
1548sub new { 1862sub new {
1549 my $class = shift; 1863 my $class = shift;
1550 1864
1551 $class->SUPER::new ( 1865 $class->SUPER::new (
1552 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1553 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1554 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1870 bg => [0, 0, 0, 0.2],
1871 active_bg => [1, 1, 1, 0.5],
1555 state => 0, 1872 state => 0,
1556 can_hover => 1, 1873 can_hover => 1,
1557 @_ 1874 @_
1558 ) 1875 )
1559} 1876}
1560 1877
1561sub size_request { 1878sub size_request {
1562 my ($self) = @_; 1879 my ($self) = @_;
1563 1880
1564 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1565} 1882}
1566 1883
1567sub button_down { 1884sub button_down {
1568 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1569 1886
1570 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1571 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1572 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1573 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1574 } 1891 }
1575} 1892}
1576 1893
1577sub _draw { 1894sub _draw {
1578 my ($self) = @_; 1895 my ($self) = @_;
1579 1896
1580 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1581 1898
1582 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1583 1900
1584 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1585 1904
1586 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1587 1906
1588 glEnable GL_BLEND; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1589 glEnable GL_TEXTURE_2D; 1909 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); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1595
1596 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1597 glDisable GL_BLEND;
1598} 1912}
1599 1913
1600############################################################################# 1914#############################################################################
1601 1915
1602package CFClient::UI::Image; 1916package CFClient::UI::Image;
… …
1645 glTranslate 0, -$self->{w}, 0; 1959 glTranslate 0, -$self->{w}, 0;
1646 1960
1647 ($w, $h) = ($h, $w); 1961 ($w, $h) = ($h, $w);
1648 } 1962 }
1649 1963
1650 glEnable GL_BLEND;
1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654 1966
1655 $tex->draw_quad (0, 0, $w, $h); 1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1656 1968
1657 glDisable GL_BLEND;
1658 glDisable GL_TEXTURE_2D; 1969 glDisable GL_TEXTURE_2D;
1659} 1970}
1660 1971
1661############################################################################# 1972#############################################################################
1662 1973
… …
1710} 2021}
1711 2022
1712sub set_max { 2023sub set_max {
1713 my ($self, $max) = @_; 2024 my ($self, $max) = @_;
1714 2025
2026 return if $self->{max_val} == $max;
2027
1715 $self->{max_val} = $max; 2028 $self->{max_val} = $max;
2029 $self->update;
1716} 2030}
1717 2031
1718sub set_value { 2032sub set_value {
1719 my ($self, $val, $max) = @_; 2033 my ($self, $val, $max) = @_;
1720 2034
1721 $self->set_max ($max) 2035 $self->set_max ($max)
1722 if defined $max; 2036 if defined $max;
1723 2037
1724 $max = $self->{max_val}; 2038 return if $self->{val} == $val;
2039
1725 $self->{val} = $val; 2040 $self->{val} = $val;
1726
1727 $self->update; 2041 $self->update;
1728} 2042}
1729 2043
1730sub _draw { 2044sub _draw {
1731 my ($self) = @_; 2045 my ($self) = @_;
… …
1794 2108
1795sub new { 2109sub new {
1796 my ($class, %arg) = @_; 2110 my ($class, %arg) = @_;
1797 2111
1798 my $self = $class->SUPER::new ( 2112 my $self = $class->SUPER::new (
1799 tooltip => $arg{type}, 2113 tooltip => $arg{type},
2114 can_hover => 1,
1800 can_events => 1, 2115 can_events => 1,
1801 can_hover => 1,
1802 %arg, 2116 %arg,
1803 ); 2117 );
1804 2118
1805 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1806 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2120 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1814 2128
1815 $self->{value}->set_fontsize ($fsize); 2129 $self->{value}->set_fontsize ($fsize);
1816 $self->{max} ->set_fontsize ($fsize); 2130 $self->{max} ->set_fontsize ($fsize);
1817} 2131}
1818 2132
2133sub set_max {
2134 my ($self, $max) = @_;
2135
2136 $self->{gauge}->set_max ($max);
2137 $self->{max}->set_text ($max);
2138}
2139
1819sub set_value { 2140sub set_value {
1820 my ($self, $val, $max) = @_; 2141 my ($self, $val, $max) = @_;
1821 2142
1822 $self->set_max ($max) 2143 $self->set_max ($max)
1823 if defined $max; 2144 if defined $max;
1824 2145
1825 $self->{gauge}->set_value ($val, $max); 2146 $self->{gauge}->set_value ($val, $max);
1826 $self->{value}->set_text ($val); 2147 $self->{value}->set_text ($val);
1827}
1828
1829sub set_max {
1830 my ($self, $max) = @_;
1831
1832 $self->{gauge}->set_max ($max);
1833 $self->{max}->set_text ($max);
1834} 2148}
1835 2149
1836############################################################################# 2150#############################################################################
1837 2151
1838package CFClient::UI::Slider; 2152package CFClient::UI::Slider;
… …
1848 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1849 2163
1850sub new { 2164sub new {
1851 my $class = shift; 2165 my $class = shift;
1852 2166
1853 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
1854 2168
1855 # TODO: 0-width page 2169 # TODO: 0-width page
1856 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
1857 # TODO: calculations are off 2171 # TODO: calculations are off
1858 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
1859 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
1860 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2175 bg => [0, 0, 0, 0.2],
2176 active_bg => [1, 1, 1, 0.5],
1861 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
1862 req_w => 20, 2178 min_w => $::WIDTH / 80,
1863 req_h => 20, 2179 min_h => $::WIDTH / 80,
1864 vertical => 0, 2180 vertical => 0,
1865 can_hover => 1, 2181 can_hover => 1,
1866 inner_pad => 5, 2182 inner_pad => 0.02,
1867 @_ 2183 @_
1868 ); 2184 );
1869 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
1870 $self 2189 $self
1871} 2190}
1872 2191
2192sub changed { }
2193
2194sub set_range {
2195 my ($self, $range) = @_;
2196
2197 ($range, $self->{range}) = ($self->{range}, $range);
2198
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}";
2201}
2202
2203sub set_value {
2204 my ($self, $value) = @_;
2205
2206 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2207
2208 $hi = $lo + 1 if $hi <= $lo;
2209
2210 $page = $hi - $lo if $page > $hi - $lo;
2211
2212 $value = $lo if $value < $lo;
2213 $value = $hi - $page if $value > $hi - $page;
2214
2215 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2216 if $unit;
2217
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219
2220 if ($value != $old_value) {
2221 $self->_emit (changed => $value);
2222 $self->update;
2223 }
2224}
2225
1873sub size_request { 2226sub size_request {
1874 my ($self) = @_; 2227 my ($self) = @_;
1875 2228
1876 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
1877 my $h = $self->{req_h};
1878
1879 $self->{vertical} ? ($h, $w) : ($w, $h)
1880} 2230}
1881 2231
1882sub button_down { 2232sub button_down {
1883 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1884 2234
1885 $self->SUPER::button_down ($ev, $x, $y); 2235 $self->SUPER::button_down ($ev, $x, $y);
2236
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238
1886 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
1887} 2240}
1888 2241
1889sub mouse_motion { 2242sub mouse_motion {
1890 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1891 2244
1892 if ($GRAB == $self) { 2245 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247
2248 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2253 }
2254}
2255
2256sub update {
2257 my ($self) = @_;
2258
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2260 $self->set_value ($self->{range}[0]);
2261
1893 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
1894 2264
1895 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1896 2266
1897 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1898 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1899 2269
1900 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
1901 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
1902 $x = $lo if $x < $lo;
1903 $x = $hi - $page if $x > $hi - $page;
1904 $self->{range}[0] = $x;
1905 2272
1906 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
1907 $self->update; 2274 $self->{knob_w} = $knob_w;
1908 } 2275 });
1909}
1910 2276
1911# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
1912# so that the handle doesn't leave the texture. This calculation isn't 100%
1913# correct propably, but it does the job for now
1914sub _calc_inner_pad_px {
1915 my ($self, $w) = @_;
1916 ($w / 100) * $self->{inner_pad} # % to pixels
1917} 2278}
1918 2279
1919sub _draw { 2280sub _draw {
1920 my ($self) = @_; 2281 my ($self) = @_;
1921 2282
1922 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
1923 2284
1924 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
1925 2286
1926 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
1927 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
1928 2289
2290 glTranslate 1, 0, 0;
1929 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
1930 glTranslate 0, -$self->{w}, 0;
1931
1932 ($w, $h) = ($h, $w);
1933 } 2292 }
1934 2293
1935 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1936 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1937 2296
1938 my ($value, $lo, $hi, $page) = @{$self->{range}};
1939
1940 $hi = $value + 1 if $lo == $hi;
1941
1942 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1943 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1944
1945 $page = int $page * $inner_w / ($hi - $lo);
1946 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1947
1948 $w -= $page;
1949 $page &= ~1;
1950 glTranslate $page * 0.5, 0, 0;
1951 $page ||= 2;
1952
1953 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1954 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1955
1956 glEnable GL_BLEND;
1957 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1958 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
1959 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1960 2299
1961 # draw background 2300 # draw background
1962 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1963 2302
1964 # draw handle 2303 # draw handle
1965 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2304 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1966 2305
1967 glDisable GL_BLEND;
1968 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
1969} 2307}
2308
2309#############################################################################
2310
2311package CFClient::UI::ValSlider;
2312
2313our @ISA = CFClient::UI::HBox::;
2314
2315sub new {
2316 my ($class, %arg) = @_;
2317
2318 my $range = delete $arg{range};
2319
2320 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift },
2324 from_value => sub { shift },
2325 %arg,
2326 );
2327
2328 $self->{slider}->connect (changed => sub {
2329 my ($self, $value) = @_;
2330 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2331 $self->{parent}->emit (changed => $value);
2332 });
2333
2334# $self->{entry}->connect (changed => sub {
2335# my ($self, $value) = @_;
2336# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2337# $self->{parent}->emit (changed => $value);
2338# });
2339
2340 $self->add ($self->{slider}, $self->{entry});
2341
2342 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2343
2344 $self
2345}
2346
2347sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) }
1970 2349
1971############################################################################# 2350#############################################################################
1972 2351
1973package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
1974 2353
… …
1978 2357
1979sub new { 2358sub new {
1980 my $class = shift; 2359 my $class = shift;
1981 2360
1982 my $self = $class->SUPER::new ( 2361 my $self = $class->SUPER::new (
1983 fontsize => 1, 2362 fontsize => 1,
2363 can_events => 0,
1984 #font => default_font 2364 #font => default_font
1985 @_, 2365 @_,
1986 2366
1987 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
1988 par => [], 2368 par => [],
1989 height => 0, 2369 height => 0,
1990 children => [ 2370 children => [
1991 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
1992 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
1993 ], 2373 ],
1994 ); 2374 );
1995 2375
1996 $self->{children}[1]->connect (changed => sub { 2376 $self->{children}[1]->connect (changed => sub { $self->update });
1997 $self->update;
1998 });
1999 2377
2000 $self 2378 $self
2001} 2379}
2002 2380
2003sub set_fontsize { 2381sub set_fontsize {
2004 my ($self, $fontsize) = @_; 2382 my ($self, $fontsize) = @_;
2005 2383
2006 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2007 $self->reflow; 2385 $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} 2386}
2028 2387
2029sub size_allocate { 2388sub size_allocate {
2030 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2031 2390
… …
2036 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2037 2396
2038 $self->reflow; 2397 $self->reflow;
2039} 2398}
2040 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
2041sub add_paragraph { 2434sub add_paragraph {
2042 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2043 2436
2044 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2045 2438 my ($w, $h) = $self->text_size ($line);
2046 my $height = $self->text_height ($text);
2047
2048 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2049 2442
2050 push @{$self->{par}}, [$height, $color, $text];
2051
2052 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2053 $self->{children}[1]->update;
2054} 2444}
2055 2445
2056sub update { 2446sub update {
2057 my ($self) = @_; 2447 my ($self) = @_;
2058 2448
… …
2060 2450
2061 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2062 2452
2063 delete $self->{texture}; 2453 delete $self->{texture};
2064 2454
2065 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2066 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2067 my $height = 0; 2459 my $height = 0;
2068 2460
2069 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2070 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2071 2476
2072 $self->{height} = $height; 2477 $self->{height} = $height;
2073 2478
2074 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2075 2480
2076 delete $self->{texture}; 2481 delete $self->{texture};
2077 } 2482 }
2078 2483
2079 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2080 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2081 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2082 2487
2488 my $top = int $self->{children}[1]{range}[0];
2489
2490 my $y0 = $top;
2491 my $y1 = $top + $H;
2492
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2083 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2084 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 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 2502
2099 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2100 my $h = $par->[0]; 2504 my $h = $par->[1];
2101 2505
2102 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2103 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2104 2510
2105 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2106 my ($W, $H) = $layout->size; 2512
2107 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2108 } 2515 }
2109 2516
2110 $y += $h; 2517 $y += $h;
2111 } 2518 }
2112 2519
2113 glDisable GL_TEXTURE_2D;
2114 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2115 }; 2521 };
2116 }); 2522 });
2117} 2523}
2118 2524
2119sub _draw { 2525sub _draw {
2120 my ($self) = @_; 2526 my ($self) = @_;
2121 2527
2122 if ($self->{texture}) {
2123 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1;
2125 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2126 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2127 }
2128 2533
2129 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2130 2535
2131} 2536}
2132 2537
… …
2180 2585
2181sub new { 2586sub new {
2182 my $class = shift; 2587 my $class = shift;
2183 2588
2184 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2185 state => 0, 2590 state => 0,
2186 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2187 can_events => 1,
2188 @_ 2592 @_
2189 ); 2593 );
2190 2594
2191 if ($self->{state}) {
2192 $self->{state} = 0;
2193 $self->toggle_flopper;
2194 }
2195
2196 $self 2595 $self
2197} 2596}
2198 2597
2199sub toggle_flopper { 2598sub toggle_flopper {
2200 my ($self) = @_; 2599 my ($self) = @_;
2201 2600
2202 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2203 if ($self->{state} = !$self->{state}) {
2204 $CFClient::UI::ROOT->add ($self->{other});
2205 $self->{other}->move ($self->coord2global (0, $self->{h}));
2206 $self->emit ("open");
2207 } else {
2208 $CFClient::UI::ROOT->remove ($self->{other});
2209 $self->emit ("close");
2210 }
2211
2212 $self->emit (changed => $self->{state});
2213} 2602}
2214 2603
2215############################################################################# 2604#############################################################################
2216 2605
2217package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2227 @_, 2616 @_,
2228 can_events => 0, 2617 can_events => 0,
2229 ) 2618 )
2230} 2619}
2231 2620
2232sub set_markup { 2621sub set_tooltip_from {
2233 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2234 2623
2235 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 my $tooltip = $widget->{tooltip};
2236 $self->{label}->set_markup ($text); 2625
2237 $self->add ($self->{label}); 2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2633 $self->add (new CFClient::UI::Label
2634 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8,
2637 fg => [0, 0, 0, 1],
2638 ellipsise => 0,
2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
2640 );
2238} 2641}
2239 2642
2240sub size_request { 2643sub size_request {
2241 my ($self) = @_; 2644 my ($self) = @_;
2242
2243 $self->child->set_max_size ($::WIDTH * 0.3);
2244 2645
2245 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2246 2647
2247 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2248} 2649}
… …
2251 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2252 2653
2253 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2254} 2655}
2255 2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2673}
2674
2256sub _draw { 2675sub _draw {
2257 my ($self) = @_; 2676 my ($self) = @_;
2258 2677
2259 glPushMatrix;
2260 glTranslate 0.375, 0.375; 2678 glTranslate 0.375, 0.375;
2261 2679
2262 my ($w, $h) = @$self{qw(w h)}; 2680 my ($w, $h) = @$self{qw(w h)};
2263 2681
2264 glColor 1, 0.8, 0.4; 2682 glColor 1, 0.8, 0.4;
… …
2275 glVertex 0 , $h; 2693 glVertex 0 , $h;
2276 glVertex $w, $h; 2694 glVertex $w, $h;
2277 glVertex $w, 0; 2695 glVertex $w, 0;
2278 glEnd; 2696 glEnd;
2279 2697
2280 glPopMatrix; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2281 2699
2282 glTranslate 2, 2;
2283 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2284} 2701}
2285 2702
2286############################################################################# 2703#############################################################################
2287 2704
… …
2292use CFClient::OpenGL; 2709use CFClient::OpenGL;
2293 2710
2294sub new { 2711sub new {
2295 my $class = shift; 2712 my $class = shift;
2296 2713
2297 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2298 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2299 @_, 2717 @_,
2300 ) 2718 );
2719
2720 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self);
2722
2723 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1,
2726 interval => $self->{animspeed},
2727 cb => sub {
2728 ++$widget->{frame};
2729 $widget->update;
2730 },
2731 );
2732 }
2733
2734 $self
2301} 2735}
2302 2736
2303sub size_request { 2737sub size_request {
2304 (32, 8) 2738 (32, 8)
2305} 2739}
2306 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2307sub draw { 2749sub _draw {
2308 my ($self) = @_; 2750 my ($self) = @_;
2309 2751
2752 return unless $::CONN;
2753
2754 my $face;
2755
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}];
2758
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762
2310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2311 2764
2312 if ($tex) { 2765 if ($tex) {
2313 glEnable GL_BLEND;
2314 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2315 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2317 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2318 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2319 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2320 glDisable GL_BLEND;
2321 } 2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2322} 2781}
2323 2782
2324############################################################################# 2783#############################################################################
2325 2784
2785package CFClient::UI::Inventory;
2786
2787our @ISA = CFClient::UI::ScrolledWindow::;
2788
2789sub new {
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824
2825#############################################################################
2826
2827package CFClient::UI::Menu;
2828
2829our @ISA = CFClient::UI::FancyFrame::;
2830
2831use CFClient::OpenGL;
2832
2833sub new {
2834 my $class = shift;
2835
2836 my $self = $class->SUPER::new (
2837 items => [],
2838 z => 100,
2839 @_,
2840 );
2841
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843
2844 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item;
2846
2847 # handle various types of items, only text for now
2848 if (!ref $widget) {
2849 $widget = new CFClient::UI::Label
2850 can_hover => 1,
2851 can_events => 1,
2852 text => $widget;
2853 }
2854
2855 $self->{item}{$widget} = $item;
2856
2857 $self->{vbox}->add ($widget);
2858 }
2859
2860 $self
2861}
2862
2863# popup given the event (must be a mouse button down event currently)
2864sub popup {
2865 my ($self, $ev) = @_;
2866
2867 $self->_emit ("popdown");
2868
2869 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self;
2871 $self->{button} = $ev->{button};
2872
2873 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875}
2876
2877sub mouse_motion {
2878 my ($self, $ev, $x, $y) = @_;
2879
2880 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER};
2883}
2884
2885sub button_up {
2886 my ($self, $ev, $x, $y) = @_;
2887
2888 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB;
2890 $self->hide;
2891
2892 $self->_emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover};
2894 }
2895}
2896
2897#############################################################################
2898
2899package CFClient::UI::Statusbox;
2900
2901our @ISA = CFClient::UI::VBox::;
2902
2903sub new {
2904 my $class = shift;
2905
2906 $class->SUPER::new (
2907 fontsize => 0.8,
2908 @_,
2909 )
2910}
2911
2912sub reorder {
2913 my ($self) = @_;
2914 my $NOW = time;
2915
2916 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 }
2919
2920 my @widgets;
2921
2922 my @items = sort {
2923 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} };
2926
2927 my $count = 10 + 1;
2928 for my $item (@items) {
2929 last unless --$count;
2930
2931 push @widgets, $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text};
2936
2937 for ($short) {
2938 s/^\s+//;
2939 s/\s+/ /g;
2940 }
2941
2942 new CFClient::UI::Label
2943 markup => $short,
2944 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg},
2950 can_events => 1,
2951 can_hover => 1
2952 };
2953 }
2954
2955 $self->clear;
2956 $self->SUPER::add (reverse @widgets);
2957}
2958
2959sub add {
2960 my ($self, $text, %arg) = @_;
2961
2962 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2966
2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2968
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970
2971 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) {
2973 $item->{count}++;
2974 } else {
2975 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text;
2977 }
2978 $item->{id} = ++$self->{id};
2979 $item->{timeout} = $timeout;
2980 delete $item->{label};
2981 } else {
2982 $self->{item}{$group} = {
2983 id => ++$self->{id},
2984 text => $text,
2985 timeout => $timeout,
2986 tooltip => $text,
2987 fg => [0.8, 0.8, 0.8, 0.8],
2988 pri => 0,
2989 count => 1,
2990 %arg,
2991 };
2992 }
2993
2994 $self->reorder;
2995}
2996
2997sub reconfigure {
2998 my ($self) = @_;
2999
3000 delete $_->{label}
3001 for values %{ $self->{item} || {} };
3002
3003 $self->reorder;
3004 $self->SUPER::reconfigure;
3005}
3006
3007#############################################################################
3008
2326package CFClient::UI::Root; 3009package CFClient::UI::Root;
2327 3010
2328our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2329 3012
2330use CFClient::OpenGL; 3013use CFClient::OpenGL;
2331 3014
2332sub check_size { 3015sub new {
2333 my ($self) = @_; 3016 my $class = shift;
2334 3017
2335 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3018 my $self = $class->SUPER::new (
3019 visible => 1,
3020 @_,
3021 );
3022
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self
2336} 3026}
2337 3027
2338sub size_request { 3028sub size_request {
2339 ($::WIDTH, $::HEIGHT) 3029 my ($self) = @_;
2340}
2341 3030
2342sub configure { 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
3046}
3047
3048sub size_allocate {
2343 my ($self, $x, $y, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2344 3050
2345 $self->SUPER::configure ($x, $y, $w, $h);
2346
2347 for my $child (@{$self->{children}}) { 3051 for my $child ($self->children) {
2348 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2349 3053
2350 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3054 $X = $child->{force_x} if exists $child->{force_x};
2351 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3055 $Y = $child->{force_y} if exists $child->{force_y};
3056
3057 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h};
3059
2352 $child->configure ($X, $Y, $W,$H); 3060 $child->configure ($X, $Y, $W, $H);
2353 } 3061 }
2354} 3062}
2355 3063
2356sub _topleft { 3064sub coord2local {
2357 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2358 3066
2359 ($x, $y) 3067 ($x, $y)
2360} 3068}
2361 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2362sub update { 3076sub update {
2363 my ($self) = @_; 3077 my ($self) = @_;
2364 3078
2365 $self->check_size; 3079 $::WANT_REFRESH++;
2366 ::refresh ();
2367} 3080}
2368 3081
2369sub add { 3082sub add {
2370 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2371 3084
2372 # integerize window positions 3085 $_->{is_toplevel} = 1
2373 $child->{x} = int $child->{x}; 3086 for @children;
2374 $child->{y} = int $child->{y};
2375 3087
2376 $self->SUPER::add ($child); 3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
2377} 3104}
2378 3105
2379sub on_refresh { 3106sub on_refresh {
2380 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2381 3108
2382 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2383} 3110}
2384 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2385sub draw { 3118sub draw {
2386 my ($self) = @_; 3119 my ($self) = @_;
2387 3120
2388 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2389 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2390 } 3124 }
3125
3126 if ($self->{realloc}) {
3127 my @queue;
3128
3129 while () {
3130 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach
3132
3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3137 }
3138
3139 my $widget = pop @queue || last;
3140
3141 $widget->{visible} or last; # do not resize invisible widgets
3142
3143 my ($w, $h) = $widget->size_request;
3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152 || delete $widget->{force_realloc}) {
3153 $widget->{req_w} = $w;
3154 $widget->{req_h} = $h;
3155
3156 $self->{size_alloc}{$widget+0} = $widget;
3157
3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3167 }
3168 }
3169
3170 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178
3179 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0;
3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h);
3190 }
3191 }
3192 }
3193
3194 while ($self->{post_alloc_hook}) {
3195 $_->()
3196 for values %{delete $self->{post_alloc_hook}};
3197 }
3198
2391 3199
2392 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2393 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2394 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2395 3203
2396 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2397 glLoadIdentity; 3205 glLoadIdentity;
2398 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2399 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2400 glLoadIdentity; 3208 glLoadIdentity;
2401 3209
2402 $self->_draw; 3210 $self->_draw;
2403} 3211}
2404 3212
2405############################################################################# 3213#############################################################################
2406 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315# if $commit is true, the binding will be set after the user entered a key combo
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Button
3392 text => "delete",
3393 tooltip => "Deletes the action from the record",
3394 on_activate => sub {
3395 $self->{cmdbox}->remove ($hb);
3396 $cmds->[$i] = undef;
3397 });
3398
3399 $hb->add (new CFClient::UI::Label text => $_);
3400
3401 $idx++
3402 }
3403}
3404
3405
3406#############################################################################
3407
3408package CFClient::UI::SpellList;
3409
3410our @ISA = CFClient::UI::FancyFrame::;
3411
3412sub new {
3413 my $class = shift;
3414
3415 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3416
3417 $self->add (new CFClient::UI::ScrolledWindow
3418 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3419
3420 $self;
3421}
3422
3423# XXX: Do sorting? Argl...
3424sub add_spell {
3425 my ($self, $spell) = @_;
3426 $self->{spells}->{$spell->{name}} = $spell;
3427
3428 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3429 face => $spell->{face},
3430 can_hover => 1,
3431 can_events => 1,
3432 tooltip => $spell->{message});
3433
3434 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3435 text => $spell->{name},
3436 can_hover => 1,
3437 can_events => 1,
3438 tooltip => $spell->{message},
3439 expand => 1);
3440 $self->{spellbox}->add (2, $self->{tbl_idx}++, new CFClient::UI::Button
3441 text => "bind to key",
3442 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3443}
3444
3445sub rebuild_spell_list {
3446 my ($self) = @_;
3447 $self->{tbl_idx} = 0;
3448 $self->add_spell ($_) for values %{$self->{spells}};
3449}
3450
3451sub remove_spell {
3452 my ($self, $spell) = @_;
3453 delete $self->{spells}->{$spell->{name}};
3454 $self->rebuild_spell_list;
3455}
3456
3457#############################################################################
3458
2407package CFClient::UI; 3459package CFClient::UI;
2408 3460
2409$ROOT = new CFClient::UI::Root; 3461$ROOT = new CFClient::UI::Root;
2410$TOOLTIP = new CFClient::UI::Tooltip; 3462$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2411 3463
24121 34641
2413 3465

Diff Legend

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