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.184 by root, Wed May 3 19:56:05 2006 UTC vs.
Revision 1.264 by root, Thu Jun 1 02:58:30 2006 UTC

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

Diff Legend

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