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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC

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

Diff Legend

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