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.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 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) = @_;
… …
144 157
145 $_->update 158 $_->update
146 for @widgets; 159 for @widgets;
147} 160}
148 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
149# call when resolution changes etc. 170# call when resolution changes etc.
150sub rescale_widgets { 171sub rescale_widgets {
151 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
152 173
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $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
166 } 189 }
167
168 $widget->reconfigure;
169 } 190 }
191
192 reconfigure_widgets;
170} 193}
171 194
172############################################################################# 195#############################################################################
173 196
174package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 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 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
… …
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub hide { 254sub set_visible {
217 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};
218 278
219 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
220 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
221 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
222 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
223 if $self->{parent}; 313 if $self->{parent};
224} 314}
225 315
226sub move { 316sub move_abs {
227 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
228 318
229 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
230 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
231 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
232 322
233 $self->update; 323 $self->update;
234} 324}
235 325
236sub set_size { 326sub set_size {
237 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
238 328
239 $self->{user_w} = $w; 329 $self->{force_w} = $w;
240 $self->{user_h} = $h; 330 $self->{force_h} = $h;
241 331
242 $self->check_size; 332 $self->realloc;
243} 333}
244 334
245sub size_request { 335sub size_request {
246 require Carp; 336 require Carp;
247 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
249 339
250sub configure { 340sub configure {
251 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
252 342
253 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
254 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
255 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
256 348
257 # use alignment to adjust x, y 349 # use alignment to adjust x, y
258 350
259 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
260 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
261
262 ($w, $h) = ($w2, $h2);
263 } 353 }
264 354
265 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
266 $self->{x} = $x; 356 $self->{x} = $x;
267 $self->{y} = $y; 357 $self->{y} = $y;
268 $self->update; 358 $self->update;
269 } 359 }
270 360
271 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
272 $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;
273 } 368 }
274} 369}
275 370
276sub size_allocate { 371sub size_allocate {
277 # nothing to be done 372 # nothing to be done
278} 373}
279 374
280sub reconfigure {
281 my ($self) = @_;
282
283 $self->check_size (1);
284 $self->update;
285}
286
287sub children { 375sub children {
288} 376}
289 377
290sub set_max_size { 378sub set_max_size {
291 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
… …
294 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
295} 383}
296 384
297sub set_tooltip { 385sub set_tooltip {
298 my ($self, $tooltip) = @_; 386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
299 392
300 $self->{tooltip} = $tooltip; 393 $self->{tooltip} = $tooltip;
301 394
302 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303 delete $CFClient::UI::TOOLTIP->{owner}; 396 delete $CFClient::UI::TOOLTIP->{owner};
… …
325 return if $FOCUS == $self; 418 return if $FOCUS == $self;
326 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
327 420
328 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
329 422
330 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
331 424
332 $focus->update if $focus; 425 $focus->update if $focus;
333 $FOCUS->update; 426 $FOCUS->update;
334} 427}
335 428
… …
338 431
339 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
340 433
341 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
342 435
343 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
344 437
345 $focus->update if $focus; #? 438 $focus->update if $focus; #?
346}
347 439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
442}
443
348sub mouse_motion { } 444sub mouse_motion { 0 }
349sub button_up { } 445sub button_up { 0 }
350sub key_down { } 446sub key_down { 0 }
351sub key_up { } 447sub key_up { 0 }
352 448
353sub button_down { 449sub button_down {
354 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
355 451
356 $self->focus_in; 452 $self->focus_in;
357}
358 453
359sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
360sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
361sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
362sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
363sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self+0};
504
505 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
511}
512
513sub update {
514 my ($self) = @_;
515
516 $self->{parent}->update
517 if $self->{parent};
518}
519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
364 530
365sub draw { 531sub draw {
366 my ($self) = @_; 532 my ($self) = @_;
367 533
368 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
369 545
370 glPushMatrix; 546 glPushMatrix;
371 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
372 $self->_draw; 548 $self->_draw;
373 glPopMatrix; 549 glPopMatrix;
… …
385 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
386 glEnd; 562 glEnd;
387 glDisable GL_BLEND; 563 glDisable GL_BLEND;
388 } 564 }
389 565
390 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
391 glPushMatrix; 567 glPushMatrix;
392 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
393 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
394 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
395 glVertex 0 , 0; 571 glVertex 0 , 0;
396 glVertex $self->{w}, 0; 572 glVertex $self->{w} - 1, 0;
397 glVertex $self->{w}, $self->{h}; 573 glVertex $self->{w} - 1, $self->{h} - 1;
398 glVertex 0 , $self->{h}; 574 glVertex 0 , $self->{h} - 1;
399 glEnd; 575 glEnd;
400 glPopMatrix; 576 glPopMatrix;
401 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 577 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
402 } 578 }
403} 579}
404 580
405sub _draw { 581sub _draw {
406 my ($self) = @_; 582 my ($self) = @_;
407 583
408 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
409}
410
411sub find_widget {
412 my ($self, $x, $y) = @_;
413
414 return () unless $self->{can_events};
415
416 return $self
417 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
418 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
419
420 ()
421}
422
423sub set_parent {
424 my ($self, $parent) = @_;
425
426 Scalar::Util::weaken ($self->{parent} = $parent);
427
428 # TODO: req_w _does_change after ->reconfigure
429 $self->check_size
430 unless exists $self->{req_w};
431
432 $self->show;
433}
434
435sub check_size {
436 my ($self, $forced) = @_;
437
438 $self->{force_alloc} = 1 if $forced;
439 $CFClient::UI::ROOT->{check_size}{$self} = $self;
440}
441
442sub update {
443 my ($self) = @_;
444
445 $self->{parent}->update
446 if $self->{parent};
447}
448
449sub connect {
450 my ($self, $signal, $cb) = @_;
451
452 push @{ $self->{signal_cb}{$signal} }, $cb;
453}
454
455sub emit {
456 my ($self, $signal, @args) = @_;
457
458 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
459} 585}
460 586
461sub DESTROY { 587sub DESTROY {
462 my ($self) = @_; 588 my ($self) = @_;
463 589
… …
521 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
522 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
523} 649}
524 650
525sub size_request { 651sub size_request {
526 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
527} 655}
528 656
529sub draw { } 657sub draw { }
530 658
531############################################################################# 659#############################################################################
… …
560 $self->{children} = [ 688 $self->{children} = [
561 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
562 @{$self->{children}}, @widgets 690 @{$self->{children}}, @widgets
563 ]; 691 ];
564 692
565 $self->check_size (1); 693 $self->realloc;
566 $self->update;
567} 694}
568 695
569sub children { 696sub children {
570 @{ $_[0]{children} } 697 @{ $_[0]{children} }
571} 698}
… …
576 delete $child->{parent}; 703 delete $child->{parent};
577 $child->hide; 704 $child->hide;
578 705
579 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
580 707
581 $self->check_size; 708 $self->realloc;
582 $self->update;
583} 709}
584 710
585sub clear { 711sub clear {
586 my ($self) = @_; 712 my ($self) = @_;
587 713
… …
591 for (@$children) { 717 for (@$children) {
592 delete $_->{parent}; 718 delete $_->{parent};
593 $_->hide; 719 $_->hide;
594 } 720 }
595 721
596 $self->check_size; 722 $self->realloc;
597 $self->update;
598} 723}
599 724
600sub find_widget { 725sub find_widget {
601 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
602 727
… …
689 $self->SUPER::size_allocate ($w, $h); 814 $self->SUPER::size_allocate ($w, $h);
690 $self->update; 815 $self->update;
691} 816}
692 817
693sub _render { 818sub _render {
819 my ($self) = @_;
820
694 $_[0]{children}[0]->draw; 821 $self->{children}[0]->draw;
695} 822}
696 823
697sub render_child { 824sub render_child {
698 my ($self) = @_; 825 my ($self) = @_;
699 826
700 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 827 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
701 glClearColor 0, 0, 0, 0; 828 glClearColor 0, 0, 0, 0;
702 glClear GL_COLOR_BUFFER_BIT; 829 glClear GL_COLOR_BUFFER_BIT;
703 830
831 {
832 package CFClient::UI::Base;
833
834 ($draw_x, $draw_y, $draw_w, $draw_h) =
835 (0, 0, $self->{w}, $self->{h});
836 }
837
704 $self->_render; 838 $self->_render;
705 }; 839 };
706} 840}
707 841
708sub _draw { 842sub _draw {
709 my ($self) = @_; 843 my ($self) = @_;
710 844
711 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
712 846
713 my $tex = $self->{texture} 847 my $tex = $self->{texture}
714 or return; 848 or return;
715 849
716 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
… …
726 860
727package CFClient::UI::ViewPort; 861package CFClient::UI::ViewPort;
728 862
729our @ISA = CFClient::UI::Window::; 863our @ISA = CFClient::UI::Window::;
730 864
865sub new {
866 my $class = shift;
867
868 $class->SUPER::new (
869 scroll_x => 0,
870 scroll_y => 1,
871 @_,
872 )
873}
874
731sub size_request { 875sub size_request {
732 my ($self) = @_; 876 my ($self) = @_;
733 877
734 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 878 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
735 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
736 879
737 @$self{qw(child_w child_h)} 880 $w = 10 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y};
882
883 ($w, $h)
738} 884}
739 885
740sub size_allocate { 886sub size_allocate {
741 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
742 888
889 my $child = $self->child;
890
891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
893
894 $self->child->configure (0, 0, $w, $h);
743 $self->update; 895 $self->update;
744} 896}
745 897
746sub set_offset { 898sub set_offset {
747 my ($self, $x, $y) = @_; 899 my ($self, $x, $y) = @_;
… …
781} 933}
782 934
783sub _render { 935sub _render {
784 my ($self) = @_; 936 my ($self) = @_;
785 937
938 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
939 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
940
786 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
787 942
788 $self->SUPER::_render; 943 $self->SUPER::_render;
789} 944}
790 945
… …
798 my $class = shift; 953 my $class = shift;
799 954
800 my $self; 955 my $self;
801 956
802 my $slider = new CFClient::UI::Slider 957 my $slider = new CFClient::UI::Slider
803 vertical => 1, 958 vertical => 1,
804 range => [0, 0, 1, 0.01], # HACK fix 959 range => [0, 0, 1, 0.01], # HACK fix
805 connect_changed => sub { 960 on_changed => sub {
806 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 961 $self->{vp}->set_offset (0, $_[1]);
807 }, 962 },
808 ; 963 ;
809 964
810 $self = $class->SUPER::new ( 965 $self = $class->SUPER::new (
811 vp => (new CFClient::UI::ViewPort expand => 1), 966 vp => (new CFClient::UI::ViewPort expand => 1),
… …
816 $self->{vp}->add ($self->{scrolled}); 971 $self->{vp}->add ($self->{scrolled});
817 $self->add ($self->{vp}); 972 $self->add ($self->{vp});
818 $self->add ($self->{slider}); 973 $self->add ($self->{slider});
819 974
820 $self 975 $self
976}
977
978sub update {
979 my ($self) = @_;
980
981 $self->SUPER::update;
982
983 # todo: overwrite size_allocate of child
984 my $child = $self->{vp}->child;
985 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
986}
987
988sub size_allocate {
989 my ($self, $w, $h) = @_;
990
991 $self->SUPER::size_allocate ($w, $h);
992
993 my $child = $self->{vp}->child;
994 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
821} 995}
822 996
823#TODO# update range on size_allocate depending on child 997#TODO# update range on size_allocate depending on child
824# update viewport offset on scroll 998# update viewport offset on scroll
825 999
… …
869 1043
870our @ISA = CFClient::UI::Bin::; 1044our @ISA = CFClient::UI::Bin::;
871 1045
872use CFClient::OpenGL; 1046use CFClient::OpenGL;
873 1047
874my @tex = 1048my $bg =
1049 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1050 mipmap => 1, wrap => 1;
1051
1052my @border =
875 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1053 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
876 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1054 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
877 1055
878sub new { 1056sub new {
879 my $class = shift; 1057 my ($class, %arg) = @_;
880 1058
881 # TODO: user_x, user_y, overwrite moveto? 1059 my $title = delete $arg{title};
882 1060
883 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
884 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
885 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
886 border => 0.6, 1064 border => 0.6,
887 toplevel => 1,
888 can_events => 1, 1065 can_events => 1,
889 @_ 1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
890 ); 1069 );
891 1070
892 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
893 align => 0, 1072 align => 0,
894 valign => 1, 1073 valign => 1,
895 text => $self->{title}, 1074 text => $title,
896 fontsize => $self->{border}; 1075 fontsize => $self->{border}
1076 if defined $title;
897 1077
898 $self 1078 $self
1079}
1080
1081sub add {
1082 my ($self, @widgets) = @_;
1083
1084 $self->SUPER::add (@widgets);
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
899} 1086}
900 1087
901sub border { 1088sub border {
902 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
903} 1090}
904 1091
905sub size_request { 1092sub size_request {
906 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
907 1097
908 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
909 1099
910 ( 1100 (
911 $w + $self->border * 2, 1101 $w + $self->border * 2,
… …
914} 1104}
915 1105
916sub size_allocate { 1106sub size_allocate {
917 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
918 1108
1109 if ($self->{title}) {
1110 $self->{title}{w} = $w;
1111 $self->{title}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h);
1113 }
1114
1115 my $border = $self->border;
1116
919 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
920 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
921 1119
922 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
923 if $self->{title};
924
925 $self->child->configure ($self->border, $self->border, $w, $h); 1120 $self->child->configure ($border, $border, $w, $h);
926} 1121}
927 1122
928sub button_down { 1123sub button_down {
929 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
930 1125
… …
946 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
947 1142
948 my $dx = $ev->{x} - $ox; 1143 my $dx = $ev->{x} - $ox;
949 my $dy = $ev->{y} - $oy; 1144 my $dy = $ev->{y} - $oy;
950 1145
951 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
952 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148
1149 $self->realloc;
953 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
954 $self->check_size;
955 }; 1151 };
956 1152
957 } elsif ($lr ^ $td) { 1153 } elsif ($lr ^ $td) {
958 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
959 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
… …
961 $self->{motion} = sub { 1157 $self->{motion} = sub {
962 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
963 1159
964 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
965 1161
966 $self->move ($bx + $x - $ox, $by + $y - $oy); 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
967 $self->update;
968 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
969 } 1168 1
970} 1169}
971 1170
972sub button_up { 1171sub button_up {
973 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
974 1173
975 delete $self->{motion}; 1174 !!delete $self->{motion}
976} 1175}
977 1176
978sub mouse_motion { 1177sub mouse_motion {
979 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
980 1179
981 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
982} 1183}
983 1184
984sub _draw { 1185sub _draw {
985 my ($self) = @_; 1186 my ($self) = @_;
986 1187
1188 my $child = $self->{children}[0];
1189
987 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
988 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
989 1192
990 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
992 1195
993 my $border = $self->border; 1196 my $border = $self->border;
994 1197
995 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
996 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
997 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
998 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
999 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1000 1203
1001 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1002 my $bg = $tex[0]; 1205 glColor @{ $self->{bg} };
1003 1206
1004 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
1208 # solve this better(?)
1005 my $rep_x = $cw / $bg->{w}; 1209 $bg->{s} = $cw / $bg->{w};
1006 my $rep_y = $ch / $bg->{h}; 1210 $bg->{t} = $ch / $bg->{h};
1007
1008 glColor @{ $self->{bg} };
1009
1010 $bg->{s} = $rep_x;
1011 $bg->{t} = $rep_y;
1012 $bg->{wrap_mode} = 1;
1013 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1014 } 1212 }
1015 1213
1016 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
1017 1215
1018 $self->{title}->draw if $self->{title};
1019
1020 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
1021} 1222}
1022 1223
1023############################################################################# 1224#############################################################################
1024 1225
1025package CFClient::UI::Table; 1226package CFClient::UI::Table;
… …
1033sub new { 1234sub new {
1034 my $class = shift; 1235 my $class = shift;
1035 1236
1036 $class->SUPER::new ( 1237 $class->SUPER::new (
1037 col_expand => [], 1238 col_expand => [],
1038 @_ 1239 @_,
1039 ) 1240 )
1241}
1242
1243sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040} 1245}
1041 1246
1042sub add { 1247sub add {
1043 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
1044 1249
1045 $child->set_parent ($self); 1250 $child->set_parent ($self);
1046 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
1047 1252
1048 $child->check_size; 1253 $self->realloc;
1049} 1254}
1050 1255
1051sub children {
1052 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053}
1054
1055# TODO: move to container class maybe? send childs a signal on removal? 1256# TODO: move to container class maybe? send children a signal on removal?
1056sub clear { 1257sub clear {
1057 my ($self) = @_; 1258 my ($self) = @_;
1058 1259
1059 my @children = $self->children; 1260 my @children = $self->children;
1060 delete $self->{children}; 1261 delete $self->{children};
… …
1062 for (@children) { 1263 for (@children) {
1063 delete $_->{parent}; 1264 delete $_->{parent};
1064 $_->hide; 1265 $_->hide;
1065 } 1266 }
1066 1267
1067 $self->update; 1268 $self->realloc;
1068} 1269}
1069 1270
1070sub get_wh { 1271sub get_wh {
1071 my ($self) = @_; 1272 my ($self) = @_;
1072 1273
… …
1103sub size_allocate { 1304sub size_allocate {
1104 my ($self, $w, $h) = @_; 1305 my ($self, $w, $h) = @_;
1105 1306
1106 my ($ws, $hs) = $self->get_wh; 1307 my ($ws, $hs) = $self->get_wh;
1107 1308
1108 my $req_w = sum @$ws; 1309 my $req_w = (sum @$ws) || 1;
1109 my $req_h = sum @$hs; 1310 my $req_h = (sum @$hs) || 1;
1110 1311
1111 # TODO: nicer code && do row_expand 1312 # TODO: nicer code && do row_expand
1112 my @col_expand = @{$self->{col_expand}}; 1313 my @col_expand = @{$self->{col_expand}};
1113 @col_expand = (1) x @$ws unless @col_expand; 1314 @col_expand = (1) x @$ws unless @col_expand;
1114 my $col_expand = (sum @col_expand) || 1; 1315 my $col_expand = (sum @col_expand) || 1;
… …
1168 } 1369 }
1169} 1370}
1170 1371
1171############################################################################# 1372#############################################################################
1172 1373
1173package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1174
1175# TODO: wrap into common Box base class
1176 1375
1177our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1178 1377
1179sub size_request { 1378sub size_request {
1180 my ($self) = @_; 1379 my ($self) = @_;
1181 1380
1182 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1183 1382 ? (
1184 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1185 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1186 (List::Util::max map $_->[1], @alloc), 1385 )
1187 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1188} 1390}
1189 1391
1190sub size_allocate { 1392sub size_allocate {
1191 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1192 1394
1193 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1194
1195 my $children = $self->{children}; 1396 my $children = $self->{children};
1196 1397
1197 my @h = map $_->{req_w}, @$children; 1398 my @req;
1198 1399
1199 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1200 1401 @req = ($space / (@$children || 1)) x @$children;
1201 if ($req_h > $h) {
1202 # ah well, not enough space
1203 $_ *= $h / $req_h for @h;
1204 } else { 1402 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1404 my $req = List::Util::sum @req;
1405
1406 if ($req > $space) {
1407 # ah well, not enough space
1408 $_ *= $space / $req for @req;
1409 } else {
1205 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1206 $exp ||= 1;
1207 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1208 for (0 .. $#$children) { 1415 for 0 .. $#$children;
1209 my $child = $children->[$_];
1210
1211 my $alloc_h = $h[$_];
1212 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1213 $h[$_] = $alloc_h;
1214 } 1416 }
1215 } 1417 }
1216 1418
1217 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1218 1420
1219 my $y = 0; 1421 my $pos = 0;
1220 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1221 my $child = $children->[$_];
1222 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1223 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1224 1425
1225 $y += $h; 1426 $pos += $alloc;
1226 } 1427 }
1227 1428
1228 1 1429 1
1229} 1430}
1230 1431
1231############################################################################# 1432#############################################################################
1232 1433
1434package CFClient::UI::HBox;
1435
1436our @ISA = CFClient::UI::Box::;
1437
1438sub new {
1439 my $class = shift;
1440
1441 $class->SUPER::new (
1442 vertical => 0,
1443 @_,
1444 )
1445}
1446
1447#############################################################################
1448
1233package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1234 1450
1235# TODO: wrap into common Box base class
1236
1237our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1238 1452
1239sub size_request { 1453sub new {
1240 my ($self) = @_; 1454 my $class = shift;
1241 1455
1242 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1243 1457 vertical => 1,
1244 ( 1458 @_,
1245 (List::Util::max map $_->[0], @alloc),
1246 (List::Util::sum map $_->[1], @alloc),
1247 ) 1459 )
1248}
1249
1250sub size_allocate {
1251 my ($self, $w, $h) = @_;
1252
1253 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1254
1255 my $children = $self->{children};
1256
1257 my @h = map $_->{req_h}, @$children;
1258
1259 my $req_h = List::Util::sum @h;
1260
1261 if ($req_h > $h) {
1262 # ah well, not enough space
1263 $_ *= $h / $req_h for @h;
1264 } else {
1265 my $exp = List::Util::sum map $_->{expand}, @$children;
1266 $exp ||= 1;
1267
1268 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270
1271 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1272 }
1273 }
1274
1275 CFClient::UI::harmonize \@h;
1276
1277 my $y = 0;
1278 for (0 .. $#$children) {
1279 my $child = $children->[$_];
1280 my $h = $h[$_];
1281 $child->configure (0, $y, $w, $h);
1282
1283 $y += $h;
1284 }
1285
1286 1
1287} 1460}
1288 1461
1289############################################################################# 1462#############################################################################
1290 1463
1291package CFClient::UI::Label; 1464package CFClient::UI::Label;
… …
1308 ellipsise => 3, # end 1481 ellipsise => 3, # end
1309 layout => (new CFClient::Layout), 1482 layout => (new CFClient::Layout),
1310 fontsize => 1, 1483 fontsize => 1,
1311 align => -1, 1484 align => -1,
1312 valign => -1, 1485 valign => -1,
1313 padding => 2, 1486 padding_x => 2,
1487 padding_y => 2,
1314 can_events => 0, 1488 can_events => 0,
1315 %arg 1489 %arg
1316 ); 1490 );
1317 1491
1318 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
… …
1354 $self->{text} = "T$text"; 1528 $self->{text} = "T$text";
1355 1529
1356 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1357 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1358 1532
1533 $self->realloc;
1359 $self->update; 1534 $self->update;
1360 $self->check_size;
1361} 1535}
1362 1536
1363sub set_markup { 1537sub set_markup {
1364 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1365 1539
… …
1369 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1543 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370 1544
1371 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1372 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1373 1547
1548 $self->realloc;
1374 $self->update; 1549 $self->update;
1375 $self->check_size;
1376} 1550}
1377 1551
1378sub size_request { 1552sub size_request {
1379 my ($self) = @_; 1553 my ($self) = @_;
1380 1554
… …
1394 1568
1395 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1396 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1397 } 1571 }
1398 1572
1399 ( 1573 ($w, $h)
1400 $w + $self->{padding} * 2,
1401 $h + $self->{padding} * 2,
1402 )
1403} 1574}
1404 1575
1405sub size_allocate { 1576sub size_allocate {
1406 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1407 1578
1579 delete $self->{ox};
1580
1408 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1409} 1583}
1410 1584
1411sub set_fontsize { 1585sub set_fontsize {
1412 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1413 1587
1414 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1415 delete $self->{texture}; 1589 delete $self->{texture};
1416 1590
1417 $self->update; 1591 $self->realloc;
1418 $self->check_size;
1419} 1592}
1420 1593
1421sub _draw { 1594sub _draw {
1422 my ($self) = @_; 1595 my ($self) = @_;
1423 1596
… …
1429 $self->{layout}->set_width ($self->{w}); 1602 $self->{layout}->set_width ($self->{w});
1430 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1603 $self->{layout}->set_ellipsise ($self->{ellipsise});
1431 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1432 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1433 1606
1434 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1607 new_from_layout CFClient::Texture $self->{layout}
1608 };
1435 1609
1610 unless (exists $self->{ox}) {
1436 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1437 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1438 : ($self->{w} - $tex->{w}) * 0.5); 1613 : ($self->{w} - $tex->{w}) * 0.5);
1439 1614
1440 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1441 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1442 : ($self->{h} - $tex->{h}) * 0.5); 1617 : ($self->{h} - $tex->{h}) * 0.5);
1443
1444 $tex
1445 }; 1618 };
1446 1619
1447 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1448 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1449 1622
… …
1475 active_fg => [0, 0, 0], 1648 active_fg => [0, 0, 0],
1476 can_hover => 1, 1649 can_hover => 1,
1477 can_focus => 1, 1650 can_focus => 1,
1478 valign => 0, 1651 valign => 0,
1479 can_events => 1, 1652 can_events => 1,
1653 #text => ...
1480 @_ 1654 @_
1481 ) 1655 )
1482} 1656}
1483 1657
1484sub _set_text { 1658sub _set_text {
… …
1494 $self->{text} = $text; 1668 $self->{text} = $text;
1495 1669
1496 $text =~ s/./*/g if $self->{hidden}; 1670 $text =~ s/./*/g if $self->{hidden};
1497 $self->{layout}->set_text ("$text "); 1671 $self->{layout}->set_text ("$text ");
1498 1672
1499 $self->emit (changed => $self->{text}); 1673 $self->_emit (changed => $self->{text});
1500} 1674}
1501 1675
1502sub set_text { 1676sub set_text {
1503 my ($self, $text) = @_; 1677 my ($self, $text) = @_;
1504 1678
1505 $self->{cursor} = length $text; 1679 $self->{cursor} = length $text;
1506 $self->_set_text ($text); 1680 $self->_set_text ($text);
1507 $self->update; 1681
1508 $self->check_size; 1682 $self->realloc;
1509} 1683}
1510 1684
1511sub get_text { 1685sub get_text {
1512 $_[0]{text} 1686 $_[0]{text}
1513} 1687}
… …
1516 my ($self) = @_; 1690 my ($self) = @_;
1517 1691
1518 my ($w, $h) = $self->SUPER::size_request; 1692 my ($w, $h) = $self->SUPER::size_request;
1519 1693
1520 ($w + 1, $h) # add 1 for cursor 1694 ($w + 1, $h) # add 1 for cursor
1521}
1522
1523sub size_allocate {
1524 my ($self, $w, $h) = @_;
1525
1526 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1527} 1695}
1528 1696
1529sub key_down { 1697sub key_down {
1530 my ($self, $ev) = @_; 1698 my ($self, $ev) = @_;
1531 1699
… …
1546 } elsif ($sym == CFClient::SDLK_HOME) { 1714 } elsif ($sym == CFClient::SDLK_HOME) {
1547 $self->{cursor} = 0; 1715 $self->{cursor} = 0;
1548 } elsif ($sym == CFClient::SDLK_END) { 1716 } elsif ($sym == CFClient::SDLK_END) {
1549 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1550 } elsif ($uni == 27) { 1718 } elsif ($uni == 27) {
1551 $self->emit ('escape'); 1719 $self->_emit ('escape');
1552 } elsif ($uni) { 1720 } elsif ($uni) {
1553 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1554 } 1724 }
1555 1725
1556 $self->_set_text ($text); 1726 $self->_set_text ($text);
1557 $self->update; 1727
1558 $self->check_size; 1728 $self->realloc;
1729
1730 1
1559} 1731}
1560 1732
1561sub focus_in { 1733sub focus_in {
1562 my ($self) = @_; 1734 my ($self) = @_;
1563 1735
… …
1578 utf8::encode $text; 1750 utf8::encode $text;
1579 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1580 1752
1581 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1582 $self->update; 1754 $self->update;
1755
1756 1
1583} 1757}
1584 1758
1585sub mouse_motion { 1759sub mouse_motion {
1586 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1587# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1761# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1762
1763 0
1588} 1764}
1589 1765
1590sub _draw { 1766sub _draw {
1591 my ($self) = @_; 1767 my ($self) = @_;
1592 1768
… …
1643 if ($sym == 13) { 1819 if ($sym == 13) {
1644 unshift @{$self->{history}}, 1820 unshift @{$self->{history}},
1645 my $txt = $self->get_text; 1821 my $txt = $self->get_text;
1646 $self->{history_pointer} = -1; 1822 $self->{history_pointer} = -1;
1647 $self->{history_saveback} = ''; 1823 $self->{history_saveback} = '';
1648 $self->emit (activate => $txt); 1824 $self->_emit (activate => $txt);
1649 $self->update; 1825 $self->update;
1650 1826
1651 } elsif ($sym == CFClient::SDLK_UP) { 1827 } elsif ($sym == CFClient::SDLK_UP) {
1652 if ($self->{history_pointer} < 0) { 1828 if ($self->{history_pointer} < 0) {
1653 $self->{history_saveback} = $self->get_text; 1829 $self->{history_saveback} = $self->get_text;
… …
1669 } else { 1845 } else {
1670 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1671 } 1847 }
1672 1848
1673 } else { 1849 } else {
1674 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1675 } 1853 1
1676
1677} 1854}
1678 1855
1679############################################################################# 1856#############################################################################
1680 1857
1681package CFClient::UI::Button; 1858package CFClient::UI::Button;
… …
1690 1867
1691sub new { 1868sub new {
1692 my $class = shift; 1869 my $class = shift;
1693 1870
1694 $class->SUPER::new ( 1871 $class->SUPER::new (
1695 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1696 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1697 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1698 can_hover => 1, 1876 can_hover => 1,
1699 align => 0, 1877 align => 0,
1700 valign => 0, 1878 valign => 0,
1701 can_events => 1, 1879 can_events => 1,
1702 @_ 1880 @_
1703 ) 1881 )
1704} 1882}
1705 1883
1884sub activate { }
1885
1706sub button_up { 1886sub button_up {
1707 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1708 1888
1889 $self->emit ("activate")
1709 if ($x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1710 && $y >= 0 && $y < $self->{h}) { 1891 && $y >= 0 && $y < $self->{h};
1711 $self->emit ("activate"); 1892
1712 } 1893 1
1713} 1894}
1714 1895
1715sub _draw { 1896sub _draw {
1716 my ($self) = @_; 1897 my ($self) = @_;
1717 1898
… …
1746 1927
1747sub new { 1928sub new {
1748 my $class = shift; 1929 my $class = shift;
1749 1930
1750 $class->SUPER::new ( 1931 $class->SUPER::new (
1751 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1752 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1753 active_fg => [1, 1, 0], 1935 active_fg => [1, 1, 0],
1754 bg => [0, 0, 0, 0.2], 1936 bg => [0, 0, 0, 0.2],
1755 active_bg => [1, 1, 1, 0.5], 1937 active_bg => [1, 1, 1, 0.5],
1756 state => 0, 1938 state => 0,
… …
1760} 1942}
1761 1943
1762sub size_request { 1944sub size_request {
1763 my ($self) = @_; 1945 my ($self) = @_;
1764 1946
1765 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1766} 1948}
1767 1949
1768sub button_down { 1950sub button_down {
1769 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1770 1952
1771 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1772 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1773 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1774 $self->emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1775 } 1961 1
1776} 1962}
1777 1963
1778sub _draw { 1964sub _draw {
1779 my ($self) = @_; 1965 my ($self) = @_;
1780 1966
1781 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1782 1968
1783 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1784 1970
1785 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1971 my ($w, $h) = @$self{qw(w h)};
1972
1973 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1786 1974
1787 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1788 1976
1789 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1790 1978
… …
2054 my $self = $class->SUPER::new ( 2242 my $self = $class->SUPER::new (
2055 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
2056 active_fg => [0, 0, 0], 2244 active_fg => [0, 0, 0],
2057 bg => [0, 0, 0, 0.2], 2245 bg => [0, 0, 0, 0.2],
2058 active_bg => [1, 1, 1, 0.5], 2246 active_bg => [1, 1, 1, 0.5],
2059 range => [0, 0, 100, 10], 2247 range => [0, 0, 100, 10, 0],
2060 req_w => $::WIDTH / 80, 2248 min_w => $::WIDTH / 80,
2061 req_h => $::WIDTH / 80, 2249 min_h => $::WIDTH / 80,
2062 vertical => 0, 2250 vertical => 0,
2063 can_hover => 1, 2251 can_hover => 1,
2064 inner_pad => 0.02, 2252 inner_pad => 0.02,
2065 @_ 2253 @_
2066 ); 2254 );
… …
2069 $self->update; 2257 $self->update;
2070 2258
2071 $self 2259 $self
2072} 2260}
2073 2261
2262sub changed { }
2263
2264sub set_range {
2265 my ($self, $range) = @_;
2266
2267 ($range, $self->{range}) = ($self->{range}, $range);
2268
2269 $self->update
2270 if "@$range" ne "@{$self->{range}}";
2271}
2272
2074sub set_value { 2273sub set_value {
2075 my ($self, $value) = @_; 2274 my ($self, $value) = @_;
2076 2275
2077 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2276 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078 2277
2079 $hi = $lo + 1 if $hi <= $lo; 2278 $hi = $lo + 1 if $hi <= $lo;
2080 2279
2280 $page = $hi - $lo if $page > $hi - $lo;
2281
2081 $value = $lo if $value < $lo; 2282 $value = $lo if $value < $lo;
2082 $value = $hi if $value > $hi; 2283 $value = $hi - $page if $value > $hi - $page;
2083 2284
2084 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2285 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085 if $unit; 2286 if $unit;
2086 2287
2087 $page = $hi - $lo if $page > $hi - $lo;
2088
2089 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2288 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090 2289
2091 if ($value != $old_value) { 2290 if ($value != $old_value) {
2092 $self->emit (changed => $value); 2291 $self->_emit (changed => $value);
2093 $self->update; 2292 $self->update;
2094 } 2293 }
2095} 2294}
2096 2295
2097sub size_request { 2296sub size_request {
2098 my ($self) = @_; 2297 my ($self) = @_;
2099 2298
2100 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
2101 my $h = $self->{req_h};
2102
2103 $self->{vertical} ? ($h, $w) : ($w, $h)
2104} 2300}
2105 2301
2106sub button_down { 2302sub button_down {
2107 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
2108 2304
2109 $self->SUPER::button_down ($ev, $x, $y); 2305 $self->SUPER::button_down ($ev, $x, $y);
2306
2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2308
2110 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
2111} 2310}
2112 2311
2113sub mouse_motion { 2312sub mouse_motion {
2114 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
2115 2314
2116 if ($GRAB == $self) { 2315 if ($GRAB == $self) {
2117 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2316 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118 2317
2119 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2318 my (undef, $lo, $hi, $page) = @{$self->{range}};
2120 2319
2121 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2320 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2122 2321
2123 $self->set_value ($x * ($hi - $lo) + $lo); 2322 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2323 } else {
2324 return 0;
2325 }
2326
2124 } 2327 1
2125} 2328}
2126 2329
2127sub update { 2330sub update {
2128 my ($self) = @_; 2331 my ($self) = @_;
2129 2332
2130 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131 $self->set_value ($self->{range}[0]); 2334 $self->set_value ($self->{range}[0]);
2132 2335
2133 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2336 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100;
2134 2338
2135 my $inner_w = 1 - 2 * $self->{inner_pad}; 2339 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2136 2340
2137 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2341 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2342 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2138 2343
2139 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2344 $value = ($value - $lo) / $range;
2140 $value = $self->{scale} * ($value - $lo); 2345 $value = $value * $self->{scale} + $self->{offset};
2141 2346
2142 $value = $self->{inner_pad} + ($value - $page * 0.5);
2143
2144 $value = 0 if $value < 0;
2145 $page = 1 - $value if $value + $page > 1;
2146
2147 $self->{knob_x} = $value; 2347 $self->{knob_x} = $value - $knob_w * 0.5;
2148 $self->{knob_w} = $page; 2348 $self->{knob_w} = $knob_w;
2149 }); 2349 });
2150 2350
2151 $self->SUPER::update; 2351 $self->SUPER::update;
2152} 2352}
2153 2353
… …
2177 # draw handle 2377 # draw handle
2178 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2378 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2179 2379
2180 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
2181} 2381}
2382
2383#############################################################################
2384
2385package CFClient::UI::ValSlider;
2386
2387our @ISA = CFClient::UI::HBox::;
2388
2389sub new {
2390 my ($class, %arg) = @_;
2391
2392 my $range = delete $arg{range};
2393
2394 my $self = $class->SUPER::new (
2395 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2396 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2397 to_value => sub { shift },
2398 from_value => sub { shift },
2399 %arg,
2400 );
2401
2402 $self->{slider}->connect (changed => sub {
2403 my ($self, $value) = @_;
2404 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2405 $self->{parent}->emit (changed => $value);
2406 });
2407
2408# $self->{entry}->connect (changed => sub {
2409# my ($self, $value) = @_;
2410# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2411# $self->{parent}->emit (changed => $value);
2412# });
2413
2414 $self->add ($self->{slider}, $self->{entry});
2415
2416 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2417
2418 $self
2419}
2420
2421sub set_range { shift->{slider}->set_range (@_) }
2422sub set_value { shift->{slider}->set_value (@_) }
2182 2423
2183############################################################################# 2424#############################################################################
2184 2425
2185package CFClient::UI::TextView; 2426package CFClient::UI::TextView;
2186 2427
… …
2228 $self->{layout}->set_width ($self->{children}[0]{w}); 2469 $self->{layout}->set_width ($self->{children}[0]{w});
2229 2470
2230 $self->reflow; 2471 $self->reflow;
2231} 2472}
2232 2473
2233sub text_height { 2474sub text_size {
2234 my ($self, $text, $indent) = @_; 2475 my ($self, $text, $indent) = @_;
2235 2476
2236 my $layout = $self->{layout}; 2477 my $layout = $self->{layout};
2237 2478
2238 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239 $layout->set_width ($self->{children}[0]{w} - $indent); 2480 $layout->set_width ($self->{children}[0]{w} - $indent);
2240 $layout->set_markup ($text); 2481 $layout->set_markup ($text);
2241 2482
2242 ($layout->size)[1] 2483 $layout->size
2243} 2484}
2244 2485
2245sub reflow { 2486sub reflow {
2246 my ($self) = @_; 2487 my ($self) = @_;
2247 2488
2248 $self->{need_reflow}++; 2489 $self->{need_reflow}++;
2249 $self->update; 2490 $self->update;
2250} 2491}
2251 2492
2493sub set_offset {
2494 my ($self, $offset) = @_;
2495
2496 # todo: base offset on lines or so, not on pixels
2497 $self->{children}[1]->set_value ($offset);
2498}
2499
2500sub clear {
2501 my ($self) = @_;
2502
2503 $self->{par} = [];
2504 $self->{height} = 0;
2505 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2506}
2507
2252sub add_paragraph { 2508sub add_paragraph {
2253 my ($self, $color, $text, $indent) = @_; 2509 my ($self, $color, $text, $indent) = @_;
2254 2510
2255 #TODO: intelligently "reformat" paragraph
2256
2257 for my $line (split /\n/, $text) { 2511 for my $line (split /\n/, $text) {
2258 my $height = $self->text_height ($line); 2512 my ($w, $h) = $self->text_size ($line);
2259 $self->{height} += $height; 2513 $self->{height} += $h;
2260 push @{$self->{par}}, [$height, $color, $indent, $line]; 2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2261 } 2515 }
2262 2516
2263 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2517 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2264 $self->{children}[1]->update;
2265} 2518}
2266 2519
2267sub update { 2520sub update {
2268 my ($self) = @_; 2521 my ($self) = @_;
2269 2522
… …
2272 return unless $self->{h} > 0; 2525 return unless $self->{h} > 0;
2273 2526
2274 delete $self->{texture}; 2527 delete $self->{texture};
2275 2528
2276 $ROOT->on_post_alloc ($self, sub { 2529 $ROOT->on_post_alloc ($self, sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531
2277 if (delete $self->{need_reflow}) { 2532 if (delete $self->{need_reflow}) {
2278 my $height = 0; 2533 my $height = 0;
2279 2534
2280 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2535 my $layout = $self->{layout};
2536
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538
2281 for @{$self->{par}}; 2539 for (@{$self->{par}}) {
2540 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2541 $layout->set_width ($W - $_->[3]);
2542 $layout->set_markup ($_->[4]);
2543 my ($w, $h) = $layout->size;
2544 $_->[0] = $w + $_->[3];
2545 $_->[1] = $h;
2546 }
2547
2548 $height += $_->[1];
2549 }
2282 2550
2283 $self->{height} = $height; 2551 $self->{height} = $height;
2284 2552
2285 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2286 $self->{children}[1]->update;
2287 2554
2288 delete $self->{texture}; 2555 delete $self->{texture};
2289 } 2556 }
2290 2557
2291 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2292 glClearColor 0.5, 0.5, 0.5, 0; 2559 glClearColor 0.5, 0.5, 0.5, 0;
2293 glClear GL_COLOR_BUFFER_BIT; 2560 glClear GL_COLOR_BUFFER_BIT;
2294 2561
2295 my $top = int $self->{children}[1]{range}[0]; 2562 my $top = int $self->{children}[1]{range}[0];
2296 2563
2297 my $y0 = $top; 2564 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2565 my $y1 = $top + $H;
2299 2566
2300 my $y = 0; 2567 my $y = 0;
2301 2568
2302 my $layout = $self->{layout}; 2569 my $layout = $self->{layout};
2303 2570
2304 $layout->set_font ($self->{font}) if $self->{font}; 2571 $layout->set_font ($self->{font}) if $self->{font};
2305 2572
2306 glEnable GL_BLEND; 2573 glEnable GL_BLEND;
2574 #TODO# not correct in windows where rgba is forced off
2307 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2575 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308 2576
2309 for my $par (@{$self->{par}}) { 2577 for my $par (@{$self->{par}}) {
2310 my $h = $par->[0]; 2578 my $h = $par->[1];
2311 2579
2312 if ($y0 < $y + $h && $y < $y1) { 2580 if ($y0 < $y + $h && $y < $y1) {
2313 $layout->set_foreground (@{ $par->[1] }); 2581 $layout->set_foreground (@{ $par->[2] });
2314 $layout->set_width ($self->{w} - $par->[2]); 2582 $layout->set_width ($W - $par->[3]);
2315 $layout->set_markup ($par->[3]); 2583 $layout->set_markup ($par->[4]);
2316 2584
2317 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2585 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2318 2586
2319 glRasterPos $par->[2], $y - $y0; 2587 glRasterPos $par->[3], $y - $y0;
2320 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2588 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2321 } 2589 }
2322 2590
2323 $y += $h; 2591 $y += $h;
2324 } 2592 }
… …
2391 2659
2392sub new { 2660sub new {
2393 my $class = shift; 2661 my $class = shift;
2394 2662
2395 my $self = $class->SUPER::new ( 2663 my $self = $class->SUPER::new (
2396 state => 0, 2664 state => 0,
2397 connect_activate => \&toggle_flopper, 2665 on_activate => \&toggle_flopper,
2398 @_ 2666 @_
2399 ); 2667 );
2400 2668
2401 if ($self->{state}) {
2402 $self->{state} = 0;
2403 $self->toggle_flopper;
2404 }
2405
2406 $self 2669 $self
2407} 2670}
2408 2671
2409sub toggle_flopper { 2672sub toggle_flopper {
2410 my ($self) = @_; 2673 my ($self) = @_;
2411 2674
2412 # TODO: use animation 2675 $self->{other}->toggle_visibility;
2413 if ($self->{state} = !$self->{state}) {
2414 $CFClient::UI::ROOT->add ($self->{other});
2415 $self->{other}->move ($self->coord2global (0, $self->{h}));
2416 $self->emit ("open");
2417 } else {
2418 $CFClient::UI::ROOT->remove ($self->{other});
2419 $self->emit ("close");
2420 }
2421
2422 $self->emit (changed => $self->{state});
2423} 2676}
2424 2677
2425############################################################################# 2678#############################################################################
2426 2679
2427package CFClient::UI::Tooltip; 2680package CFClient::UI::Tooltip;
… …
2440} 2693}
2441 2694
2442sub set_tooltip_from { 2695sub set_tooltip_from {
2443 my ($self, $widget) = @_; 2696 my ($self, $widget) = @_;
2444 2697
2698 my $tooltip = $widget->{tooltip};
2699
2700 if ($ENV{CFPLUS_DEBUG} & 2) {
2701 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}";
2705 }
2706
2445 $self->add (new CFClient::UI::Label 2707 $self->add (new CFClient::UI::Label
2446 markup => $widget->{tooltip}, 2708 markup => $tooltip,
2447 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2448 fontsize => 0.8, 2710 fontsize => 0.8,
2449 fg => [0, 0, 0, 1], 2711 fg => [0, 0, 0, 1],
2450 ellipsise => 0, 2712 ellipsise => 0,
2451 font => ($widget->{tooltip_font} || $::FONT_PROP), 2713 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2462 2724
2463sub size_allocate { 2725sub size_allocate {
2464 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2465 2727
2466 $self->SUPER::size_allocate ($w - 4, $h - 4); 2728 $self->SUPER::size_allocate ($w - 4, $h - 4);
2729}
2730
2731sub visibility_change {
2732 my ($self, $visible) = @_;
2733
2734 return unless $visible;
2735
2736 $self->{root}->on_post_alloc ("move_$self" => sub {
2737 my $widget = $self->{owner}
2738 or return;
2739
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH;
2744
2745 $self->move_abs ($x, $y);
2746 });
2467} 2747}
2468 2748
2469sub _draw { 2749sub _draw {
2470 my ($self) = @_; 2750 my ($self) = @_;
2471 2751
… …
2488 glVertex $w, $h; 2768 glVertex $w, $h;
2489 glVertex $w, 0; 2769 glVertex $w, 0;
2490 glEnd; 2770 glEnd;
2491 2771
2492 glTranslate 2 - 0.375, 2 - 0.375; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2773
2493 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2494} 2775}
2495 2776
2496############################################################################# 2777#############################################################################
2497 2778
… …
2503 2784
2504sub new { 2785sub new {
2505 my $class = shift; 2786 my $class = shift;
2506 2787
2507 my $self = $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2508 aspect => 1, 2789 aspect => 1,
2790 can_events => 0,
2509 @_, 2791 @_,
2510 ); 2792 );
2511 2793
2512 if ($self->{anim} && $self->{animspeed}) { 2794 if ($self->{anim} && $self->{animspeed}) {
2513 Scalar::Util::weaken (my $widget = $self); 2795 Scalar::Util::weaken (my $widget = $self);
… …
2539} 2821}
2540 2822
2541sub _draw { 2823sub _draw {
2542 my ($self) = @_; 2824 my ($self) = @_;
2543 2825
2544 return unless $::CONN;#d# manage and cache textures differently 2826 return unless $::CONN;
2545 2827
2546 my $face; 2828 my $face;
2547 2829
2548 if ($self->{frame}) { 2830 if ($self->{frame}) {
2549 my $anim = $::CONN->{anim}[$self->{anim}]; 2831 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2568 2850
2569 $self->{timer}->cancel 2851 $self->{timer}->cancel
2570 if $self->{timer}; 2852 if $self->{timer};
2571 2853
2572 $self->SUPER::DESTROY; 2854 $self->SUPER::DESTROY;
2573}
2574
2575#############################################################################
2576
2577package CFClient::UI::InventoryItem;
2578
2579our @ISA = CFClient::UI::HBox::;
2580
2581sub _item_to_desc {
2582 my ($item) = @_;
2583
2584 my $desc =
2585 $item->{nrof} < 2
2586 ? $item->{name}
2587 : "$item->{nrof} × $item->{name_pl}";
2588
2589 $item->{flags} & Crossfire::Protocol::F_OPEN
2590 and $desc .= " (open)";
2591 $item->{flags} & Crossfire::Protocol::F_APPLIED
2592 and $desc .= " (applied)";
2593 $item->{flags} & Crossfire::Protocol::F_UNPAID
2594 and $desc .= " (unpaid)";
2595 $item->{flags} & Crossfire::Protocol::F_MAGIC
2596 and $desc .= " (magic)";
2597 $item->{flags} & Crossfire::Protocol::F_CURSED
2598 and $desc .= " (cursed)";
2599 $item->{flags} & Crossfire::Protocol::F_DAMNED
2600 and $desc .= " (damned)";
2601 $item->{flags} & Crossfire::Protocol::F_LOCKED
2602 and $desc .= " *";
2603
2604 $desc
2605}
2606
2607sub new {
2608 my $class = shift;
2609
2610 my %args = @_;
2611
2612 my $item = delete $args{item};
2613
2614 my $desc = _item_to_desc ($item);
2615
2616 my $self = $class->SUPER::new (
2617 can_hover => 1,
2618 can_events => 1,
2619 tooltip => ((CFClient::UI::Label::escape $desc)
2620 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621 connect_button_down => sub {
2622 my ($self, $ev, $x, $y) = @_;
2623
2624 # todo: maybe put examine on 1? but should just be a tooltip :(
2625 if ($ev->{button} == 1) {
2626 my $targ = $::CONN->{player}{tag};
2627
2628 if ($item->{container} == $::CONN->{player}{tag}) {
2629 $targ = $main::OPENCONT;
2630 }
2631
2632 $::CONN->send ("move $targ $item->{tag} 0");
2633 } elsif ($ev->{button} == 2) {
2634 $::CONN->send ("apply $item->{tag}");
2635 } elsif ($ev->{button} == 3) {
2636 my @menu_items = (
2637 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640 (
2641 $item->{flags} & Crossfire::Protocol::F_LOCKED
2642 ? (
2643 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644 )
2645 : (
2646 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648 )
2649 ),
2650 );
2651
2652 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653 }
2654
2655 1
2656 },
2657 %args
2658 );
2659
2660
2661 $self->add (new CFClient::UI::Face
2662 can_events => 0,
2663 face => $item->{face},
2664 anim => $item->{anim},
2665 animspeed => $item->{animspeed},
2666 );
2667
2668 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670 $self->{item} = $item;
2671
2672 $self->update_item;
2673
2674 $self
2675}
2676
2677sub update_item {
2678 my ($self) = @_;
2679
2680 my $desc = _item_to_desc ($self->{item});
2681
2682 $self->{name_lbl}->set_text ($desc);
2683}
2684
2685#############################################################################
2686
2687package CFClient::UI::Inventory;
2688
2689our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691sub new {
2692 my $class = shift;
2693
2694 my $self = $class->SUPER::new (
2695 scrolled => (new CFClient::UI::VBox),
2696 @_,
2697 );
2698
2699 $self
2700}
2701
2702sub set_items {
2703 my ($self, $items) = @_;
2704
2705 $self->{scrolled}->clear;
2706 return unless $items;
2707
2708 my @items = sort {
2709 ($a->{type} <=> $b->{type})
2710 or ($a->{name} cmp $b->{name})
2711 } @$items;
2712
2713 $self->{real_items} = \@items;
2714
2715 for my $item (@items) {
2716 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2717 $item->update_item ();
2718 }
2719
2720 $self->{scrolled}->add (@items);
2721
2722# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2723}
2724
2725sub size_request {
2726 my ($self) = @_;
2727 ($self->{req_w}, $self->{req_h});
2728} 2855}
2729 2856
2730############################################################################# 2857#############################################################################
2731 2858
2732package CFClient::UI::Menu; 2859package CFClient::UI::Menu;
… …
2767 2894
2768# popup given the event (must be a mouse button down event currently) 2895# popup given the event (must be a mouse button down event currently)
2769sub popup { 2896sub popup {
2770 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2771 2898
2772 $self->emit ("popdown"); 2899 $self->_emit ("popdown");
2773 2900
2774 # maybe save $GRAB? must be careful about events... 2901 # maybe save $GRAB? must be careful about events...
2775 $GRAB = $self; 2902 $GRAB = $self;
2776 $self->{button} = $ev->{button}; 2903 $self->{button} = $ev->{button};
2777 2904
2778 $self->show; 2905 $self->show;
2779 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2906 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2780} 2907}
2781 2908
2782sub mouse_motion { 2909sub mouse_motion {
2783 my ($self, $ev, $x, $y) = @_; 2910 my ($self, $ev, $x, $y) = @_;
2784 2911
2785 # TODO: should use vbox->find_widget or so 2912 # TODO: should use vbox->find_widget or so
2786 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2787 $self->{hover} = $self->{item}{$HOVER}; 2914 $self->{hover} = $self->{item}{$HOVER};
2915
2916 0
2788} 2917}
2789 2918
2790sub button_up { 2919sub button_up {
2791 my ($self, $ev, $x, $y) = @_; 2920 my ($self, $ev, $x, $y) = @_;
2792 2921
2793 if ($ev->{button} == $self->{button}) { 2922 if ($ev->{button} == $self->{button}) {
2794 undef $GRAB; 2923 undef $GRAB;
2795 $self->hide; 2924 $self->hide;
2796 2925
2797 $self->emit ("popdown"); 2926 $self->_emit ("popdown");
2798 $self->{hover}[1]->() if $self->{hover}; 2927 $self->{hover}[1]->() if $self->{hover};
2928 } else {
2929 return 0
2930 }
2931
2799 } 2932 1
2800} 2933}
2801 2934
2802############################################################################# 2935#############################################################################
2803 2936
2804package CFClient::UI::Statusbox; 2937package CFClient::UI::Statusbox;
… …
2864sub add { 2997sub add {
2865 my ($self, $text, %arg) = @_; 2998 my ($self, $text, %arg) = @_;
2866 2999
2867 $text =~ s/^\s+//; 3000 $text =~ s/^\s+//;
2868 $text =~ s/\s+$//; 3001 $text =~ s/\s+$//;
3002
3003 return unless $text;
2869 3004
2870 my $timeout = time + ((delete $arg{timeout}) || 60); 3005 my $timeout = time + ((delete $arg{timeout}) || 60);
2871 3006
2872 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873 3008
… …
2907 $self->SUPER::reconfigure; 3042 $self->SUPER::reconfigure;
2908} 3043}
2909 3044
2910############################################################################# 3045#############################################################################
2911 3046
2912package CFClient::UI::Root; 3047package CFClient::UI::Inventory;
2913 3048
2914our @ISA = CFClient::UI::Container::; 3049our @ISA = CFClient::UI::ScrolledWindow::;
2915
2916use CFClient::OpenGL;
2917 3050
2918sub new { 3051sub new {
2919 my $class = shift; 3052 my $class = shift;
2920 3053
2921 $class->SUPER::new ( 3054 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2922 @_, 3056 @_,
2923 ) 3057 );
2924}
2925 3058
2926sub configure { 3059 $self
3060}
3061
3062sub set_items {
3063 my ($self, $items) = @_;
3064
3065 $self->{scrolled}->clear;
3066 return unless $items;
3067
3068 my @items = sort {
3069 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name})
3071 } @$items;
3072
3073 $self->{real_items} = \@items;
3074
3075 my $row = 0;
3076 for my $item (@items) {
3077 CFClient::Item::update_widgets $item;
3078
3079 $self->{scrolled}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3082
3083 $row++;
3084 }
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::BindEditor;
3090
3091our @ISA = CFClient::UI::FancyFrame::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3097
3098 $self->add (my $vb = new CFClient::UI::VBox);
3099
3100
3101 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3102 text => "start recording",
3103 tooltip => "Start/Stops recording of actions."
3104 ."All subsequent actions after the recording started will be captured."
3105 ."The actions are displayed after the record was stopped."
3106 ."To bind the action you have to click on the 'Bind' button",
3107 on_activate => sub {
3108 unless ($self->{recording}) {
3109 $self->start;
3110 } else {
3111 $self->stop;
3112 }
3113 });
3114
3115 $vb->add (new CFClient::UI::Label text => "Actions:");
3116 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3117
3118 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3119 $vb->add (my $hb = new CFClient::UI::HBox);
3120 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3121 $hb->add (new CFClient::UI::Button
3122 text => "bind",
3123 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3124 on_activate => sub {
3125 $self->ask_for_bind;
3126 });
3127
3128 $vb->add (my $hb = new CFClient::UI::HBox);
3129 $hb->add (new CFClient::UI::Button
3130 text => "ok",
3131 expand => 1,
3132 tooltip => "This closes the binding editor and saves the binding",
3133 on_activate => sub {
3134 $self->hide;
3135 $self->commit;
3136 });
3137
3138 $hb->add (new CFClient::UI::Button
3139 text => "cancel",
3140 expand => 1,
3141 tooltip => "This closes the binding editor without saving",
3142 on_activate => sub {
3143 $self->hide;
3144 $self->{binding_cancel}->()
3145 if $self->{binding_cancel};
3146 });
3147
3148 $self->update_binding_widgets;
3149
3150 $self
3151}
3152
3153sub commit {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 if ($sym != 0 && @$cmds > 0) {
3157 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3158 ."'. Don't forget 'Save Config'!");
3159 $self->{binding_change}->($mod, $sym, $cmds)
3160 if $self->{binding_change};
3161 } else {
3162 $::STATUSBOX->add ("No action bound, no key or action specified!");
3163 $self->{binding_cancel}->()
3164 if $self->{binding_cancel};
3165 }
3166}
3167
3168sub start {
3169 my ($self) = @_;
3170
3171 $self->{rec_btn}->set_text ("stop recording");
3172 $self->{recording} = 1;
3173 $self->clear_command_list;
3174 $::CONN->start_record if $::CONN;
3175}
3176
3177sub stop {
3178 my ($self) = @_;
3179
3180 $self->{rec_btn}->set_text ("start recording");
3181 $self->{recording} = 0;
3182
3183 my $rec;
3184 $rec = $::CONN->stop_record if $::CONN;
3185 return unless ref $rec eq 'ARRAY';
3186 $self->set_command_list ($rec);
3187}
3188
3189
3190sub ask_for_bind_and_commit {
3191 my ($self) = @_;
3192 $self->ask_for_bind (1);
3193}
3194
3195sub ask_for_bind {
3196 my ($self, $commit) = @_;
3197
3198 CFClient::Binder::open_binding_dialog (sub {
3199 my ($mod, $sym) = @_;
3200 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3201 $self->update_binding_widgets;
3202 $self->commit if $commit;
3203 });
3204}
3205
3206# $mod and $sym are the modifiers and key symbol
3207# $cmds is a array ref of strings (the commands)
3208# $cb is the callback that is executed on OK
3209# $ccb is the callback that is executed on CANCEL and
3210# when the binding was unsuccessful on OK
3211sub set_binding {
2927 my ($self, $x, $y, $w, $h) = @_; 3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2928 3213
2929 $self->{w} = $w; 3214 $self->clear_command_list;
2930 $self->{h} = $h; 3215 $self->{recording} = 0;
2931} 3216 $self->{rec_btn}->set_text ("start recording");
2932 3217
2933sub check_size { 3218 $self->{binding} = [$mod, $sym];
3219 $self->{commands} = $cmds;
3220
3221 $self->{binding_change} = $cb;
3222 $self->{binding_cancel} = $ccb;
3223
3224 $self->update_binding_widgets;
3225}
3226
3227# this is a shortcut method that asks for a binding
3228# and then just binds it.
3229sub do_quick_binding {
2934 my ($self) = @_; 3230 my ($self, $cmds) = @_;
3231 $self->set_binding (undef, undef, $cmds, sub {
3232 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3233 });
3234 $self->ask_for_bind (1);
3235}
2935 3236
2936 $self->size_allocate ($self->{w}, $self->{h}) 3237sub update_binding_widgets {
2937 if $self->{w}; 3238 my ($self) = @_;
3239 my ($mod, $sym, $cmds) = $self->get_binding;
3240 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3241 $self->set_command_list ($cmds);
3242}
3243
3244sub get_binding {
3245 my ($self) = @_;
3246 return (
3247 $self->{binding}->[0],
3248 $self->{binding}->[1],
3249 [ grep { defined $_ } @{$self->{commands}} ]
3250 );
3251}
3252
3253sub clear_command_list {
3254 my ($self) = @_;
3255 $self->{cmdbox}->clear ();
3256}
3257
3258sub set_command_list {
3259 my ($self, $cmds) = @_;
3260
3261 $self->{cmdbox}->clear ();
3262 $self->{commands} = $cmds;
3263
3264 my $idx = 0;
3265
3266 for (@$cmds) {
3267 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3268
3269 my $i = $idx;
3270 $hb->add (new CFClient::UI::Label text => $_);
3271 $hb->add (new CFClient::UI::Button
3272 text => "delete",
3273 tooltip => "Deletes the action from the record",
3274 on_activate => sub {
3275 $self->{cmdbox}->remove ($hb);
3276 $cmds->[$i] = undef;
3277 });
3278
3279
3280 $idx++
3281 }
3282}
3283
3284#############################################################################
3285
3286package CFClient::UI::SpellList;
3287
3288our @ISA = CFClient::UI::FancyFrame::;
3289
3290sub new {
3291 my $class = shift;
3292
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3294
3295 $self->add (new CFClient::UI::ScrolledWindow
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3297
3298 $self;
3299}
3300
3301# XXX: Do sorting? Argl...
3302sub add_spell {
3303 my ($self, $spell) = @_;
3304 $self->{spells}->{$spell->{name}} = $spell;
3305
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333}
3334
3335sub remove_spell {
3336 my ($self, $spell) = @_;
3337 delete $self->{spells}->{$spell->{name}};
3338 $self->rebuild_spell_list;
3339}
3340
3341#############################################################################
3342
3343package CFClient::UI::Root;
3344
3345our @ISA = CFClient::UI::Container::;
3346
3347use CFClient::OpenGL;
3348
3349sub new {
3350 my $class = shift;
3351
3352 my $self = $class->SUPER::new (
3353 visible => 1,
3354 @_,
3355 );
3356
3357 Scalar::Util::weaken ($self->{root} = $self);
3358
3359 $self
2938} 3360}
2939 3361
2940sub size_request { 3362sub size_request {
2941 my ($self) = @_; 3363 my ($self) = @_;
2942 3364
2943 ($self->{w}, $self->{h}) 3365 ($self->{w}, $self->{h})
3366}
3367
3368sub _to_pixel {
3369 my ($coord, $size, $max) = @_;
3370
3371 $coord =
3372 $coord eq "center" ? ($max - $size) * 0.5
3373 : $coord eq "max" ? $max
3374 : $coord;
3375
3376 $coord = 0 if $coord < 0;
3377 $coord = $max - $size if $coord > $max - $size;
3378
3379 int $coord + 0.5
2944} 3380}
2945 3381
2946sub size_allocate { 3382sub size_allocate {
2947 my ($self, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
2948 3384
2949 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954
2955 for my $child ($self->children) { 3385 for my $child ($self->children) {
2956 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3386 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2957 3387
2958 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3388 $X = $child->{force_x} if exists $child->{force_x};
2959 if exists $child->{req_x}; 3389 $Y = $child->{force_y} if exists $child->{force_y};
2960 3390
2961 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3391 $X = _to_pixel $X, $W, $self->{w};
2962 if exists $child->{req_y}; 3392 $Y = _to_pixel $Y, $H, $self->{h};
2963
2964 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2965 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966 3393
2967 $child->configure ($X, $Y, $W, $H); 3394 $child->configure ($X, $Y, $W, $H);
2968 } 3395 }
2969} 3396}
2970 3397
… …
2981} 3408}
2982 3409
2983sub update { 3410sub update {
2984 my ($self) = @_; 3411 my ($self) = @_;
2985 3412
2986 $self->check_size;
2987 $::WANT_REFRESH++; 3413 $::WANT_REFRESH++;
2988} 3414}
2989 3415
2990sub add { 3416sub add {
2991 my ($self, @children) = @_; 3417 my ($self, @children) = @_;
2992 3418
2993 for my $child (@children) {
2994 $child->{toplevel} = 1; 3419 $_->{is_toplevel} = 1
2995 3420 for @children;
2996 # integerise window positions
2997 $child->{x} = int $child->{x};
2998 $child->{y} = int $child->{y};
2999 }
3000 3421
3001 $self->SUPER::add (@children); 3422 $self->SUPER::add (@children);
3423}
3424
3425sub remove {
3426 my ($self, @children) = @_;
3427
3428 $self->SUPER::remove (@children);
3429
3430 delete $self->{is_toplevel}
3431 for @children;
3002 3432
3003 while (@children) { 3433 while (@children) {
3004 my $w = pop @children; 3434 my $w = pop @children;
3005 push @children, $w->children; 3435 push @children, $w->children;
3006 $w->{visible} = 1; 3436 $w->set_invisible;
3007 }
3008}
3009
3010sub remove {
3011 my ($self, @children) = @_;
3012
3013 $self->SUPER::remove (@children);
3014
3015 while (@children) {
3016 my $w = pop @children;
3017 push @children, $w->children;
3018 delete $w->{visible};
3019 } 3437 }
3020} 3438}
3021 3439
3022sub on_refresh { 3440sub on_refresh {
3023 my ($self, $id, $cb) = @_; 3441 my ($self, $id, $cb) = @_;
… …
3037 while ($self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
3038 $_->() 3456 $_->()
3039 for values %{delete $self->{refresh_hook}}; 3457 for values %{delete $self->{refresh_hook}};
3040 } 3458 }
3041 3459
3042 if ($self->{check_size}) { 3460 if ($self->{realloc}) {
3043 my @queue = ([], []); 3461 my %queue;
3462 my @queue;
3463 my $widget;
3044 3464
3045 for (;;) { 3465 outer:
3046 if ($self->{check_size}) { 3466 while () {
3047 # heuristic: check containers last 3467 if (my $realloc = delete $self->{realloc}) {
3048 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3468 for $widget (values %$realloc) {
3049 for values %{delete $self->{check_size}} 3469 $widget->{visible} or next; # do not resize invisible widgets
3470
3471 $queue{$widget+0}++ and next; # duplicates are common
3472
3473 push @{ $queue[$widget->{visible}] }, $widget;
3474 }
3050 } 3475 }
3051 3476
3052 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3477 while () {
3478 @queue or last outer;
3053 3479
3054 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3480 $widget = pop @{ $queue[-1] || [] }
3055 ? @$widget{qw(user_w user_h)} 3481 and last;
3056 : $widget->size_request;
3057
3058 if (delete $widget->{force_alloc}
3059 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3060 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3061 3482
3483 pop @queue;
3484 }
3485
3486 delete $queue{$widget+0};
3487
3488 my ($w, $h) = $widget->size_request;
3489
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3492
3493 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h};
3495
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3497 || delete $widget->{force_realloc}) {
3062 $widget->{req_w} = $w; 3498 $widget->{req_w} = $w;
3063 $widget->{req_h} = $h; 3499 $widget->{req_h} = $h;
3064 3500
3065 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3501 $self->{size_alloc}{$widget+0} = $widget;
3066 3502
3067 $widget->{parent}->check_size
3068 if $widget->{parent}; 3503 if (my $parent = $widget->{parent}) {
3504 $self->{realloc}{$parent+0} = $parent
3505 unless $queue{$parent+0};
3506
3507 $parent->{force_size_alloc} = 1;
3508 $self->{size_alloc}{$parent+0} = $parent;
3509 }
3069 } 3510 }
3511
3512 delete $self->{realloc}{$widget+0};
3070 } 3513 }
3071 } 3514 }
3072 3515
3073 while ($self->{size_alloc}) { 3516 while (my $size_alloc = delete $self->{size_alloc}) {
3074 for (values %{delete $self->{size_alloc}}) { 3517 my @queue = sort { $b->{visible} <=> $a->{visible} }
3075 my ($widget, $w, $h) = @$_; 3518 values %$size_alloc;
3519
3520 while () {
3521 my $widget = pop @queue || last;
3522
3523 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3076 3524
3077 $w = 0 if $w < 0; 3525 $w = 0 if $w < 0;
3078 $h = 0 if $h < 0; 3526 $h = 0 if $h < 0;
3079 3527
3528 $w = int $w + 0.5;
3529 $h = int $h + 0.5;
3530
3531 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3532 $widget->{old_w} = $widget->{w};
3533 $widget->{old_h} = $widget->{h};
3534
3080 $widget->{w} = $w; 3535 $widget->{w} = $w;
3081 $widget->{h} = $h; 3536 $widget->{h} = $h;
3082 $widget->size_allocate ($w, $h); 3537
3083 $widget->emit (size_allocate => $w, $h); 3538 $widget->emit (size_allocate => $w, $h);
3539 }
3084 } 3540 }
3085 } 3541 }
3086 3542
3087 while ($self->{post_alloc_hook}) { 3543 while ($self->{post_alloc_hook}) {
3088 $_->() 3544 $_->()
3089 for values %{delete $self->{post_alloc_hook}}; 3545 for values %{delete $self->{post_alloc_hook}};
3090 } 3546 }
3547
3091 3548
3092 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3093 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3094 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
3095 3552
… …
3097 glLoadIdentity; 3554 glLoadIdentity;
3098 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3099 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
3100 glLoadIdentity; 3557 glLoadIdentity;
3101 3558
3559 {
3560 package CFClient::UI::Base;
3561
3562 ($draw_x, $draw_y, $draw_w, $draw_h) =
3563 (0, 0, $self->{w}, $self->{h});
3564 }
3565
3102 $self->_draw; 3566 $self->_draw;
3103} 3567}
3104 3568
3105############################################################################# 3569#############################################################################
3106 3570

Diff Legend

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