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.268 by root, Thu Jun 1 05:04:41 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 = shift;
875 1056
876 # TODO: user_x, user_y, overwrite moveto?
877
878 my $self = $class->SUPER::new ( 1057 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1058 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1059 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1060 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1061 can_events => 1,
1062 min_w => 16,
1063 min_h => 16,
884 @_ 1064 @_
885 ); 1065 );
886 1066
887 $self->{title} &&= new CFClient::UI::Label 1067 $self->{title} &&= new CFClient::UI::Label
888 align => 0, 1068 align => 0,
… …
941 my ($ev, $x, $y) = @_; 1121 my ($ev, $x, $y) = @_;
942 1122
943 my $dx = $ev->{x} - $ox; 1123 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1124 my $dy = $ev->{y} - $oy;
945 1125
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128
1129 $self->realloc;
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size;
950 }; 1131 };
951 1132
952 } elsif ($lr ^ $td) { 1133 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1134 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1135 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1137 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1138 my ($ev, $x, $y) = @_;
958 1139
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1140 ($x, $y) = ($ev->{x}, $ev->{y});
960 1141
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1142 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update;
963 }; 1143 };
964 } 1144 }
965} 1145}
966 1146
967sub button_up { 1147sub button_up {
… …
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1167
988 my $border = $self->border; 1168 my $border = $self->border;
989 1169
990 glColor @{ $self->{border_bg} }; 1170 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1171 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1172 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1173 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1174 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1175
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1176 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1177 glColor @{ $self->{bg} };
998 1178
999 # TODO: repeat texture not scale 1179 # TODO: repeat texture not scale
1180 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1181 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1182 $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); 1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1184 }
1010 1185
1011 glDisable GL_TEXTURE_2D; 1186 glDisable GL_TEXTURE_2D;
1012 1187
… …
1028sub new { 1203sub new {
1029 my $class = shift; 1204 my $class = shift;
1030 1205
1031 $class->SUPER::new ( 1206 $class->SUPER::new (
1032 col_expand => [], 1207 col_expand => [],
1033 @_ 1208 @_,
1034 ) 1209 )
1210}
1211
1212sub children {
1213 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1214}
1036 1215
1037sub add { 1216sub add {
1038 my ($self, $x, $y, $child) = @_; 1217 my ($self, $x, $y, $child) = @_;
1039 1218
1040 $child->set_parent ($self); 1219 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1220 $self->{children}[$y][$x] = $child;
1042 1221
1043 $child->check_size; 1222 $self->realloc;
1044} 1223}
1045 1224
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# TODO: move to container class maybe? send childs a signal on removal? 1225# TODO: move to container class maybe? send children a signal on removal?
1051sub clear { 1226sub clear {
1052 my ($self) = @_; 1227 my ($self) = @_;
1053 1228
1054 my @children = $self->children; 1229 my @children = $self->children;
1055 delete $self->{children}; 1230 delete $self->{children};
… …
1057 for (@children) { 1232 for (@children) {
1058 delete $_->{parent}; 1233 delete $_->{parent};
1059 $_->hide; 1234 $_->hide;
1060 } 1235 }
1061 1236
1062 $self->update; 1237 $self->realloc;
1063} 1238}
1064 1239
1065sub get_wh { 1240sub get_wh {
1066 my ($self) = @_; 1241 my ($self) = @_;
1067 1242
… …
1098sub size_allocate { 1273sub size_allocate {
1099 my ($self, $w, $h) = @_; 1274 my ($self, $w, $h) = @_;
1100 1275
1101 my ($ws, $hs) = $self->get_wh; 1276 my ($ws, $hs) = $self->get_wh;
1102 1277
1103 my $req_w = sum @$ws; 1278 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1279 my $req_h = (sum @$hs) || 1;
1105 1280
1106 # TODO: nicer code && do row_expand 1281 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1282 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1283 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1284 my $col_expand = (sum @col_expand) || 1;
… …
1163 } 1338 }
1164} 1339}
1165 1340
1166############################################################################# 1341#############################################################################
1167 1342
1168package CFClient::UI::HBox; 1343package CFClient::UI::Box;
1169
1170# TODO: wrap into common Box base class
1171 1344
1172our @ISA = CFClient::UI::Container::; 1345our @ISA = CFClient::UI::Container::;
1173 1346
1174sub size_request { 1347sub size_request {
1175 my ($self) = @_; 1348 my ($self) = @_;
1176 1349
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1350 $self->{vertical}
1178 1351 ? (
1179 ( 1352 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1180 (List::Util::sum map $_->[0], @alloc), 1353 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181 (List::Util::max map $_->[1], @alloc), 1354 )
1182 ) 1355 : (
1356 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1357 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1358 )
1183} 1359}
1184 1360
1185sub size_allocate { 1361sub size_allocate {
1186 my ($self, $w, $h) = @_; 1362 my ($self, $w, $h) = @_;
1187 1363
1188 ($h, $w) = ($w, $h); 1364 my $space = $self->{vertical} ? $h : $w;
1189
1190 my $children = $self->{children}; 1365 my $children = $self->{children};
1191 1366
1192 my @h = map $_->{req_w}, @$children; 1367 my @req;
1193 1368
1194 my $req_h = List::Util::sum @h; 1369 if ($self->{homogeneous}) {
1195 1370 @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 { 1371 } else {
1372 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1373 my $req = List::Util::sum @req;
1374
1375 if ($req > $space) {
1376 # ah well, not enough space
1377 $_ *= $space / $req for @req;
1378 } else {
1200 my $exp = List::Util::sum map $_->{expand}, @$children; 1379 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201 $exp ||= 1;
1202 1380
1381 $space = ($space - $req) / $expand; # remaining space to give away
1382
1383 $req[$_] += $space * $children->[$_]{expand}
1203 for (0 .. $#$children) { 1384 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 } 1385 }
1210 } 1386 }
1211 1387
1212 CFClient::UI::harmonize \@h; 1388 CFClient::UI::harmonize \@req;
1213 1389
1214 my $y = 0; 1390 my $pos = 0;
1215 for (0 .. $#$children) { 1391 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_]; 1392 my $alloc = $req[$_];
1218 $child->configure ($y, 0, $h, $w); 1393 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219 1394
1220 $y += $h; 1395 $pos += $alloc;
1221 } 1396 }
1222 1397
1223 1 1398 1
1224} 1399}
1225 1400
1226############################################################################# 1401#############################################################################
1227 1402
1403package CFClient::UI::HBox;
1404
1405our @ISA = CFClient::UI::Box::;
1406
1407sub new {
1408 my $class = shift;
1409
1410 $class->SUPER::new (
1411 vertical => 0,
1412 @_,
1413 )
1414}
1415
1416#############################################################################
1417
1228package CFClient::UI::VBox; 1418package CFClient::UI::VBox;
1229 1419
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1420our @ISA = CFClient::UI::Box::;
1233 1421
1234sub size_request { 1422sub new {
1235 my ($self) = @_; 1423 my $class = shift;
1236 1424
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1425 $class->SUPER::new (
1238 1426 vertical => 1,
1239 ( 1427 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1428 )
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} 1429}
1283 1430
1284############################################################################# 1431#############################################################################
1285 1432
1286package CFClient::UI::Label; 1433package CFClient::UI::Label;
… …
1297 #bg => none 1444 #bg => none
1298 #active_bg => none 1445 #active_bg => none
1299 #font => default_font 1446 #font => default_font
1300 #text => initial text 1447 #text => initial text
1301 #markup => initial narkup 1448 #markup => initial narkup
1449 #max_w => maximum pixel width
1450 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1451 layout => (new CFClient::Layout),
1303 fontsize => 1, 1452 fontsize => 1,
1304 align => -1, 1453 align => -1,
1305 valign => -1, 1454 valign => -1,
1306 padding => 2, 1455 padding_x => 2,
1456 padding_y => 2,
1307 can_events => 0, 1457 can_events => 0,
1308 %arg 1458 %arg
1309 ); 1459 );
1310 1460
1311 if (exists $self->{template}) { 1461 if (exists $self->{template}) {
… …
1347 $self->{text} = "T$text"; 1497 $self->{text} = "T$text";
1348 1498
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1499 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1500 $self->{layout}->set_text ($text);
1351 1501
1502 $self->realloc;
1352 $self->update; 1503 $self->update;
1353 $self->check_size;
1354} 1504}
1355 1505
1356sub set_markup { 1506sub set_markup {
1357 my ($self, $markup) = @_; 1507 my ($self, $markup) = @_;
1358 1508
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1512 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1513
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1514 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1365 $self->{layout}->set_markup ($markup); 1515 $self->{layout}->set_markup ($markup);
1366 1516
1517 $self->realloc;
1367 $self->update; 1518 $self->update;
1368 $self->check_size;
1369} 1519}
1370 1520
1371sub size_request { 1521sub size_request {
1372 my ($self) = @_; 1522 my ($self) = @_;
1373 1523
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1524 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1525 $self->{layout}->set_width ($self->{max_w} || -1);
1526 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1529
1378 my ($w, $h) = $self->{layout}->size; 1530 my ($w, $h) = $self->{layout}->size;
1379 1531
1380 if (exists $self->{template}) { 1532 if (exists $self->{template}) {
… …
1385 1537
1386 $w = List::Util::max $w, $w2; 1538 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1539 $h = List::Util::max $h, $h2;
1388 } 1540 }
1389 1541
1390 ( 1542 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1543}
1395 1544
1396sub size_allocate { 1545sub size_allocate {
1397 my ($self, $w, $h) = @_; 1546 my ($self, $w, $h) = @_;
1398 1547
1399 delete $self->{texture}; 1548 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1550}
1401 1551
1402sub set_fontsize { 1552sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1553 my ($self, $fontsize) = @_;
1404 1554
1405 $self->{fontsize} = $fontsize; 1555 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1556 delete $self->{texture};
1407 1557
1408 $self->update; 1558 $self->realloc;
1409 $self->check_size;
1410} 1559}
1411 1560
1412sub _draw { 1561sub _draw {
1413 my ($self) = @_; 1562 my ($self) = @_;
1414 1563
… …
1416 1565
1417 my $tex = $self->{texture} ||= do { 1566 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1567 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1568 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1569 $self->{layout}->set_width ($self->{w});
1570 $self->{layout}->set_ellipsise ($self->{ellipsise});
1571 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1573
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1574 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424 1575
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1576 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1577 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1578 : ($self->{w} - $tex->{w}) * 0.5);
1428 1579
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1580 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1581 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1582 : ($self->{h} - $tex->{h}) * 0.5);
1432 1583
1433 $tex 1584 $tex
1434 }; 1585 };
1435 1586
… …
1464 active_fg => [0, 0, 0], 1615 active_fg => [0, 0, 0],
1465 can_hover => 1, 1616 can_hover => 1,
1466 can_focus => 1, 1617 can_focus => 1,
1467 valign => 0, 1618 valign => 0,
1468 can_events => 1, 1619 can_events => 1,
1620 #text => ...
1469 @_ 1621 @_
1470 ) 1622 )
1471} 1623}
1472 1624
1473sub _set_text { 1625sub _set_text {
… …
1483 $self->{text} = $text; 1635 $self->{text} = $text;
1484 1636
1485 $text =~ s/./*/g if $self->{hidden}; 1637 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1638 $self->{layout}->set_text ("$text ");
1487 1639
1488 $self->emit (changed => $self->{text}); 1640 $self->_emit (changed => $self->{text});
1489} 1641}
1490 1642
1491sub set_text { 1643sub set_text {
1492 my ($self, $text) = @_; 1644 my ($self, $text) = @_;
1493 1645
1494 $self->{cursor} = length $text; 1646 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1647 $self->_set_text ($text);
1496 $self->update; 1648
1497 $self->check_size; 1649 $self->realloc;
1498} 1650}
1499 1651
1500sub get_text { 1652sub get_text {
1501 $_[0]{text} 1653 $_[0]{text}
1502} 1654}
… …
1505 my ($self) = @_; 1657 my ($self) = @_;
1506 1658
1507 my ($w, $h) = $self->SUPER::size_request; 1659 my ($w, $h) = $self->SUPER::size_request;
1508 1660
1509 ($w + 1, $h) # add 1 for cursor 1661 ($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} 1662}
1517 1663
1518sub key_down { 1664sub key_down {
1519 my ($self, $ev) = @_; 1665 my ($self, $ev) = @_;
1520 1666
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1681 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1682 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1683 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1684 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1685 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1686 $self->_emit ('escape');
1541 } elsif ($uni) { 1687 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1688 substr $text, $self->{cursor}++, 0, chr $uni;
1543 } 1689 }
1544 1690
1545 $self->_set_text ($text); 1691 $self->_set_text ($text);
1546 $self->update; 1692
1547 $self->check_size; 1693 $self->realloc;
1548} 1694}
1549 1695
1550sub focus_in { 1696sub focus_in {
1551 my ($self) = @_; 1697 my ($self) = @_;
1552 1698
… …
1632 if ($sym == 13) { 1778 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1779 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1780 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1781 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1782 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1783 $self->_emit (activate => $txt);
1638 $self->update; 1784 $self->update;
1639 1785
1640 } elsif ($sym == CFClient::SDLK_UP) { 1786 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1787 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1788 $self->{history_saveback} = $self->get_text;
… …
1679 1825
1680sub new { 1826sub new {
1681 my $class = shift; 1827 my $class = shift;
1682 1828
1683 $class->SUPER::new ( 1829 $class->SUPER::new (
1684 padding => 4, 1830 padding_x => 4,
1831 padding_y => 4,
1685 fg => [1, 1, 1], 1832 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1833 active_fg => [0, 0, 1],
1687 can_hover => 1, 1834 can_hover => 1,
1688 align => 0, 1835 align => 0,
1689 valign => 0, 1836 valign => 0,
1690 can_events => 1, 1837 can_events => 1,
1691 @_ 1838 @_
1692 ) 1839 )
1693} 1840}
1694 1841
1842sub activate { }
1843
1695sub button_up { 1844sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1697 1846
1847 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1848 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1849 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate");
1701 }
1702} 1850}
1703 1851
1704sub _draw { 1852sub _draw {
1705 my ($self) = @_; 1853 my ($self) = @_;
1706 1854
… …
1735 1883
1736sub new { 1884sub new {
1737 my $class = shift; 1885 my $class = shift;
1738 1886
1739 $class->SUPER::new ( 1887 $class->SUPER::new (
1740 padding => 2, 1888 padding_x => 2,
1889 padding_y => 2,
1741 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 1891 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 1892 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 1893 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 1894 state => 0,
… …
1749} 1898}
1750 1899
1751sub size_request { 1900sub size_request {
1752 my ($self) = @_; 1901 my ($self) = @_;
1753 1902
1754 ($self->{padding} * 2 + 6) x 2 1903 (6) x 2
1755} 1904}
1756 1905
1757sub button_down { 1906sub button_down {
1758 my ($self, $ev, $x, $y) = @_; 1907 my ($self, $ev, $x, $y) = @_;
1759 1908
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 1911 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1912 $self->_emit (changed => $self->{state});
1764 } 1913 }
1765} 1914}
1766 1915
1767sub _draw { 1916sub _draw {
1768 my ($self) = @_; 1917 my ($self) = @_;
1769 1918
1770 $self->SUPER::_draw; 1919 $self->SUPER::_draw;
1771 1920
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1921 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 1922
1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1923 my ($w, $h) = @$self{qw(w h)};
1924
1925 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1775 1926
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1927 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 1928
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1929 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 1930
… …
2043 my $self = $class->SUPER::new ( 2194 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2195 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2196 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2197 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2198 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2199 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2200 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2201 min_h => $::WIDTH / 80,
2051 vertical => 0, 2202 vertical => 0,
2052 can_hover => 1, 2203 can_hover => 1,
2053 inner_pad => .05, 2204 inner_pad => 0.02,
2054 @_ 2205 @_
2055 ); 2206 );
2056 2207
2057 $self->set_value ($self->{range}[0]); 2208 $self->set_value ($self->{range}[0]);
2058 $self->update; 2209 $self->update;
2059 2210
2060 $self 2211 $self
2061} 2212}
2062 2213
2214sub changed { }
2215
2216sub set_range {
2217 my ($self, $range) = @_;
2218
2219 ($range, $self->{range}) = ($self->{range}, $range);
2220
2221 $self->update
2222 if "@$range" ne "@{$self->{range}}";
2223}
2224
2063sub set_value { 2225sub set_value {
2064 my ($self, $value) = @_; 2226 my ($self, $value) = @_;
2065 2227
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2228 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2229
2068 $hi = $lo + 1 if $hi <= $lo; 2230 $hi = $lo + 1 if $hi <= $lo;
2069 2231
2232 $page = $hi - $lo if $page > $hi - $lo;
2233
2070 $value = $lo if $value < $lo; 2234 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2235 $value = $hi - $page if $value > $hi - $page;
2072 2236
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2237 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2238 if $unit;
2075 2239
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2240 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2241
2080 if ($value != $old_value) { 2242 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2243 $self->_emit (changed => $value);
2082 $self->update; 2244 $self->update;
2083 } 2245 }
2084} 2246}
2085 2247
2086sub size_request { 2248sub size_request {
2087 my ($self) = @_; 2249 my ($self) = @_;
2088 2250
2089 my $w = $self->{req_w}; 2251 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2252}
2094 2253
2095sub button_down { 2254sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
2097 2256
2098 $self->SUPER::button_down ($ev, $x, $y); 2257 $self->SUPER::button_down ($ev, $x, $y);
2258
2259 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260
2099 $self->mouse_motion ($ev, $x, $y); 2261 $self->mouse_motion ($ev, $x, $y);
2100} 2262}
2101 2263
2102sub mouse_motion { 2264sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2265 my ($self, $ev, $x, $y) = @_;
… …
2105 if ($GRAB == $self) { 2267 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2268 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2269
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2270 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2271
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2272 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2273
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2274 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113 } 2275 }
2114} 2276}
2115 2277
2116sub update { 2278sub update {
2117 my ($self) = @_; 2279 my ($self) = @_;
2118 2280
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2281 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2282 $self->set_value ($self->{range}[0]);
2121 2283
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2284 my ($value, $lo, $hi, $page) = @{$self->{range}};
2285 my $range = ($hi - $page - $lo) || 1e-100;
2123 2286
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2287 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2288
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2289 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2290 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2291
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2292 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2293 $value = $value * $self->{scale} + $self->{offset};
2130 2294
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; 2295 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2296 $self->{knob_w} = $knob_w;
2138 }); 2297 });
2139 2298
2140 $self->SUPER::update; 2299 $self->SUPER::update;
2141} 2300}
2142 2301
… …
2148 glScale $self->{w}, $self->{h}; 2307 glScale $self->{w}, $self->{h};
2149 2308
2150 if ($self->{vertical}) { 2309 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2310 # draw a vertical slider like a rotated horizontal slider
2152 2311
2312 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2313 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2314 }
2156 2315
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2316 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2317 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2318
… …
2166 # draw handle 2325 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2326 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2327
2169 glDisable GL_TEXTURE_2D; 2328 glDisable GL_TEXTURE_2D;
2170} 2329}
2330
2331#############################################################################
2332
2333package CFClient::UI::ValSlider;
2334
2335our @ISA = CFClient::UI::HBox::;
2336
2337sub new {
2338 my ($class, %arg) = @_;
2339
2340 my $range = delete $arg{range};
2341
2342 my $self = $class->SUPER::new (
2343 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2344 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2345 to_value => sub { shift },
2346 from_value => sub { shift },
2347 %arg,
2348 );
2349
2350 $self->{slider}->connect (changed => sub {
2351 my ($self, $value) = @_;
2352 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2353 $self->{parent}->emit (changed => $value);
2354 });
2355
2356# $self->{entry}->connect (changed => sub {
2357# my ($self, $value) = @_;
2358# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2359# $self->{parent}->emit (changed => $value);
2360# });
2361
2362 $self->add ($self->{slider}, $self->{entry});
2363
2364 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2365
2366 $self
2367}
2368
2369sub set_range { shift->{slider}->set_range (@_) }
2370sub set_value { shift->{slider}->set_value (@_) }
2171 2371
2172############################################################################# 2372#############################################################################
2173 2373
2174package CFClient::UI::TextView; 2374package CFClient::UI::TextView;
2175 2375
… …
2205 2405
2206 $self->{fontsize} = $fontsize; 2406 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2407 $self->reflow;
2208} 2408}
2209 2409
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 { 2410sub size_allocate {
2230 my ($self, $w, $h) = @_; 2411 my ($self, $w, $h) = @_;
2231 2412
2232 $self->SUPER::size_allocate ($w, $h); 2413 $self->SUPER::size_allocate ($w, $h);
2233 2414
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2417 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2418
2238 $self->reflow; 2419 $self->reflow;
2239} 2420}
2240 2421
2422sub text_size {
2423 my ($self, $text, $indent) = @_;
2424
2425 my $layout = $self->{layout};
2426
2427 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2428 $layout->set_width ($self->{children}[0]{w} - $indent);
2429 $layout->set_markup ($text);
2430
2431 $layout->size
2432}
2433
2434sub reflow {
2435 my ($self) = @_;
2436
2437 $self->{need_reflow}++;
2438 $self->update;
2439}
2440
2441sub set_offset {
2442 my ($self, $offset) = @_;
2443
2444 # todo: base offset on lines or so, not on pixels
2445 $self->{children}[1]->set_value ($offset);
2446}
2447
2448sub clear {
2449 my ($self) = @_;
2450
2451 $self->{par} = [];
2452 $self->{height} = 0;
2453 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2454}
2455
2241sub add_paragraph { 2456sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2457 my ($self, $color, $text, $indent) = @_;
2243 2458
2244 #TODO: intelligently "reformat" paragraph 2459 for my $line (split /\n/, $text) {
2245 2460 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2461 $self->{height} += $h;
2462 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2463 }
2249 2464
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2465 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2466}
2255 2467
2256sub update { 2468sub update {
2257 my ($self) = @_; 2469 my ($self) = @_;
2258 2470
… …
2261 return unless $self->{h} > 0; 2473 return unless $self->{h} > 0;
2262 2474
2263 delete $self->{texture}; 2475 delete $self->{texture};
2264 2476
2265 $ROOT->on_post_alloc ($self, sub { 2477 $ROOT->on_post_alloc ($self, sub {
2478 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479
2266 if (delete $self->{need_reflow}) { 2480 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2481 my $height = 0;
2268 2482
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2483 my $layout = $self->{layout};
2484
2485 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486
2270 for @{$self->{par}}; 2487 for (@{$self->{par}}) {
2488 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2489 $layout->set_width ($W - $_->[3]);
2490 $layout->set_markup ($_->[4]);
2491 my ($w, $h) = $layout->size;
2492 $_->[0] = $w + $_->[3];
2493 $_->[1] = $h;
2494 }
2495
2496 $height += $_->[1];
2497 }
2271 2498
2272 $self->{height} = $height; 2499 $self->{height} = $height;
2273 2500
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2501 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2502
2276 delete $self->{texture}; 2503 delete $self->{texture};
2277 } 2504 }
2278 2505
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2506 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2507 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2508 glClear GL_COLOR_BUFFER_BIT;
2282 2509
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]; 2510 my $top = int $self->{children}[1]{range}[0];
2287 2511
2288 my $y0 = $top; 2512 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2513 my $y1 = $top + $H;
2290 2514
2291 my $y = 0; 2515 my $y = 0;
2292 2516
2293 my $layout = $self->{layout}; 2517 my $layout = $self->{layout};
2294 2518
2295 $layout->set_font ($self->{font}) if $self->{font}; 2519 $layout->set_font ($self->{font}) if $self->{font};
2296 2520
2521 glEnable GL_BLEND;
2522 #TODO# not correct in windows where rgba is forced off
2523 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2524
2297 for my $par (@{$self->{par}}) { 2525 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2526 my $h = $par->[1];
2299 2527
2300 if ($y0 < $y + $h && $y < $y1) { 2528 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2529 $layout->set_foreground (@{ $par->[2] });
2530 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2531 $layout->set_markup ($par->[4]);
2303 2532
2304 my ($W, $H) = $layout->size; 2533 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2534
2535 glRasterPos $par->[3], $y - $y0;
2536 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2537 }
2307 2538
2308 $y += $h; 2539 $y += $h;
2309 } 2540 }
2310 2541
2311 glDisable GL_TEXTURE_2D; 2542 glDisable GL_BLEND;
2312 }; 2543 };
2313 }); 2544 });
2314} 2545}
2315 2546
2316sub _draw { 2547sub _draw {
2317 my ($self) = @_; 2548 my ($self) = @_;
2318 2549
2319 glEnable GL_TEXTURE_2D; 2550 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2552 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2553 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2554 glDisable GL_TEXTURE_2D;
2324 2555
2325 $self->{children}[1]->draw; 2556 $self->{children}[1]->draw;
2326 2557
2327} 2558}
… …
2376 2607
2377sub new { 2608sub new {
2378 my $class = shift; 2609 my $class = shift;
2379 2610
2380 my $self = $class->SUPER::new ( 2611 my $self = $class->SUPER::new (
2381 state => 0, 2612 state => 0,
2382 connect_activate => \&toggle_flopper, 2613 on_activate => \&toggle_flopper,
2383 @_ 2614 @_
2384 ); 2615 );
2385 2616
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2617 $self
2392} 2618}
2393 2619
2394sub toggle_flopper { 2620sub toggle_flopper {
2395 my ($self) = @_; 2621 my ($self) = @_;
2396 2622
2397 # TODO: use animation 2623 $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} 2624}
2409 2625
2410############################################################################# 2626#############################################################################
2411 2627
2412package CFClient::UI::Tooltip; 2628package CFClient::UI::Tooltip;
… …
2425} 2641}
2426 2642
2427sub set_tooltip_from { 2643sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2644 my ($self, $widget) = @_;
2429 2645
2646 my $tooltip = $widget->{tooltip};
2647
2648 if ($ENV{CFPLUS_DEBUG} & 2) {
2649 $tooltip .= "\n\n" . (ref $widget) . "\n"
2650 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2651 . "req $widget->{req_w} $widget->{req_h}\n"
2652 . "visible $widget->{visible}";
2653 }
2654
2430 $self->add (new CFClient::UI::Label 2655 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2656 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2657 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2658 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2659 fg => [0, 0, 0, 1],
2660 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2661 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2662 );
2437} 2663}
2438 2664
2439sub size_request { 2665sub size_request {
2440 my ($self) = @_; 2666 my ($self) = @_;
… …
2446 2672
2447sub size_allocate { 2673sub size_allocate {
2448 my ($self, $w, $h) = @_; 2674 my ($self, $w, $h) = @_;
2449 2675
2450 $self->SUPER::size_allocate ($w - 4, $h - 4); 2676 $self->SUPER::size_allocate ($w - 4, $h - 4);
2677}
2678
2679sub visibility_change {
2680 my ($self, $visible) = @_;
2681
2682 return unless $visible;
2683
2684 $self->{root}->on_post_alloc ("move_$self" => sub {
2685 my $widget = $self->{owner}
2686 or return;
2687
2688 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2689
2690 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2691 if $x + $self->{w} > $::WIDTH;
2692
2693 $self->move_abs ($x, $y);
2694 });
2451} 2695}
2452 2696
2453sub _draw { 2697sub _draw {
2454 my ($self) = @_; 2698 my ($self) = @_;
2455 2699
… …
2472 glVertex $w, $h; 2716 glVertex $w, $h;
2473 glVertex $w, 0; 2717 glVertex $w, 0;
2474 glEnd; 2718 glEnd;
2475 2719
2476 glTranslate 2 - 0.375, 2 - 0.375; 2720 glTranslate 2 - 0.375, 2 - 0.375;
2721
2477 $self->SUPER::_draw; 2722 $self->SUPER::_draw;
2478} 2723}
2479 2724
2480############################################################################# 2725#############################################################################
2481 2726
… …
2486use CFClient::OpenGL; 2731use CFClient::OpenGL;
2487 2732
2488sub new { 2733sub new {
2489 my $class = shift; 2734 my $class = shift;
2490 2735
2491 $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2492 aspect => 1, 2737 aspect => 1,
2738 can_events => 0,
2493 @_, 2739 @_,
2494 ) 2740 );
2741
2742 if ($self->{anim} && $self->{animspeed}) {
2743 Scalar::Util::weaken (my $widget = $self);
2744
2745 $self->{timer} = Event->timer (
2746 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2747 hard => 1,
2748 interval => $self->{animspeed},
2749 cb => sub {
2750 ++$widget->{frame};
2751 $widget->update;
2752 },
2753 );
2754 }
2755
2756 $self
2495} 2757}
2496 2758
2497sub size_request { 2759sub size_request {
2498 (32, 8) 2760 (32, 8)
2499} 2761}
2500 2762
2763sub update {
2764 my ($self) = @_;
2765
2766 return unless $self->{visible};
2767
2768 $self->SUPER::update;
2769}
2770
2501sub _draw { 2771sub _draw {
2502 my ($self) = @_; 2772 my ($self) = @_;
2503 2773
2504 return unless $::CONN;#d# manage and cache textures differently 2774 return unless $::CONN;
2775
2776 my $face;
2777
2778 if ($self->{frame}) {
2779 my $anim = $::CONN->{anim}[$self->{anim}];
2780
2781 $face = $anim->[ $self->{frame} % @$anim ]
2782 if $anim && @$anim;
2783 }
2784
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2785 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2786
2507 # TODO animation
2508 if ($tex) { 2787 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2788 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2790 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2792 glDisable GL_TEXTURE_2D;
2514 } 2793 }
2515} 2794}
2516 2795
2517############################################################################# 2796sub DESTROY {
2518
2519package CFClient::UI::InventoryItem;
2520
2521our @ISA = CFClient::UI::HBox::;
2522
2523sub _item_to_desc {
2524 my ($item) = @_; 2797 my ($self) = @_;
2525 2798
2526 my $desc = 2799 $self->{timer}->cancel
2527 $item->{nrof} < 2 2800 if $self->{timer};
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530 2801
2531 $item->{flags} & Crossfire::Protocol::F_OPEN 2802 $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} 2803}
2666 2804
2667############################################################################# 2805#############################################################################
2668 2806
2669package CFClient::UI::Menu; 2807package CFClient::UI::Menu;
… …
2704 2842
2705# popup given the event (must be a mouse button down event currently) 2843# popup given the event (must be a mouse button down event currently)
2706sub popup { 2844sub popup {
2707 my ($self, $ev) = @_; 2845 my ($self, $ev) = @_;
2708 2846
2709 $self->emit ("popdown"); 2847 $self->_emit ("popdown");
2710 2848
2711 # maybe save $GRAB? must be careful about events... 2849 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self; 2850 $GRAB = $self;
2713 $self->{button} = $ev->{button}; 2851 $self->{button} = $ev->{button};
2714 2852
2715 $self->show; 2853 $self->show;
2716 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2854 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2717} 2855}
2718 2856
2719sub mouse_motion { 2857sub mouse_motion {
2720 my ($self, $ev, $x, $y) = @_; 2858 my ($self, $ev, $x, $y) = @_;
2721 2859
… …
2729 2867
2730 if ($ev->{button} == $self->{button}) { 2868 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB; 2869 undef $GRAB;
2732 $self->hide; 2870 $self->hide;
2733 2871
2734 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover}; 2873 $self->{hover}[1]->() if $self->{hover};
2736 } 2874 }
2737} 2875}
2738 2876
2739############################################################################# 2877#############################################################################
… …
2774 # TODO: doesn't handle markup well (read as: at all) 2912 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1 2913 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}" 2914 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text}; 2915 : $item->{text};
2778 2916
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) { 2917 for ($short) {
2782 s/^\s+//; 2918 s/^\s+//;
2783 s/\s+/ /g; 2919 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 } 2920 }
2787 2921
2788 new CFClient::UI::Label 2922 new CFClient::UI::Label
2789 markup => $short, 2923 markup => $short,
2790 tooltip => $item->{tooltip}, 2924 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP, 2925 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67, 2926 tooltip_width => 0.67,
2793 fontsize => $fontsize, 2927 fontsize => $item->{fontsize} || $self->{fontsize},
2928 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 2929 fg => $item->{fg},
2795 can_events => 1, 2930 can_events => 1,
2796 can_hover => 1 2931 can_hover => 1
2797 }; 2932 };
2798 } 2933 }
… …
2804sub add { 2939sub add {
2805 my ($self, $text, %arg) = @_; 2940 my ($self, $text, %arg) = @_;
2806 2941
2807 $text =~ s/^\s+//; 2942 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2943 $text =~ s/\s+$//;
2944
2945 return unless $text;
2809 2946
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2947 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2948
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2949 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2950
… …
2835 } 2972 }
2836 2973
2837 $self->reorder; 2974 $self->reorder;
2838} 2975}
2839 2976
2977sub reconfigure {
2978 my ($self) = @_;
2979
2980 delete $_->{label}
2981 for values %{ $self->{item} || {} };
2982
2983 $self->reorder;
2984 $self->SUPER::reconfigure;
2985}
2986
2840############################################################################# 2987#############################################################################
2841 2988
2842package CFClient::UI::Root; 2989package CFClient::UI::Inventory;
2843 2990
2844our @ISA = CFClient::UI::Container::; 2991our @ISA = CFClient::UI::ScrolledWindow::;
2845
2846use CFClient::OpenGL;
2847 2992
2848sub new { 2993sub new {
2849 my $class = shift; 2994 my $class = shift;
2850 2995
2851 $class->SUPER::new ( 2996 my $self = $class->SUPER::new (
2997 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2852 @_, 2998 @_,
2853 ) 2999 );
2854}
2855 3000
2856sub configure { 3001 $self
3002}
3003
3004sub set_items {
3005 my ($self, $items) = @_;
3006
3007 $self->{scrolled}->clear;
3008 return unless $items;
3009
3010 my @items = sort {
3011 ($a->{type} <=> $b->{type})
3012 or ($a->{name} cmp $b->{name})
3013 } @$items;
3014
3015 $self->{real_items} = \@items;
3016
3017 my $row = 0;
3018 for my $item (@items) {
3019 CFClient::Item::update_widgets $item;
3020
3021 $self->{scrolled}->add (0, $row, $item->{face_widget});
3022 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3023 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3024
3025 $row++;
3026 }
3027}
3028
3029#############################################################################
3030
3031package CFClient::UI::BindEditor;
3032
3033our @ISA = CFClient::UI::FancyFrame::;
3034
3035sub new {
3036 my $class = shift;
3037
3038 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3039
3040 $self->add (my $vb = new CFClient::UI::VBox);
3041
3042
3043 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3044 text => "start recording",
3045 tooltip => "Start/Stops recording of actions."
3046 ."All subsequent actions after the recording started will be captured."
3047 ."The actions are displayed after the record was stopped."
3048 ."To bind the action you have to click on the 'Bind' button",
3049 on_activate => sub {
3050 unless ($self->{recording}) {
3051 $self->start;
3052 } else {
3053 $self->stop;
3054 }
3055 });
3056
3057 $vb->add (new CFClient::UI::Label text => "Actions:");
3058 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3059
3060 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3061 $vb->add (my $hb = new CFClient::UI::HBox);
3062 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3063 $hb->add (new CFClient::UI::Button
3064 text => "bind",
3065 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3066 on_activate => sub {
3067 $self->ask_for_bind;
3068 });
3069
3070 $vb->add (my $hb = new CFClient::UI::HBox);
3071 $hb->add (new CFClient::UI::Button
3072 text => "ok",
3073 expand => 1,
3074 tooltip => "This closes the binding editor and saves the binding",
3075 on_activate => sub {
3076 $self->hide;
3077 $self->commit;
3078 });
3079
3080 $hb->add (new CFClient::UI::Button
3081 text => "cancel",
3082 expand => 1,
3083 tooltip => "This closes the binding editor without saving",
3084 on_activate => sub {
3085 $self->hide;
3086 $self->{binding_cancel}->()
3087 if $self->{binding_cancel};
3088 });
3089
3090 $self->update_binding_widgets;
3091
3092 $self
3093}
3094
3095sub commit {
3096 my ($self) = @_;
3097 my ($mod, $sym, $cmds) = $self->get_binding;
3098 if ($sym != 0 && @$cmds > 0) {
3099 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3100 ."'. Don't forget 'Save Config'!");
3101 $self->{binding_change}->($mod, $sym, $cmds)
3102 if $self->{binding_change};
3103 } else {
3104 $::STATUSBOX->add ("No action bound, no key or action specified!");
3105 $self->{binding_cancel}->()
3106 if $self->{binding_cancel};
3107 }
3108}
3109
3110sub start {
3111 my ($self) = @_;
3112
3113 $self->{rec_btn}->set_text ("stop recording");
3114 $self->{recording} = 1;
3115 $self->clear_command_list;
3116 $::CONN->start_record if $::CONN;
3117}
3118
3119sub stop {
3120 my ($self) = @_;
3121
3122 $self->{rec_btn}->set_text ("start recording");
3123 $self->{recording} = 0;
3124
3125 my $rec;
3126 $rec = $::CONN->stop_record if $::CONN;
3127 return unless ref $rec eq 'ARRAY';
3128 $self->set_command_list ($rec);
3129}
3130
3131# if $commit is true, the binding will be set after the user entered a key combo
3132sub ask_for_bind {
3133 my ($self, $commit) = @_;
3134
3135 CFClient::Binder::open_binding_dialog (sub {
3136 my ($mod, $sym) = @_;
3137 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3138 $self->update_binding_widgets;
3139 $self->commit if $commit;
3140 });
3141}
3142
3143# $mod and $sym are the modifiers and key symbol
3144# $cmds is a array ref of strings (the commands)
3145# $cb is the callback that is executed on OK
3146# $ccb is the callback that is executed on CANCEL and
3147# when the binding was unsuccessful on OK
3148sub set_binding {
2857 my ($self, $x, $y, $w, $h) = @_; 3149 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2858 3150
2859 $self->{w} = $w; 3151 $self->clear_command_list;
2860 $self->{h} = $h; 3152 $self->{recording} = 0;
2861} 3153 $self->{rec_btn}->set_text ("start recording");
2862 3154
2863sub check_size { 3155 $self->{binding} = [$mod, $sym];
3156 $self->{commands} = $cmds;
3157
3158 $self->{binding_change} = $cb;
3159 $self->{binding_cancel} = $ccb;
3160
3161 $self->update_binding_widgets;
3162}
3163
3164# this is a shortcut method that asks for a binding
3165# and then just binds it.
3166sub do_quick_binding {
2864 my ($self) = @_; 3167 my ($self, $cmds) = @_;
3168 $self->set_binding (undef, undef, $cmds, sub {
3169 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3170 });
3171 $self->ask_for_bind (1);
3172}
2865 3173
2866 $self->size_allocate ($self->{w}, $self->{h}) 3174sub update_binding_widgets {
2867 if $self->{w}; 3175 my ($self) = @_;
3176 my ($mod, $sym, $cmds) = $self->get_binding;
3177 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3178 $self->set_command_list ($cmds);
3179}
3180
3181sub get_binding {
3182 my ($self) = @_;
3183 return (
3184 $self->{binding}->[0],
3185 $self->{binding}->[1],
3186 [ grep { defined $_ } @{$self->{commands}} ]
3187 );
3188}
3189
3190sub clear_command_list {
3191 my ($self) = @_;
3192 $self->{cmdbox}->clear ();
3193}
3194
3195sub set_command_list {
3196 my ($self, $cmds) = @_;
3197
3198 $self->{cmdbox}->clear ();
3199 $self->{commands} = $cmds;
3200
3201 my $idx = 0;
3202
3203 for (@$cmds) {
3204 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3205
3206 my $i = $idx;
3207 $hb->add (new CFClient::UI::Label text => $_);
3208 $hb->add (new CFClient::UI::Button
3209 text => "delete",
3210 tooltip => "Deletes the action from the record",
3211 on_activate => sub {
3212 $self->{cmdbox}->remove ($hb);
3213 $cmds->[$i] = undef;
3214 });
3215
3216
3217 $idx++
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::SpellList;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (new CFClient::UI::ScrolledWindow
3233 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3234
3235 $self;
3236}
3237
3238# XXX: Do sorting? Argl...
3239sub add_spell {
3240 my ($self, $spell) = @_;
3241 $self->{spells}->{$spell->{name}} = $spell;
3242
3243 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244 face => $spell->{face},
3245 can_hover => 1,
3246 can_events => 1,
3247 tooltip => $spell->{message});
3248
3249 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => $spell->{name},
3251 can_hover => 1,
3252 can_events => 1,
3253 tooltip => $spell->{message},
3254 expand => 1);
3255
3256 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259 expand => 1);
3260
3261 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262 text => "bind to key",
3263 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264}
3265
3266sub rebuild_spell_list {
3267 my ($self) = @_;
3268 $self->{tbl_idx} = 0;
3269 $self->add_spell ($_) for values %{$self->{spells}};
3270}
3271
3272sub remove_spell {
3273 my ($self, $spell) = @_;
3274 delete $self->{spells}->{$spell->{name}};
3275 $self->rebuild_spell_list;
3276}
3277
3278#############################################################################
3279
3280package CFClient::UI::Root;
3281
3282our @ISA = CFClient::UI::Container::;
3283
3284use CFClient::OpenGL;
3285
3286sub new {
3287 my $class = shift;
3288
3289 my $self = $class->SUPER::new (
3290 visible => 1,
3291 @_,
3292 );
3293
3294 Scalar::Util::weaken ($self->{root} = $self);
3295
3296 $self
2868} 3297}
2869 3298
2870sub size_request { 3299sub size_request {
2871 my ($self) = @_; 3300 my ($self) = @_;
2872 3301
2873 ($self->{w}, $self->{h}) 3302 ($self->{w}, $self->{h})
3303}
3304
3305sub _to_pixel {
3306 my ($coord, $size, $max) = @_;
3307
3308 $coord =
3309 $coord eq "center" ? ($max - $size) * 0.5
3310 : $coord eq "max" ? $max
3311 : $coord;
3312
3313 $coord = 0 if $coord < 0;
3314 $coord = $max - $size if $coord > $max - $size;
3315
3316 int $coord + 0.5
2874} 3317}
2875 3318
2876sub size_allocate { 3319sub size_allocate {
2877 my ($self, $w, $h) = @_; 3320 my ($self, $w, $h) = @_;
2878 3321
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) { 3322 for my $child ($self->children) {
2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3323 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2887 3324
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3325 $X = $child->{force_x} if exists $child->{force_x};
2889 if exists $child->{req_x}; 3326 $Y = $child->{force_y} if exists $child->{force_y};
2890 3327
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3328 $X = _to_pixel $X, $W, $self->{w};
2892 if exists $child->{req_y}; 3329 $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 3330
2897 $child->configure ($X, $Y, $W, $H); 3331 $child->configure ($X, $Y, $W, $H);
2898 } 3332 }
2899} 3333}
2900 3334
… …
2911} 3345}
2912 3346
2913sub update { 3347sub update {
2914 my ($self) = @_; 3348 my ($self) = @_;
2915 3349
2916 $self->check_size;
2917 $::WANT_REFRESH++; 3350 $::WANT_REFRESH++;
2918} 3351}
2919 3352
2920sub add { 3353sub add {
2921 my ($self, @children) = @_; 3354 my ($self, @children) = @_;
2922 3355
2923 for my $child (@children) {
2924 $child->{toplevel} = 1; 3356 $_->{is_toplevel} = 1
2925 3357 for @children;
2926 # integerise window positions
2927 $child->{x} = int $child->{x};
2928 $child->{y} = int $child->{y};
2929 }
2930 3358
2931 $self->SUPER::add (@children); 3359 $self->SUPER::add (@children);
3360}
3361
3362sub remove {
3363 my ($self, @children) = @_;
3364
3365 $self->SUPER::remove (@children);
3366
3367 delete $self->{is_toplevel}
3368 for @children;
3369
3370 while (@children) {
3371 my $w = pop @children;
3372 push @children, $w->children;
3373 $w->set_invisible;
3374 }
2932} 3375}
2933 3376
2934sub on_refresh { 3377sub on_refresh {
2935 my ($self, $id, $cb) = @_; 3378 my ($self, $id, $cb) = @_;
2936 3379
… …
2949 while ($self->{refresh_hook}) { 3392 while ($self->{refresh_hook}) {
2950 $_->() 3393 $_->()
2951 for values %{delete $self->{refresh_hook}}; 3394 for values %{delete $self->{refresh_hook}};
2952 } 3395 }
2953 3396
2954 if ($self->{check_size}) { 3397 if ($self->{realloc}) {
2955 my @queue = ([], []); 3398 my %queue;
3399 my @queue;
3400 my $widget;
2956 3401
2957 for (;;) { 3402 outer:
2958 if ($self->{check_size}) { 3403 while () {
2959 # heuristic: check containers last 3404 if (my $realloc = delete $self->{realloc}) {
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3405 for $widget (values %$realloc) {
2961 for values %{delete $self->{check_size}} 3406 $widget->{visible} or next; # do not resize invisible widgets
3407
3408 $queue{$widget+0}++ and next; # duplicates are common
3409
3410 push @{ $queue[$widget->{visible}] }, $widget;
3411 }
2962 } 3412 }
2963 3413
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3414 while () {
3415 @queue or last outer;
2965 3416
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3417 $widget = pop @{ $queue[-1] || [] }
2967 ? @$widget{qw(user_w user_h)} 3418 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 3419
3420 pop @queue;
3421 }
3422
3423 delete $queue{$widget+0};
3424
3425 my ($w, $h) = $widget->size_request;
3426
3427 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3429
3430 $w = $widget->{force_w} if exists $widget->{force_w};
3431 $h = $widget->{force_h} if exists $widget->{force_h};
3432
3433 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3434 || delete $widget->{force_realloc}) {
2974 $widget->{req_w} = $w; 3435 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h; 3436 $widget->{req_h} = $h;
2976 3437
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3438 $self->{size_alloc}{$widget+0} = $widget;
2978 3439
2979 $widget->{parent}->check_size
2980 if $widget->{parent}; 3440 if (my $parent = $widget->{parent}) {
3441 $self->{realloc}{$parent+0} = $parent
3442 unless $queue{$parent+0};
3443
3444 $parent->{force_size_alloc} = 1;
3445 $self->{size_alloc}{$parent+0} = $parent;
3446 }
2981 } 3447 }
3448
3449 delete $self->{realloc}{$widget+0};
2982 } 3450 }
2983 } 3451 }
2984 3452
2985 while ($self->{size_alloc}) { 3453 while (my $size_alloc = delete $self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) { 3454 my @queue = sort { $b->{visible} <=> $a->{visible} }
2987 my ($widget, $w, $h) = @$_; 3455 values %$size_alloc;
3456
3457 while () {
3458 my $widget = pop @queue || last;
3459
3460 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2988 3461
2989 $w = 0 if $w < 0; 3462 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0; 3463 $h = 0 if $h < 0;
2991 3464
3465 $w = int $w + 0.5;
3466 $h = int $h + 0.5;
3467
3468 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3469 $widget->{old_w} = $widget->{w};
3470 $widget->{old_h} = $widget->{h};
3471
2992 $widget->{w} = $w; 3472 $widget->{w} = $w;
2993 $widget->{h} = $h; 3473 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h); 3474
2995 $widget->emit (size_allocate => $w, $h); 3475 $widget->emit (size_allocate => $w, $h);
3476 }
2996 } 3477 }
2997 } 3478 }
2998 3479
2999 while ($self->{post_alloc_hook}) { 3480 while ($self->{post_alloc_hook}) {
3000 $_->() 3481 $_->()
3001 for values %{delete $self->{post_alloc_hook}}; 3482 for values %{delete $self->{post_alloc_hook}};
3002 } 3483 }
3003 3484
3485
3004 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3486 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3487 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006 glClear GL_COLOR_BUFFER_BIT; 3488 glClear GL_COLOR_BUFFER_BIT;
3007 3489
3008 glMatrixMode GL_PROJECTION; 3490 glMatrixMode GL_PROJECTION;
3009 glLoadIdentity; 3491 glLoadIdentity;
3010 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3492 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011 glMatrixMode GL_MODELVIEW; 3493 glMatrixMode GL_MODELVIEW;
3012 glLoadIdentity; 3494 glLoadIdentity;
3013 3495
3496 {
3497 package CFClient::UI::Base;
3498
3499 ($draw_x, $draw_y, $draw_w, $draw_h) =
3500 (0, 0, $self->{w}, $self->{h});
3501 }
3502
3014 $self->_draw; 3503 $self->_draw;
3015} 3504}
3016 3505
3017############################################################################# 3506#############################################################################
3018 3507
3019package CFClient::UI; 3508package CFClient::UI;
3020 3509
3021$ROOT = new CFClient::UI::Root; 3510$ROOT = new CFClient::UI::Root;
3022$TOOLTIP = new CFClient::UI::Tooltip; 3511$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023 3512
30241 35131
3025 3514

Diff Legend

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