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

Diff Legend

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