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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 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 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 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
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
147 $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.]+$/;
148 $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};
149 $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};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
155 } 189 }
156
157 $widget->reconfigure;
158 } 190 }
191
192 reconfigure_widgets;
159} 193}
160 194
161############################################################################# 195#############################################################################
162 196
163package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
168 202
169sub new { 203sub new {
170 my $class = shift; 204 my $class = shift;
171 205
172 my $self = bless { 206 my $self = bless {
173 x => 0, 207 x => "center",
174 y => 0, 208 y => "center",
175 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
176 can_events => 1, 212 can_events => 1,
177 @_ 213 @_
178 }, $class; 214 }, $class;
179 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
180 for (keys %$self) { 218 for (keys %$self) {
181 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
183 } 221 }
184 } 222 }
185 223
186 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 }
187 235
188 $self 236 $self
189} 237}
190 238
191sub destroy { 239sub destroy {
… …
201 return if $self->{parent}; 249 return if $self->{parent};
202 250
203 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
204} 252}
205 253
206sub hide { 254sub set_visible {
207 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};
208 278
209 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
211 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
212 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
213 if $self->{parent}; 313 if $self->{parent};
214} 314}
215 315
216sub move { 316sub move_abs {
217 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
218 318
219 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
220 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
221 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
222 322
223 $self->update; 323 $self->update;
224} 324}
225 325
226sub set_size { 326sub set_size {
227 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
228 328
229 $self->{user_w} = $w; 329 $self->{force_w} = $w;
230 $self->{user_h} = $h; 330 $self->{force_h} = $h;
231 331
232 $self->check_size; 332 $self->realloc;
233} 333}
234 334
235sub size_request { 335sub size_request {
236 require Carp; 336 require Carp;
237 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
239 339
240sub configure { 340sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
242 342
243 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
246 348
247 # use alignment to adjust x, y 349 # use alignment to adjust x, y
248 350
249 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 353 }
254 354
255 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 356 $self->{x} = $x;
257 $self->{y} = $y; 357 $self->{y} = $y;
258 $self->update; 358 $self->update;
259 } 359 }
260 360
261 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $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;
263 } 368 }
264} 369}
265 370
266sub size_allocate { 371sub size_allocate {
267 # nothing to be done 372 # nothing to be done
268} 373}
269 374
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children { 375sub children {
278} 376}
279 377
280sub set_max_size { 378sub set_max_size {
281 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
… …
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
285} 383}
286 384
287sub set_tooltip { 385sub set_tooltip {
288 my ($self, $tooltip) = @_; 386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
289 392
290 $self->{tooltip} = $tooltip; 393 $self->{tooltip} = $tooltip;
291 394
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 396 delete $CFClient::UI::TOOLTIP->{owner};
… …
315 return if $FOCUS == $self; 418 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
317 420
318 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
319 422
320 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
321 424
322 $focus->update if $focus; 425 $focus->update if $focus;
323 $FOCUS->update; 426 $FOCUS->update;
324} 427}
325 428
… …
328 431
329 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
330 433
331 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
332 435
333 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
334 437
335 $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;
336} 442}
337 443
338sub mouse_motion { } 444sub mouse_motion { }
339sub button_up { } 445sub button_up { }
340sub key_down { } 446sub key_down { }
341sub key_up { } 447sub key_up { }
342 448
343sub button_down { 449sub button_down {
344 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
345 451
346 $self->focus_in; 452 $self->focus_in;
347} 453}
348 454
349sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
350sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
351sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
352sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
353sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
354 528
355sub draw { 529sub draw {
356 my ($self) = @_; 530 my ($self) = @_;
357 531
358 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539
540 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
359 543
360 glPushMatrix; 544 glPushMatrix;
361 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
362 $self->_draw; 546 $self->_draw;
363 glPopMatrix; 547 glPopMatrix;
… …
375 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
376 glEnd; 560 glEnd;
377 glDisable GL_BLEND; 561 glDisable GL_BLEND;
378 } 562 }
379 563
380 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
381 glPushMatrix; 565 glPushMatrix;
382 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 569 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
387 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
388 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
389 glEnd; 573 glEnd;
390 glPopMatrix; 574 glPopMatrix;
391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 575 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392 } 576 }
393} 577}
394 578
395sub _draw { 579sub _draw {
396 my ($self) = @_; 580 my ($self) = @_;
397 581
398 warn "no draw defined for $self\n"; 582 warn "no draw defined for $self\n";
399}
400
401sub find_widget {
402 my ($self, $x, $y) = @_;
403
404 return () unless $self->{can_events};
405
406 return $self
407 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
408 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
409
410 ()
411}
412
413sub set_parent {
414 my ($self, $parent) = @_;
415
416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
421}
422
423sub check_size {
424 my ($self, $forced) = @_;
425
426 $self->{force_alloc} = 1 if $forced;
427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428}
429
430sub update {
431 my ($self) = @_;
432
433 $self->{parent}->update
434 if $self->{parent};
435}
436
437sub connect {
438 my ($self, $signal, $cb) = @_;
439
440 push @{ $self->{signal_cb}{$signal} }, $cb;
441}
442
443sub emit {
444 my ($self, $signal, @args) = @_;
445
446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
447} 583}
448 584
449sub DESTROY { 585sub DESTROY {
450 my ($self) = @_; 586 my ($self) = @_;
451 587
… …
509 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
510 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
511} 647}
512 648
513sub size_request { 649sub size_request {
514 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
515} 653}
516 654
517sub draw { } 655sub draw { }
518 656
519############################################################################# 657#############################################################################
… …
548 $self->{children} = [ 686 $self->{children} = [
549 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
550 @{$self->{children}}, @widgets 688 @{$self->{children}}, @widgets
551 ]; 689 ];
552 690
553 $self->check_size (1); 691 $self->realloc;
554 $self->update;
555} 692}
556 693
557sub children { 694sub children {
558 @{ $_[0]{children} } 695 @{ $_[0]{children} }
559} 696}
… …
564 delete $child->{parent}; 701 delete $child->{parent};
565 $child->hide; 702 $child->hide;
566 703
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 705
569 $self->check_size; 706 $self->realloc;
570 $self->update;
571} 707}
572 708
573sub clear { 709sub clear {
574 my ($self) = @_; 710 my ($self) = @_;
575 711
… …
579 for (@$children) { 715 for (@$children) {
580 delete $_->{parent}; 716 delete $_->{parent};
581 $_->hide; 717 $_->hide;
582 } 718 }
583 719
584 $self->check_size; 720 $self->realloc;
585 $self->update;
586} 721}
587 722
588sub find_widget { 723sub find_widget {
589 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
590 725
… …
677 $self->SUPER::size_allocate ($w, $h); 812 $self->SUPER::size_allocate ($w, $h);
678 $self->update; 813 $self->update;
679} 814}
680 815
681sub _render { 816sub _render {
817 my ($self) = @_;
818
682 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
683} 820}
684 821
685sub render_child { 822sub render_child {
686 my ($self) = @_; 823 my ($self) = @_;
687 824
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 825 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
691 828
829 {
830 package CFClient::UI::Base;
831
832 ($draw_x, $draw_y, $draw_w, $draw_h) =
833 (0, 0, $self->{w}, $self->{h});
834 }
835
692 $self->_render; 836 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 }; 837 };
701} 838}
702 839
703sub _draw { 840sub _draw {
704 my ($self) = @_; 841 my ($self) = @_;
705 842
706 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
707 844
708 my $tex = $self->{texture} 845 my $tex = $self->{texture}
709 or return; 846 or return;
710 847
711 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 850 glColor 1, 1, 1, 1;
714 851
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 853
717 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
718} 855}
… …
721 858
722package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
723 860
724our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
725 862
863sub new {
864 my $class = shift;
865
866 $class->SUPER::new (
867 scroll_x => 0,
868 scroll_y => 1,
869 @_,
870 )
871}
872
726sub size_request { 873sub size_request {
727 my ($self) = @_; 874 my ($self) = @_;
728 875
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 877
732 @$self{qw(child_w child_h)} 878 $w = 10 if $self->{scroll_x};
879 $h = 10 if $self->{scroll_y};
880
881 ($w, $h)
733} 882}
734 883
735sub size_allocate { 884sub size_allocate {
736 my ($self, $w, $h) = @_; 885 my ($self, $w, $h) = @_;
737 886
887 my $child = $self->child;
888
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891
892 $self->child->configure (0, 0, $w, $h);
738 $self->update; 893 $self->update;
739} 894}
740 895
741sub set_offset { 896sub set_offset {
742 my ($self, $x, $y) = @_; 897 my ($self, $x, $y) = @_;
… …
776} 931}
777 932
778sub _render { 933sub _render {
779 my ($self) = @_; 934 my ($self) = @_;
780 935
936 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
937 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
938
781 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
782 940
783 $self->SUPER::_render; 941 $self->SUPER::_render;
784} 942}
785 943
… …
793 my $class = shift; 951 my $class = shift;
794 952
795 my $self; 953 my $self;
796 954
797 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
798 vertical => 1, 956 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 958 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 959 $self->{vp}->set_offset (0, $_[1]);
802 }, 960 },
803 ; 961 ;
804 962
805 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 964 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 965 slider => $slider,
808 @_, 966 @_,
809 ); 967 );
810 968
811 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp}); 970 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
814 972
815 $self 973 $self
974}
975
976sub update {
977 my ($self) = @_;
978
979 $self->SUPER::update;
980
981 # todo: overwrite size_allocate of child
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984}
985
986sub size_allocate {
987 my ($self, $w, $h) = @_;
988
989 $self->SUPER::size_allocate ($w, $h);
990
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816} 993}
817 994
818#TODO# update range on size_allocate depending on child 995#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 996# update viewport offset on scroll
820 997
… …
864 1041
865our @ISA = CFClient::UI::Bin::; 1042our @ISA = CFClient::UI::Bin::;
866 1043
867use CFClient::OpenGL; 1044use CFClient::OpenGL;
868 1045
869my @tex = 1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
871 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872 1053
873sub new { 1054sub new {
874 my $class = shift; 1055 my ($class, %arg) = @_;
875 1056
876 # TODO: user_x, user_y, overwrite moveto? 1057 my $title = delete $arg{title};
877 1058
878 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1060 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1062 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1063 can_events => 1,
884 @_ 1064 min_w => 16,
1065 min_h => 16,
1066 %arg,
885 ); 1067 );
886 1068
887 $self->{title} &&= new CFClient::UI::Label 1069 $self->{title} = new CFClient::UI::Label
888 align => 0, 1070 align => 0,
889 valign => 1, 1071 valign => 1,
890 text => $self->{title}, 1072 text => $title,
891 fontsize => $self->{border}; 1073 fontsize => $self->{border}
1074 if defined $title;
892 1075
893 $self 1076 $self
1077}
1078
1079sub add {
1080 my ($self, @widgets) = @_;
1081
1082 $self->SUPER::add (@widgets);
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
894} 1084}
895 1085
896sub border { 1086sub border {
897 int $_[0]{border} * $::FONTSIZE 1087 int $_[0]{border} * $::FONTSIZE
898} 1088}
899 1089
900sub size_request { 1090sub size_request {
901 my ($self) = @_; 1091 my ($self) = @_;
1092
1093 $self->{title}->size_request
1094 if $self->{title};
902 1095
903 my ($w, $h) = $self->SUPER::size_request; 1096 my ($w, $h) = $self->SUPER::size_request;
904 1097
905 ( 1098 (
906 $w + $self->border * 2, 1099 $w + $self->border * 2,
… …
909} 1102}
910 1103
911sub size_allocate { 1104sub size_allocate {
912 my ($self, $w, $h) = @_; 1105 my ($self, $w, $h) = @_;
913 1106
1107 if ($self->{title}) {
1108 $self->{title}{w} = $w;
1109 $self->{title}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h);
1111 }
1112
1113 my $border = $self->border;
1114
914 $h -= List::Util::max 0, $self->border * 2; 1115 $h -= List::Util::max 0, $border * 2;
915 $w -= List::Util::max 0, $self->border * 2; 1116 $w -= List::Util::max 0, $border * 2;
916 1117
917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
918 if $self->{title};
919
920 $self->child->configure ($self->border, $self->border, $w, $h); 1118 $self->child->configure ($border, $border, $w, $h);
921} 1119}
922 1120
923sub button_down { 1121sub button_down {
924 my ($self, $ev, $x, $y) = @_; 1122 my ($self, $ev, $x, $y) = @_;
925 1123
… …
941 my ($ev, $x, $y) = @_; 1139 my ($ev, $x, $y) = @_;
942 1140
943 my $dx = $ev->{x} - $ox; 1141 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1142 my $dy = $ev->{y} - $oy;
945 1143
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146
1147 $self->realloc;
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size;
950 }; 1149 };
951 1150
952 } elsif ($lr ^ $td) { 1151 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1153 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1155 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
958 1157
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 ($x, $y) = ($ev->{x}, $ev->{y});
960 1159
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update;
963 }; 1161 };
964 } 1162 }
965} 1163}
966 1164
967sub button_up { 1165sub button_up {
… …
977} 1175}
978 1176
979sub _draw { 1177sub _draw {
980 my ($self) = @_; 1178 my ($self) = @_;
981 1179
1180 my $child = $self->{children}[0];
1181
982 my ($w, $h ) = ($self->{w}, $self->{h}); 1182 my ($w, $h ) = ($self->{w}, $self->{h});
983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1183 my ($cw, $ch) = ($child->{w}, $child->{h});
984 1184
985 glEnable GL_TEXTURE_2D; 1185 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1187
988 my $border = $self->border; 1188 my $border = $self->border;
989 1189
990 glColor @{ $self->{border_bg} }; 1190 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1191 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1194 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1195
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1197 glColor @{ $self->{bg} };
998 1198
999 # TODO: repeat texture not scale 1199 # TODO: repeat texture not scale
1200 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1201 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1202 $bg->{t} = $ch / $bg->{h};
1002
1003 glColor @{ $self->{bg} };
1004
1005 $bg->{s} = $rep_x;
1006 $bg->{t} = $rep_y;
1007 $bg->{wrap_mode} = 1;
1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1203 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1204 }
1010 1205
1011 glDisable GL_TEXTURE_2D; 1206 glDisable GL_TEXTURE_2D;
1012 1207
1013 $self->{title}->draw if $self->{title};
1014
1015 $self->child->draw; 1208 $child->draw;
1209
1210 if ($self->{title}) {
1211 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw;
1213 }
1016} 1214}
1017 1215
1018############################################################################# 1216#############################################################################
1019 1217
1020package CFClient::UI::Table; 1218package CFClient::UI::Table;
… …
1028sub new { 1226sub new {
1029 my $class = shift; 1227 my $class = shift;
1030 1228
1031 $class->SUPER::new ( 1229 $class->SUPER::new (
1032 col_expand => [], 1230 col_expand => [],
1033 @_ 1231 @_,
1034 ) 1232 )
1233}
1234
1235sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1237}
1036 1238
1037sub add { 1239sub add {
1038 my ($self, $x, $y, $child) = @_; 1240 my ($self, $x, $y, $child) = @_;
1039 1241
1040 $child->set_parent ($self); 1242 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1243 $self->{children}[$y][$x] = $child;
1042 1244
1043 $child->check_size; 1245 $self->realloc;
1044} 1246}
1045 1247
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# TODO: move to container class maybe? send childs a signal on removal? 1248# TODO: move to container class maybe? send children a signal on removal?
1051sub clear { 1249sub clear {
1052 my ($self) = @_; 1250 my ($self) = @_;
1053 1251
1054 my @children = $self->children; 1252 my @children = $self->children;
1055 delete $self->{children}; 1253 delete $self->{children};
… …
1057 for (@children) { 1255 for (@children) {
1058 delete $_->{parent}; 1256 delete $_->{parent};
1059 $_->hide; 1257 $_->hide;
1060 } 1258 }
1061 1259
1062 $self->update; 1260 $self->realloc;
1063} 1261}
1064 1262
1065sub get_wh { 1263sub get_wh {
1066 my ($self) = @_; 1264 my ($self) = @_;
1067 1265
… …
1098sub size_allocate { 1296sub size_allocate {
1099 my ($self, $w, $h) = @_; 1297 my ($self, $w, $h) = @_;
1100 1298
1101 my ($ws, $hs) = $self->get_wh; 1299 my ($ws, $hs) = $self->get_wh;
1102 1300
1103 my $req_w = sum @$ws; 1301 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1302 my $req_h = (sum @$hs) || 1;
1105 1303
1106 # TODO: nicer code && do row_expand 1304 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1305 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1306 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1307 my $col_expand = (sum @col_expand) || 1;
… …
1163 } 1361 }
1164} 1362}
1165 1363
1166############################################################################# 1364#############################################################################
1167 1365
1168package CFClient::UI::HBox; 1366package CFClient::UI::Box;
1169
1170# TODO: wrap into common Box base class
1171 1367
1172our @ISA = CFClient::UI::Container::; 1368our @ISA = CFClient::UI::Container::;
1173 1369
1174sub size_request { 1370sub size_request {
1175 my ($self) = @_; 1371 my ($self) = @_;
1176 1372
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1373 $self->{vertical}
1178 1374 ? (
1179 ( 1375 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1180 (List::Util::sum map $_->[0], @alloc), 1376 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181 (List::Util::max map $_->[1], @alloc), 1377 )
1182 ) 1378 : (
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 )
1183} 1382}
1184 1383
1185sub size_allocate { 1384sub size_allocate {
1186 my ($self, $w, $h) = @_; 1385 my ($self, $w, $h) = @_;
1187 1386
1188 ($h, $w) = ($w, $h); 1387 my $space = $self->{vertical} ? $h : $w;
1189
1190 my $children = $self->{children}; 1388 my $children = $self->{children};
1191 1389
1192 my @h = map $_->{req_w}, @$children; 1390 my @req;
1193 1391
1194 my $req_h = List::Util::sum @h; 1392 if ($self->{homogeneous}) {
1195 1393 @req = ($space / (@$children || 1)) x @$children;
1196 if ($req_h > $h) {
1197 # ah well, not enough space
1198 $_ *= $h / $req_h for @h;
1199 } else { 1394 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1396 my $req = List::Util::sum @req;
1397
1398 if ($req > $space) {
1399 # ah well, not enough space
1400 $_ *= $space / $req for @req;
1401 } else {
1200 my $exp = List::Util::sum map $_->{expand}, @$children; 1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201 $exp ||= 1;
1202 1403
1404 $space = ($space - $req) / $expand; # remaining space to give away
1405
1406 $req[$_] += $space * $children->[$_]{expand}
1203 for (0 .. $#$children) { 1407 for 0 .. $#$children;
1204 my $child = $children->[$_];
1205
1206 my $alloc_h = $h[$_];
1207 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208 $h[$_] = $alloc_h;
1209 } 1408 }
1210 } 1409 }
1211 1410
1212 CFClient::UI::harmonize \@h; 1411 CFClient::UI::harmonize \@req;
1213 1412
1214 my $y = 0; 1413 my $pos = 0;
1215 for (0 .. $#$children) { 1414 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_]; 1415 my $alloc = $req[$_];
1218 $child->configure ($y, 0, $h, $w); 1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219 1417
1220 $y += $h; 1418 $pos += $alloc;
1221 } 1419 }
1222 1420
1223 1 1421 1
1224} 1422}
1225 1423
1226############################################################################# 1424#############################################################################
1227 1425
1426package CFClient::UI::HBox;
1427
1428our @ISA = CFClient::UI::Box::;
1429
1430sub new {
1431 my $class = shift;
1432
1433 $class->SUPER::new (
1434 vertical => 0,
1435 @_,
1436 )
1437}
1438
1439#############################################################################
1440
1228package CFClient::UI::VBox; 1441package CFClient::UI::VBox;
1229 1442
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1443our @ISA = CFClient::UI::Box::;
1233 1444
1234sub size_request { 1445sub new {
1235 my ($self) = @_; 1446 my $class = shift;
1236 1447
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1448 $class->SUPER::new (
1238 1449 vertical => 1,
1239 ( 1450 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1451 )
1243}
1244
1245sub size_allocate {
1246 my ($self, $w, $h) = @_;
1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250 my $children = $self->{children};
1251
1252 my @h = map $_->{req_h}, @$children;
1253
1254 my $req_h = List::Util::sum @h;
1255
1256 if ($req_h > $h) {
1257 # ah well, not enough space
1258 $_ *= $h / $req_h for @h;
1259 } else {
1260 my $exp = List::Util::sum map $_->{expand}, @$children;
1261 $exp ||= 1;
1262
1263 for (0 .. $#$children) {
1264 my $child = $children->[$_];
1265
1266 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267 }
1268 }
1269
1270 CFClient::UI::harmonize \@h;
1271
1272 my $y = 0;
1273 for (0 .. $#$children) {
1274 my $child = $children->[$_];
1275 my $h = $h[$_];
1276 $child->configure (0, $y, $w, $h);
1277
1278 $y += $h;
1279 }
1280
1281 1
1282} 1452}
1283 1453
1284############################################################################# 1454#############################################################################
1285 1455
1286package CFClient::UI::Label; 1456package CFClient::UI::Label;
… …
1297 #bg => none 1467 #bg => none
1298 #active_bg => none 1468 #active_bg => none
1299 #font => default_font 1469 #font => default_font
1300 #text => initial text 1470 #text => initial text
1301 #markup => initial narkup 1471 #markup => initial narkup
1472 #max_w => maximum pixel width
1473 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1474 layout => (new CFClient::Layout),
1303 fontsize => 1, 1475 fontsize => 1,
1304 align => -1, 1476 align => -1,
1305 valign => -1, 1477 valign => -1,
1306 padding => 2, 1478 padding_x => 2,
1479 padding_y => 2,
1307 can_events => 0, 1480 can_events => 0,
1308 %arg 1481 %arg
1309 ); 1482 );
1310 1483
1311 if (exists $self->{template}) { 1484 if (exists $self->{template}) {
… …
1347 $self->{text} = "T$text"; 1520 $self->{text} = "T$text";
1348 1521
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1523 $self->{layout}->set_text ($text);
1351 1524
1525 $self->realloc;
1352 $self->update; 1526 $self->update;
1353 $self->check_size;
1354} 1527}
1355 1528
1356sub set_markup { 1529sub set_markup {
1357 my ($self, $markup) = @_; 1530 my ($self, $markup) = @_;
1358 1531
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1535 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1536
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1365 $self->{layout}->set_markup ($markup); 1538 $self->{layout}->set_markup ($markup);
1366 1539
1540 $self->realloc;
1367 $self->update; 1541 $self->update;
1368 $self->check_size;
1369} 1542}
1370 1543
1371sub size_request { 1544sub size_request {
1372 my ($self) = @_; 1545 my ($self) = @_;
1373 1546
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1548 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1552
1378 my ($w, $h) = $self->{layout}->size; 1553 my ($w, $h) = $self->{layout}->size;
1379 1554
1380 if (exists $self->{template}) { 1555 if (exists $self->{template}) {
… …
1385 1560
1386 $w = List::Util::max $w, $w2; 1561 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1562 $h = List::Util::max $h, $h2;
1388 } 1563 }
1389 1564
1390 ( 1565 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1566}
1395 1567
1396sub size_allocate { 1568sub size_allocate {
1397 my ($self, $w, $h) = @_; 1569 my ($self, $w, $h) = @_;
1398 1570
1571 delete $self->{ox};
1572
1399 delete $self->{texture}; 1573 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1575}
1401 1576
1402sub set_fontsize { 1577sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1578 my ($self, $fontsize) = @_;
1404 1579
1405 $self->{fontsize} = $fontsize; 1580 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1581 delete $self->{texture};
1407 1582
1408 $self->update; 1583 $self->realloc;
1409 $self->check_size;
1410} 1584}
1411 1585
1412sub _draw { 1586sub _draw {
1413 my ($self) = @_; 1587 my ($self) = @_;
1414 1588
… …
1416 1590
1417 my $tex = $self->{texture} ||= do { 1591 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1592 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1593 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1594 $self->{layout}->set_width ($self->{w});
1595 $self->{layout}->set_ellipsise ($self->{ellipsise});
1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1598
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1599 new_from_layout CFClient::Texture $self->{layout}
1600 };
1424 1601
1602 unless (exists $self->{ox}) {
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1605 : ($self->{w} - $tex->{w}) * 0.5);
1428 1606
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1609 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1434 }; 1610 };
1435 1611
1436 glEnable GL_TEXTURE_2D; 1612 glEnable GL_TEXTURE_2D;
1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1438 1614
… …
1464 active_fg => [0, 0, 0], 1640 active_fg => [0, 0, 0],
1465 can_hover => 1, 1641 can_hover => 1,
1466 can_focus => 1, 1642 can_focus => 1,
1467 valign => 0, 1643 valign => 0,
1468 can_events => 1, 1644 can_events => 1,
1645 #text => ...
1469 @_ 1646 @_
1470 ) 1647 )
1471} 1648}
1472 1649
1473sub _set_text { 1650sub _set_text {
… …
1483 $self->{text} = $text; 1660 $self->{text} = $text;
1484 1661
1485 $text =~ s/./*/g if $self->{hidden}; 1662 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1663 $self->{layout}->set_text ("$text ");
1487 1664
1488 $self->emit (changed => $self->{text}); 1665 $self->_emit (changed => $self->{text});
1489} 1666}
1490 1667
1491sub set_text { 1668sub set_text {
1492 my ($self, $text) = @_; 1669 my ($self, $text) = @_;
1493 1670
1494 $self->{cursor} = length $text; 1671 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1672 $self->_set_text ($text);
1496 $self->update; 1673
1497 $self->check_size; 1674 $self->realloc;
1498} 1675}
1499 1676
1500sub get_text { 1677sub get_text {
1501 $_[0]{text} 1678 $_[0]{text}
1502} 1679}
… …
1505 my ($self) = @_; 1682 my ($self) = @_;
1506 1683
1507 my ($w, $h) = $self->SUPER::size_request; 1684 my ($w, $h) = $self->SUPER::size_request;
1508 1685
1509 ($w + 1, $h) # add 1 for cursor 1686 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516} 1687}
1517 1688
1518sub key_down { 1689sub key_down {
1519 my ($self, $ev) = @_; 1690 my ($self, $ev) = @_;
1520 1691
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1706 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1707 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1708 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1709 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1710 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1711 $self->_emit ('escape');
1541 } elsif ($uni) { 1712 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1713 substr $text, $self->{cursor}++, 0, chr $uni;
1543 } 1714 }
1544 1715
1545 $self->_set_text ($text); 1716 $self->_set_text ($text);
1546 $self->update; 1717
1547 $self->check_size; 1718 $self->realloc;
1548} 1719}
1549 1720
1550sub focus_in { 1721sub focus_in {
1551 my ($self) = @_; 1722 my ($self) = @_;
1552 1723
… …
1632 if ($sym == 13) { 1803 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1804 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1805 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1806 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1807 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1808 $self->_emit (activate => $txt);
1638 $self->update; 1809 $self->update;
1639 1810
1640 } elsif ($sym == CFClient::SDLK_UP) { 1811 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1812 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1813 $self->{history_saveback} = $self->get_text;
… …
1679 1850
1680sub new { 1851sub new {
1681 my $class = shift; 1852 my $class = shift;
1682 1853
1683 $class->SUPER::new ( 1854 $class->SUPER::new (
1684 padding => 4, 1855 padding_x => 4,
1856 padding_y => 4,
1685 fg => [1, 1, 1], 1857 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1858 active_fg => [0, 0, 1],
1687 can_hover => 1, 1859 can_hover => 1,
1688 align => 0, 1860 align => 0,
1689 valign => 0, 1861 valign => 0,
1690 can_events => 1, 1862 can_events => 1,
1691 @_ 1863 @_
1692 ) 1864 )
1693} 1865}
1694 1866
1867sub activate { }
1868
1695sub button_up { 1869sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1870 my ($self, $ev, $x, $y) = @_;
1697 1871
1872 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1873 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1874 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate");
1701 }
1702} 1875}
1703 1876
1704sub _draw { 1877sub _draw {
1705 my ($self) = @_; 1878 my ($self) = @_;
1706 1879
… …
1735 1908
1736sub new { 1909sub new {
1737 my $class = shift; 1910 my $class = shift;
1738 1911
1739 $class->SUPER::new ( 1912 $class->SUPER::new (
1740 padding => 2, 1913 padding_x => 2,
1914 padding_y => 2,
1741 fg => [1, 1, 1], 1915 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 1916 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 1917 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 1918 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 1919 state => 0,
… …
1749} 1923}
1750 1924
1751sub size_request { 1925sub size_request {
1752 my ($self) = @_; 1926 my ($self) = @_;
1753 1927
1754 ($self->{padding} * 2 + 6) x 2 1928 (6) x 2
1755} 1929}
1756 1930
1757sub button_down { 1931sub button_down {
1758 my ($self, $ev, $x, $y) = @_; 1932 my ($self, $ev, $x, $y) = @_;
1759 1933
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 1936 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1937 $self->_emit (changed => $self->{state});
1764 } 1938 }
1765} 1939}
1766 1940
1767sub _draw { 1941sub _draw {
1768 my ($self) = @_; 1942 my ($self) = @_;
1769 1943
1770 $self->SUPER::_draw; 1944 $self->SUPER::_draw;
1771 1945
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 1947
1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1948 my ($w, $h) = @$self{qw(w h)};
1949
1950 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1775 1951
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1952 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 1953
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1954 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 1955
… …
2043 my $self = $class->SUPER::new ( 2219 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2220 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2221 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2222 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2223 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2224 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2225 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2226 min_h => $::WIDTH / 80,
2051 vertical => 0, 2227 vertical => 0,
2052 can_hover => 1, 2228 can_hover => 1,
2053 inner_pad => .05, 2229 inner_pad => 0.02,
2054 @_ 2230 @_
2055 ); 2231 );
2056 2232
2057 $self->set_value ($self->{range}[0]); 2233 $self->set_value ($self->{range}[0]);
2058 $self->update; 2234 $self->update;
2059 2235
2060 $self 2236 $self
2061} 2237}
2062 2238
2239sub changed { }
2240
2241sub set_range {
2242 my ($self, $range) = @_;
2243
2244 ($range, $self->{range}) = ($self->{range}, $range);
2245
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}";
2248}
2249
2063sub set_value { 2250sub set_value {
2064 my ($self, $value) = @_; 2251 my ($self, $value) = @_;
2065 2252
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2253 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2254
2068 $hi = $lo + 1 if $hi <= $lo; 2255 $hi = $lo + 1 if $hi <= $lo;
2069 2256
2257 $page = $hi - $lo if $page > $hi - $lo;
2258
2070 $value = $lo if $value < $lo; 2259 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2260 $value = $hi - $page if $value > $hi - $page;
2072 2261
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2262 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2263 if $unit;
2075 2264
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2266
2080 if ($value != $old_value) { 2267 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2268 $self->_emit (changed => $value);
2082 $self->update; 2269 $self->update;
2083 } 2270 }
2084} 2271}
2085 2272
2086sub size_request { 2273sub size_request {
2087 my ($self) = @_; 2274 my ($self) = @_;
2088 2275
2089 my $w = $self->{req_w}; 2276 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2277}
2094 2278
2095sub button_down { 2279sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2280 my ($self, $ev, $x, $y) = @_;
2097 2281
2098 $self->SUPER::button_down ($ev, $x, $y); 2282 $self->SUPER::button_down ($ev, $x, $y);
2283
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285
2099 $self->mouse_motion ($ev, $x, $y); 2286 $self->mouse_motion ($ev, $x, $y);
2100} 2287}
2101 2288
2102sub mouse_motion { 2289sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2290 my ($self, $ev, $x, $y) = @_;
… …
2105 if ($GRAB == $self) { 2292 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2294
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2295 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2296
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2298
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113 } 2300 }
2114} 2301}
2115 2302
2116sub update { 2303sub update {
2117 my ($self) = @_; 2304 my ($self) = @_;
2118 2305
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2307 $self->set_value ($self->{range}[0]);
2121 2308
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2309 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100;
2123 2311
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2312 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2313
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2314 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2315 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2316
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2317 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2318 $value = $value * $self->{scale} + $self->{offset};
2130 2319
2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value; 2320 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2321 $self->{knob_w} = $knob_w;
2138 }); 2322 });
2139 2323
2140 $self->SUPER::update; 2324 $self->SUPER::update;
2141} 2325}
2142 2326
… …
2148 glScale $self->{w}, $self->{h}; 2332 glScale $self->{w}, $self->{h};
2149 2333
2150 if ($self->{vertical}) { 2334 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2335 # draw a vertical slider like a rotated horizontal slider
2152 2336
2337 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2338 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2339 }
2156 2340
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2341 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2342 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2343
… …
2166 # draw handle 2350 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2351 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2352
2169 glDisable GL_TEXTURE_2D; 2353 glDisable GL_TEXTURE_2D;
2170} 2354}
2355
2356#############################################################################
2357
2358package CFClient::UI::ValSlider;
2359
2360our @ISA = CFClient::UI::HBox::;
2361
2362sub new {
2363 my ($class, %arg) = @_;
2364
2365 my $range = delete $arg{range};
2366
2367 my $self = $class->SUPER::new (
2368 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2369 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2370 to_value => sub { shift },
2371 from_value => sub { shift },
2372 %arg,
2373 );
2374
2375 $self->{slider}->connect (changed => sub {
2376 my ($self, $value) = @_;
2377 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2378 $self->{parent}->emit (changed => $value);
2379 });
2380
2381# $self->{entry}->connect (changed => sub {
2382# my ($self, $value) = @_;
2383# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2384# $self->{parent}->emit (changed => $value);
2385# });
2386
2387 $self->add ($self->{slider}, $self->{entry});
2388
2389 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2390
2391 $self
2392}
2393
2394sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) }
2171 2396
2172############################################################################# 2397#############################################################################
2173 2398
2174package CFClient::UI::TextView; 2399package CFClient::UI::TextView;
2175 2400
… …
2205 2430
2206 $self->{fontsize} = $fontsize; 2431 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2432 $self->reflow;
2208} 2433}
2209 2434
2210sub text_height {
2211 my ($self, $text) = @_;
2212
2213 my $layout = $self->{layout};
2214
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $layout->set_width ($self->{children}[0]{w});
2217 $layout->set_markup ($text);
2218
2219 ($layout->size)[1]
2220}
2221
2222sub reflow {
2223 my ($self) = @_;
2224
2225 $self->{need_reflow}++;
2226 $self->update;
2227}
2228
2229sub size_allocate { 2435sub size_allocate {
2230 my ($self, $w, $h) = @_; 2436 my ($self, $w, $h) = @_;
2231 2437
2232 $self->SUPER::size_allocate ($w, $h); 2438 $self->SUPER::size_allocate ($w, $h);
2233 2439
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2442 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2443
2238 $self->reflow; 2444 $self->reflow;
2239} 2445}
2240 2446
2447sub text_size {
2448 my ($self, $text, $indent) = @_;
2449
2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $layout->set_width ($self->{children}[0]{w} - $indent);
2454 $layout->set_markup ($text);
2455
2456 $layout->size
2457}
2458
2459sub reflow {
2460 my ($self) = @_;
2461
2462 $self->{need_reflow}++;
2463 $self->update;
2464}
2465
2466sub set_offset {
2467 my ($self, $offset) = @_;
2468
2469 # todo: base offset on lines or so, not on pixels
2470 $self->{children}[1]->set_value ($offset);
2471}
2472
2473sub clear {
2474 my ($self) = @_;
2475
2476 $self->{par} = [];
2477 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479}
2480
2241sub add_paragraph { 2481sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2482 my ($self, $color, $text, $indent) = @_;
2243 2483
2244 #TODO: intelligently "reformat" paragraph 2484 for my $line (split /\n/, $text) {
2245 2485 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2486 $self->{height} += $h;
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2488 }
2249 2489
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2490 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2491}
2255 2492
2256sub update { 2493sub update {
2257 my ($self) = @_; 2494 my ($self) = @_;
2258 2495
… …
2261 return unless $self->{h} > 0; 2498 return unless $self->{h} > 0;
2262 2499
2263 delete $self->{texture}; 2500 delete $self->{texture};
2264 2501
2265 $ROOT->on_post_alloc ($self, sub { 2502 $ROOT->on_post_alloc ($self, sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504
2266 if (delete $self->{need_reflow}) { 2505 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2506 my $height = 0;
2268 2507
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2270 for @{$self->{par}}; 2512 for (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514 $layout->set_width ($W - $_->[3]);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3];
2518 $_->[1] = $h;
2519 }
2520
2521 $height += $_->[1];
2522 }
2271 2523
2272 $self->{height} = $height; 2524 $self->{height} = $height;
2273 2525
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2527
2276 delete $self->{texture}; 2528 delete $self->{texture};
2277 } 2529 }
2278 2530
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2532 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2533 glClear GL_COLOR_BUFFER_BIT;
2282 2534
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286 my $top = int $self->{children}[1]{range}[0]; 2535 my $top = int $self->{children}[1]{range}[0];
2287 2536
2288 my $y0 = $top; 2537 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2538 my $y1 = $top + $H;
2290 2539
2291 my $y = 0; 2540 my $y = 0;
2292 2541
2293 my $layout = $self->{layout}; 2542 my $layout = $self->{layout};
2294 2543
2295 $layout->set_font ($self->{font}) if $self->{font}; 2544 $layout->set_font ($self->{font}) if $self->{font};
2296 2545
2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549
2297 for my $par (@{$self->{par}}) { 2550 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2551 my $h = $par->[1];
2299 2552
2300 if ($y0 < $y + $h && $y < $y1) { 2553 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2554 $layout->set_foreground (@{ $par->[2] });
2555 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2556 $layout->set_markup ($par->[4]);
2303 2557
2304 my ($W, $H) = $layout->size; 2558 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2559
2560 glRasterPos $par->[3], $y - $y0;
2561 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2562 }
2307 2563
2308 $y += $h; 2564 $y += $h;
2309 } 2565 }
2310 2566
2311 glDisable GL_TEXTURE_2D; 2567 glDisable GL_BLEND;
2312 }; 2568 };
2313 }); 2569 });
2314} 2570}
2315 2571
2316sub _draw { 2572sub _draw {
2317 my ($self) = @_; 2573 my ($self) = @_;
2318 2574
2319 glEnable GL_TEXTURE_2D; 2575 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2577 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2579 glDisable GL_TEXTURE_2D;
2324 2580
2325 $self->{children}[1]->draw; 2581 $self->{children}[1]->draw;
2326 2582
2327} 2583}
… …
2376 2632
2377sub new { 2633sub new {
2378 my $class = shift; 2634 my $class = shift;
2379 2635
2380 my $self = $class->SUPER::new ( 2636 my $self = $class->SUPER::new (
2381 state => 0, 2637 state => 0,
2382 connect_activate => \&toggle_flopper, 2638 on_activate => \&toggle_flopper,
2383 @_ 2639 @_
2384 ); 2640 );
2385 2641
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2642 $self
2392} 2643}
2393 2644
2394sub toggle_flopper { 2645sub toggle_flopper {
2395 my ($self) = @_; 2646 my ($self) = @_;
2396 2647
2397 # TODO: use animation 2648 $self->{other}->toggle_visibility;
2398 if ($self->{state} = !$self->{state}) {
2399 $CFClient::UI::ROOT->add ($self->{other});
2400 $self->{other}->move ($self->coord2global (0, $self->{h}));
2401 $self->emit ("open");
2402 } else {
2403 $CFClient::UI::ROOT->remove ($self->{other});
2404 $self->emit ("close");
2405 }
2406
2407 $self->emit (changed => $self->{state});
2408} 2649}
2409 2650
2410############################################################################# 2651#############################################################################
2411 2652
2412package CFClient::UI::Tooltip; 2653package CFClient::UI::Tooltip;
… …
2425} 2666}
2426 2667
2427sub set_tooltip_from { 2668sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2669 my ($self, $widget) = @_;
2429 2670
2671 my $tooltip = $widget->{tooltip};
2672
2673 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}";
2678 }
2679
2430 $self->add (new CFClient::UI::Label 2680 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2681 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2683 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2684 fg => [0, 0, 0, 1],
2685 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2686 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2687 );
2437} 2688}
2438 2689
2439sub size_request { 2690sub size_request {
2440 my ($self) = @_; 2691 my ($self) = @_;
… …
2446 2697
2447sub size_allocate { 2698sub size_allocate {
2448 my ($self, $w, $h) = @_; 2699 my ($self, $w, $h) = @_;
2449 2700
2450 $self->SUPER::size_allocate ($w - 4, $h - 4); 2701 $self->SUPER::size_allocate ($w - 4, $h - 4);
2702}
2703
2704sub visibility_change {
2705 my ($self, $visible) = @_;
2706
2707 return unless $visible;
2708
2709 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner}
2711 or return;
2712
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH;
2717
2718 $self->move_abs ($x, $y);
2719 });
2451} 2720}
2452 2721
2453sub _draw { 2722sub _draw {
2454 my ($self) = @_; 2723 my ($self) = @_;
2455 2724
… …
2472 glVertex $w, $h; 2741 glVertex $w, $h;
2473 glVertex $w, 0; 2742 glVertex $w, 0;
2474 glEnd; 2743 glEnd;
2475 2744
2476 glTranslate 2 - 0.375, 2 - 0.375; 2745 glTranslate 2 - 0.375, 2 - 0.375;
2746
2477 $self->SUPER::_draw; 2747 $self->SUPER::_draw;
2478} 2748}
2479 2749
2480############################################################################# 2750#############################################################################
2481 2751
… …
2486use CFClient::OpenGL; 2756use CFClient::OpenGL;
2487 2757
2488sub new { 2758sub new {
2489 my $class = shift; 2759 my $class = shift;
2490 2760
2491 $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2492 aspect => 1, 2762 aspect => 1,
2763 can_events => 0,
2493 @_, 2764 @_,
2494 ) 2765 );
2766
2767 if ($self->{anim} && $self->{animspeed}) {
2768 Scalar::Util::weaken (my $widget = $self);
2769
2770 $self->{timer} = Event->timer (
2771 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2772 hard => 1,
2773 interval => $self->{animspeed},
2774 cb => sub {
2775 ++$widget->{frame};
2776 $widget->update;
2777 },
2778 );
2779 }
2780
2781 $self
2495} 2782}
2496 2783
2497sub size_request { 2784sub size_request {
2498 (32, 8) 2785 (32, 8)
2499} 2786}
2500 2787
2788sub update {
2789 my ($self) = @_;
2790
2791 return unless $self->{visible};
2792
2793 $self->SUPER::update;
2794}
2795
2501sub _draw { 2796sub _draw {
2502 my ($self) = @_; 2797 my ($self) = @_;
2503 2798
2504 return unless $::CONN;#d# manage and cache textures differently 2799 return unless $::CONN;
2800
2801 my $face;
2802
2803 if ($self->{frame}) {
2804 my $anim = $::CONN->{anim}[$self->{anim}];
2805
2806 $face = $anim->[ $self->{frame} % @$anim ]
2807 if $anim && @$anim;
2808 }
2809
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2811
2507 # TODO animation
2508 if ($tex) { 2812 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2813 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2815 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2817 glDisable GL_TEXTURE_2D;
2514 } 2818 }
2515} 2819}
2516 2820
2517############################################################################# 2821sub DESTROY {
2518
2519package CFClient::UI::InventoryItem;
2520
2521our @ISA = CFClient::UI::HBox::;
2522
2523sub _item_to_desc {
2524 my ($item) = @_; 2822 my ($self) = @_;
2525 2823
2526 my $desc = 2824 $self->{timer}->cancel
2527 $item->{nrof} < 2 2825 if $self->{timer};
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530 2826
2531 $item->{flags} & Crossfire::Protocol::F_OPEN 2827 $self->SUPER::DESTROY;
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548
2549sub new {
2550 my $class = shift;
2551
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new (
2559 can_hover => 1,
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_,
2634 );
2635
2636 $self
2637}
2638
2639sub set_items {
2640 my ($self, $items) = @_;
2641
2642 $self->{scrolled}->clear;
2643 return unless $items;
2644
2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2649
2650 $self->{real_items} = \@items;
2651
2652 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2655 }
2656
2657 $self->{scrolled}->add (@items);
2658
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2660}
2661
2662sub size_request {
2663 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h});
2665} 2828}
2666 2829
2667############################################################################# 2830#############################################################################
2668 2831
2669package CFClient::UI::Menu; 2832package CFClient::UI::Menu;
… …
2704 2867
2705# popup given the event (must be a mouse button down event currently) 2868# popup given the event (must be a mouse button down event currently)
2706sub popup { 2869sub popup {
2707 my ($self, $ev) = @_; 2870 my ($self, $ev) = @_;
2708 2871
2709 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2710 2873
2711 # maybe save $GRAB? must be careful about events... 2874 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self; 2875 $GRAB = $self;
2713 $self->{button} = $ev->{button}; 2876 $self->{button} = $ev->{button};
2714 2877
2715 $self->show; 2878 $self->show;
2716 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2717} 2880}
2718 2881
2719sub mouse_motion { 2882sub mouse_motion {
2720 my ($self, $ev, $x, $y) = @_; 2883 my ($self, $ev, $x, $y) = @_;
2721 2884
… …
2729 2892
2730 if ($ev->{button} == $self->{button}) { 2893 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB; 2894 undef $GRAB;
2732 $self->hide; 2895 $self->hide;
2733 2896
2734 $self->emit ("popdown"); 2897 $self->_emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover}; 2898 $self->{hover}[1]->() if $self->{hover};
2736 } 2899 }
2737} 2900}
2738 2901
2739############################################################################# 2902#############################################################################
… …
2774 # TODO: doesn't handle markup well (read as: at all) 2937 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1 2938 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}" 2939 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text}; 2940 : $item->{text};
2778 2941
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) { 2942 for ($short) {
2782 s/^\s+//; 2943 s/^\s+//;
2783 s/\s+/ /g; 2944 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 } 2945 }
2787 2946
2788 new CFClient::UI::Label 2947 new CFClient::UI::Label
2789 markup => $short, 2948 markup => $short,
2790 tooltip => $item->{tooltip}, 2949 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP, 2950 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67, 2951 tooltip_width => 0.67,
2793 fontsize => $fontsize, 2952 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 2954 fg => $item->{fg},
2795 can_events => 1, 2955 can_events => 1,
2796 can_hover => 1 2956 can_hover => 1
2797 }; 2957 };
2798 } 2958 }
… …
2804sub add { 2964sub add {
2805 my ($self, $text, %arg) = @_; 2965 my ($self, $text, %arg) = @_;
2806 2966
2807 $text =~ s/^\s+//; 2967 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2968 $text =~ s/\s+$//;
2969
2970 return unless $text;
2809 2971
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2972 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2973
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2975
… …
2835 } 2997 }
2836 2998
2837 $self->reorder; 2999 $self->reorder;
2838} 3000}
2839 3001
3002sub reconfigure {
3003 my ($self) = @_;
3004
3005 delete $_->{label}
3006 for values %{ $self->{item} || {} };
3007
3008 $self->reorder;
3009 $self->SUPER::reconfigure;
3010}
3011
2840############################################################################# 3012#############################################################################
2841 3013
2842package CFClient::UI::Root; 3014package CFClient::UI::Inventory;
2843 3015
2844our @ISA = CFClient::UI::Container::; 3016our @ISA = CFClient::UI::ScrolledWindow::;
2845
2846use CFClient::OpenGL;
2847 3017
2848sub new { 3018sub new {
2849 my $class = shift; 3019 my $class = shift;
2850 3020
2851 $class->SUPER::new ( 3021 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2852 @_, 3023 @_,
2853 ) 3024 );
2854}
2855 3025
2856sub configure { 3026 $self
3027}
3028
3029sub set_items {
3030 my ($self, $items) = @_;
3031
3032 $self->{scrolled}->clear;
3033 return unless $items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::BindEditor;
3057
3058our @ISA = CFClient::UI::FancyFrame::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3064
3065 $self->add (my $vb = new CFClient::UI::VBox);
3066
3067
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3069 text => "start recording",
3070 tooltip => "Start/Stops recording of actions."
3071 ."All subsequent actions after the recording started will be captured."
3072 ."The actions are displayed after the record was stopped."
3073 ."To bind the action you have to click on the 'Bind' button",
3074 on_activate => sub {
3075 unless ($self->{recording}) {
3076 $self->start;
3077 } else {
3078 $self->stop;
3079 }
3080 });
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156
3157sub ask_for_bind_and_commit {
3158 my ($self) = @_;
3159 $self->ask_for_bind (1);
3160}
3161
3162sub ask_for_bind {
3163 my ($self, $commit) = @_;
3164
3165 CFClient::Binder::open_binding_dialog (sub {
3166 my ($mod, $sym) = @_;
3167 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3168 $self->update_binding_widgets;
3169 $self->commit if $commit;
3170 });
3171}
3172
3173# $mod and $sym are the modifiers and key symbol
3174# $cmds is a array ref of strings (the commands)
3175# $cb is the callback that is executed on OK
3176# $ccb is the callback that is executed on CANCEL and
3177# when the binding was unsuccessful on OK
3178sub set_binding {
2857 my ($self, $x, $y, $w, $h) = @_; 3179 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2858 3180
2859 $self->{w} = $w; 3181 $self->clear_command_list;
2860 $self->{h} = $h; 3182 $self->{recording} = 0;
2861} 3183 $self->{rec_btn}->set_text ("start recording");
2862 3184
2863sub check_size { 3185 $self->{binding} = [$mod, $sym];
3186 $self->{commands} = $cmds;
3187
3188 $self->{binding_change} = $cb;
3189 $self->{binding_cancel} = $ccb;
3190
3191 $self->update_binding_widgets;
3192}
3193
3194# this is a shortcut method that asks for a binding
3195# and then just binds it.
3196sub do_quick_binding {
2864 my ($self) = @_; 3197 my ($self, $cmds) = @_;
3198 $self->set_binding (undef, undef, $cmds, sub {
3199 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3200 });
3201 $self->ask_for_bind (1);
3202}
2865 3203
2866 $self->size_allocate ($self->{w}, $self->{h}) 3204sub update_binding_widgets {
2867 if $self->{w}; 3205 my ($self) = @_;
3206 my ($mod, $sym, $cmds) = $self->get_binding;
3207 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3208 $self->set_command_list ($cmds);
3209}
3210
3211sub get_binding {
3212 my ($self) = @_;
3213 return (
3214 $self->{binding}->[0],
3215 $self->{binding}->[1],
3216 [ grep { defined $_ } @{$self->{commands}} ]
3217 );
3218}
3219
3220sub clear_command_list {
3221 my ($self) = @_;
3222 $self->{cmdbox}->clear ();
3223}
3224
3225sub set_command_list {
3226 my ($self, $cmds) = @_;
3227
3228 $self->{cmdbox}->clear ();
3229 $self->{commands} = $cmds;
3230
3231 my $idx = 0;
3232
3233 for (@$cmds) {
3234 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3235
3236 my $i = $idx;
3237 $hb->add (new CFClient::UI::Label text => $_);
3238 $hb->add (new CFClient::UI::Button
3239 text => "delete",
3240 tooltip => "Deletes the action from the record",
3241 on_activate => sub {
3242 $self->{cmdbox}->remove ($hb);
3243 $cmds->[$i] = undef;
3244 });
3245
3246
3247 $idx++
3248 }
3249}
3250
3251#############################################################################
3252
3253package CFClient::UI::SpellList;
3254
3255our @ISA = CFClient::UI::FancyFrame::;
3256
3257sub new {
3258 my $class = shift;
3259
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3261
3262 $self->add (new CFClient::UI::ScrolledWindow
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3264
3265 $self;
3266}
3267
3268# XXX: Do sorting? Argl...
3269sub add_spell {
3270 my ($self, $spell) = @_;
3271 $self->{spells}->{$spell->{name}} = $spell;
3272
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face},
3275 can_hover => 1,
3276 can_events => 1,
3277 tooltip => $spell->{message});
3278
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name},
3281 can_hover => 1,
3282 can_events => 1,
3283 tooltip => $spell->{message},
3284 expand => 1);
3285
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1);
3290
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294}
3295
3296sub rebuild_spell_list {
3297 my ($self) = @_;
3298 $self->{tbl_idx} = 0;
3299 $self->add_spell ($_) for values %{$self->{spells}};
3300}
3301
3302sub remove_spell {
3303 my ($self, $spell) = @_;
3304 delete $self->{spells}->{$spell->{name}};
3305 $self->rebuild_spell_list;
3306}
3307
3308#############################################################################
3309
3310package CFClient::UI::Root;
3311
3312our @ISA = CFClient::UI::Container::;
3313
3314use CFClient::OpenGL;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 visible => 1,
3321 @_,
3322 );
3323
3324 Scalar::Util::weaken ($self->{root} = $self);
3325
3326 $self
2868} 3327}
2869 3328
2870sub size_request { 3329sub size_request {
2871 my ($self) = @_; 3330 my ($self) = @_;
2872 3331
2873 ($self->{w}, $self->{h}) 3332 ($self->{w}, $self->{h})
3333}
3334
3335sub _to_pixel {
3336 my ($coord, $size, $max) = @_;
3337
3338 $coord =
3339 $coord eq "center" ? ($max - $size) * 0.5
3340 : $coord eq "max" ? $max
3341 : $coord;
3342
3343 $coord = 0 if $coord < 0;
3344 $coord = $max - $size if $coord > $max - $size;
3345
3346 int $coord + 0.5
2874} 3347}
2875 3348
2876sub size_allocate { 3349sub size_allocate {
2877 my ($self, $w, $h) = @_; 3350 my ($self, $w, $h) = @_;
2878 3351
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2885 for my $child ($self->children) { 3352 for my $child ($self->children) {
2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3353 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2887 3354
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3355 $X = $child->{force_x} if exists $child->{force_x};
2889 if exists $child->{req_x}; 3356 $Y = $child->{force_y} if exists $child->{force_y};
2890 3357
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3358 $X = _to_pixel $X, $W, $self->{w};
2892 if exists $child->{req_y}; 3359 $Y = _to_pixel $Y, $H, $self->{h};
2893
2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896 3360
2897 $child->configure ($X, $Y, $W, $H); 3361 $child->configure ($X, $Y, $W, $H);
2898 } 3362 }
2899} 3363}
2900 3364
… …
2911} 3375}
2912 3376
2913sub update { 3377sub update {
2914 my ($self) = @_; 3378 my ($self) = @_;
2915 3379
2916 $self->check_size;
2917 $::WANT_REFRESH++; 3380 $::WANT_REFRESH++;
2918} 3381}
2919 3382
2920sub add { 3383sub add {
2921 my ($self, @children) = @_; 3384 my ($self, @children) = @_;
2922 3385
2923 for my $child (@children) {
2924 $child->{toplevel} = 1; 3386 $_->{is_toplevel} = 1
2925 3387 for @children;
2926 # integerise window positions
2927 $child->{x} = int $child->{x};
2928 $child->{y} = int $child->{y};
2929 }
2930 3388
2931 $self->SUPER::add (@children); 3389 $self->SUPER::add (@children);
3390}
3391
3392sub remove {
3393 my ($self, @children) = @_;
3394
3395 $self->SUPER::remove (@children);
3396
3397 delete $self->{is_toplevel}
3398 for @children;
3399
3400 while (@children) {
3401 my $w = pop @children;
3402 push @children, $w->children;
3403 $w->set_invisible;
3404 }
2932} 3405}
2933 3406
2934sub on_refresh { 3407sub on_refresh {
2935 my ($self, $id, $cb) = @_; 3408 my ($self, $id, $cb) = @_;
2936 3409
… …
2949 while ($self->{refresh_hook}) { 3422 while ($self->{refresh_hook}) {
2950 $_->() 3423 $_->()
2951 for values %{delete $self->{refresh_hook}}; 3424 for values %{delete $self->{refresh_hook}};
2952 } 3425 }
2953 3426
2954 if ($self->{check_size}) { 3427 if ($self->{realloc}) {
2955 my @queue = ([], []); 3428 my %queue;
3429 my @queue;
3430 my $widget;
2956 3431
2957 for (;;) { 3432 outer:
2958 if ($self->{check_size}) { 3433 while () {
2959 # heuristic: check containers last 3434 if (my $realloc = delete $self->{realloc}) {
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3435 for $widget (values %$realloc) {
2961 for values %{delete $self->{check_size}} 3436 $widget->{visible} or next; # do not resize invisible widgets
3437
3438 $queue{$widget+0}++ and next; # duplicates are common
3439
3440 push @{ $queue[$widget->{visible}] }, $widget;
3441 }
2962 } 3442 }
2963 3443
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3444 while () {
3445 @queue or last outer;
2965 3446
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3447 $widget = pop @{ $queue[-1] || [] }
2967 ? @$widget{qw(user_w user_h)} 3448 and last;
2968 : $widget->size_request;
2969
2970 if (delete $widget->{force_alloc}
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973 3449
3450 pop @queue;
3451 }
3452
3453 delete $queue{$widget+0};
3454
3455 my ($w, $h) = $widget->size_request;
3456
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3459
3460 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h};
3462
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3464 || delete $widget->{force_realloc}) {
2974 $widget->{req_w} = $w; 3465 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h; 3466 $widget->{req_h} = $h;
2976 3467
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3468 $self->{size_alloc}{$widget+0} = $widget;
2978 3469
2979 $widget->{parent}->check_size
2980 if $widget->{parent}; 3470 if (my $parent = $widget->{parent}) {
3471 $self->{realloc}{$parent+0} = $parent
3472 unless $queue{$parent+0};
3473
3474 $parent->{force_size_alloc} = 1;
3475 $self->{size_alloc}{$parent+0} = $parent;
3476 }
2981 } 3477 }
3478
3479 delete $self->{realloc}{$widget+0};
2982 } 3480 }
2983 } 3481 }
2984 3482
2985 while ($self->{size_alloc}) { 3483 while (my $size_alloc = delete $self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) { 3484 my @queue = sort { $b->{visible} <=> $a->{visible} }
2987 my ($widget, $w, $h) = @$_; 3485 values %$size_alloc;
3486
3487 while () {
3488 my $widget = pop @queue || last;
3489
3490 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2988 3491
2989 $w = 0 if $w < 0; 3492 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0; 3493 $h = 0 if $h < 0;
2991 3494
3495 $w = int $w + 0.5;
3496 $h = int $h + 0.5;
3497
3498 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3499 $widget->{old_w} = $widget->{w};
3500 $widget->{old_h} = $widget->{h};
3501
2992 $widget->{w} = $w; 3502 $widget->{w} = $w;
2993 $widget->{h} = $h; 3503 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h); 3504
2995 $widget->emit (size_allocate => $w, $h); 3505 $widget->emit (size_allocate => $w, $h);
3506 }
2996 } 3507 }
2997 } 3508 }
2998 3509
2999 while ($self->{post_alloc_hook}) { 3510 while ($self->{post_alloc_hook}) {
3000 $_->() 3511 $_->()
3001 for values %{delete $self->{post_alloc_hook}}; 3512 for values %{delete $self->{post_alloc_hook}};
3002 } 3513 }
3003 3514
3515
3004 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3516 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3517 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006 glClear GL_COLOR_BUFFER_BIT; 3518 glClear GL_COLOR_BUFFER_BIT;
3007 3519
3008 glMatrixMode GL_PROJECTION; 3520 glMatrixMode GL_PROJECTION;
3009 glLoadIdentity; 3521 glLoadIdentity;
3010 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3522 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011 glMatrixMode GL_MODELVIEW; 3523 glMatrixMode GL_MODELVIEW;
3012 glLoadIdentity; 3524 glLoadIdentity;
3013 3525
3526 {
3527 package CFClient::UI::Base;
3528
3529 ($draw_x, $draw_y, $draw_w, $draw_h) =
3530 (0, 0, $self->{w}, $self->{h});
3531 }
3532
3014 $self->_draw; 3533 $self->_draw;
3015} 3534}
3016 3535
3017############################################################################# 3536#############################################################################
3018 3537
3019package CFClient::UI; 3538package CFClient::UI;
3020 3539
3021$ROOT = new CFClient::UI::Root; 3540$ROOT = new CFClient::UI::Root;
3022$TOOLTIP = new CFClient::UI::Tooltip; 3541$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023 3542
30241 35431
3025 3544

Diff Legend

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