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

Diff Legend

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