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

Diff Legend

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