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.216 by root, Fri May 19 16:43:57 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) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 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
150 $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.]+$/;
151 $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};
152 $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};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $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.]+$/;
155 $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};
156 $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};
157 $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
158 } 189 }
159
160 $widget->reconfigure;
161 } 190 }
191
192 reconfigure_widgets;
162} 193}
163 194
164############################################################################# 195#############################################################################
165 196
166package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
171 202
172sub new { 203sub new {
173 my $class = shift; 204 my $class = shift;
174 205
175 my $self = bless { 206 my $self = bless {
176 x => 0, 207 x => "center",
177 y => 0, 208 y => "center",
178 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
179 can_events => 1, 212 can_events => 1,
180 @_ 213 @_
181 }, $class; 214 }, $class;
182 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
183 for (keys %$self) { 218 for (keys %$self) {
184 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
186 } 221 }
187 } 222 }
188 223
189 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 }
190 235
191 $self 236 $self
192} 237}
193 238
194sub destroy { 239sub destroy {
… …
204 return if $self->{parent}; 249 return if $self->{parent};
205 250
206 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
207} 252}
208 253
209sub hide { 254sub set_visible {
210 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};
211 278
212 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
214 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
215 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
216 if $self->{parent}; 313 if $self->{parent};
217} 314}
218 315
219sub move { 316sub move_abs {
220 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
221 318
222 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
223 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
224 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
225 322
226 $self->update; 323 $self->update;
227} 324}
228 325
229sub set_size { 326sub set_size {
230 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
231 328
232 $self->{user_w} = $w; 329 $self->{force_w} = $w;
233 $self->{user_h} = $h; 330 $self->{force_h} = $h;
234 331
235 $self->check_size; 332 $self->realloc;
236} 333}
237 334
238sub size_request { 335sub size_request {
239 require Carp; 336 require Carp;
240 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
242 339
243sub configure { 340sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
245 342
246 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
249 348
250 # use alignment to adjust x, y 349 # use alignment to adjust x, y
251 350
252 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 353 }
257 354
258 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 356 $self->{x} = $x;
260 $self->{y} = $y; 357 $self->{y} = $y;
261 $self->update; 358 $self->update;
262 } 359 }
263 360
264 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $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;
266 } 368 }
267} 369}
268 370
269sub size_allocate { 371sub size_allocate {
270 # nothing to be done 372 # nothing to be done
271} 373}
272 374
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children { 375sub children {
281} 376}
282 377
283sub set_max_size { 378sub set_max_size {
284 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
… …
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
288} 383}
289 384
290sub set_tooltip { 385sub set_tooltip {
291 my ($self, $tooltip) = @_; 386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
292 392
293 $self->{tooltip} = $tooltip; 393 $self->{tooltip} = $tooltip;
294 394
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 396 delete $CFClient::UI::TOOLTIP->{owner};
… …
318 return if $FOCUS == $self; 418 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
320 420
321 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
322 422
323 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
324 424
325 $focus->update if $focus; 425 $focus->update if $focus;
326 $FOCUS->update; 426 $FOCUS->update;
327} 427}
328 428
… …
331 431
332 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
333 433
334 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
335 435
336 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
337 437
338 $focus->update if $focus; #? 438 $focus->update if $focus; #?
339}
340 439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
442}
443
341sub mouse_motion { } 444sub mouse_motion { 0 }
342sub button_up { } 445sub button_up { 0 }
343sub key_down { } 446sub key_down { 0 }
344sub key_up { } 447sub key_up { 0 }
345 448
346sub button_down { 449sub button_down {
347 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
348 451
349 $self->focus_in; 452 $self->focus_in;
350}
351 453
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
356sub 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
357 530
358sub draw { 531sub draw {
359 my ($self) = @_; 532 my ($self) = @_;
360 533
361 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);
362 545
363 glPushMatrix; 546 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw; 548 $self->_draw;
366 glPopMatrix; 549 glPopMatrix;
… …
378 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
379 glEnd; 562 glEnd;
380 glDisable GL_BLEND; 563 glDisable GL_BLEND;
381 } 564 }
382 565
383 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
384 glPushMatrix; 567 glPushMatrix;
385 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 571 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 572 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 573 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 574 glVertex 0 , $self->{h} - 1;
392 glEnd; 575 glEnd;
393 glPopMatrix; 576 glPopMatrix;
394 #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;
395 } 578 }
396} 579}
397 580
398sub _draw { 581sub _draw {
399 my ($self) = @_; 582 my ($self) = @_;
400 583
401 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
402}
403
404sub find_widget {
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450} 585}
451 586
452sub DESTROY { 587sub DESTROY {
453 my ($self) = @_; 588 my ($self) = @_;
454 589
… …
512 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
514} 649}
515 650
516sub size_request { 651sub size_request {
517 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
518} 655}
519 656
520sub draw { } 657sub draw { }
521 658
522############################################################################# 659#############################################################################
… …
551 $self->{children} = [ 688 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 690 @{$self->{children}}, @widgets
554 ]; 691 ];
555 692
556 $self->check_size (1); 693 $self->realloc;
557 $self->update;
558} 694}
559 695
560sub children { 696sub children {
561 @{ $_[0]{children} } 697 @{ $_[0]{children} }
562} 698}
… …
567 delete $child->{parent}; 703 delete $child->{parent};
568 $child->hide; 704 $child->hide;
569 705
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 707
572 $self->check_size; 708 $self->realloc;
573 $self->update;
574} 709}
575 710
576sub clear { 711sub clear {
577 my ($self) = @_; 712 my ($self) = @_;
578 713
… …
582 for (@$children) { 717 for (@$children) {
583 delete $_->{parent}; 718 delete $_->{parent};
584 $_->hide; 719 $_->hide;
585 } 720 }
586 721
587 $self->check_size; 722 $self->realloc;
588 $self->update;
589} 723}
590 724
591sub find_widget { 725sub find_widget {
592 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
593 727
… …
680 $self->SUPER::size_allocate ($w, $h); 814 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 815 $self->update;
682} 816}
683 817
684sub _render { 818sub _render {
819 my ($self) = @_;
820
685 $_[0]{children}[0]->draw; 821 $self->{children}[0]->draw;
686} 822}
687 823
688sub render_child { 824sub render_child {
689 my ($self) = @_; 825 my ($self) = @_;
690 826
691 $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 {
692 glClearColor 0, 0, 0, 0; 828 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 829 glClear GL_COLOR_BUFFER_BIT;
694 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
695 $self->_render; 838 $self->_render;
696 }; 839 };
697} 840}
698 841
699sub _draw { 842sub _draw {
700 my ($self) = @_; 843 my ($self) = @_;
701 844
702 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
703 846
704 my $tex = $self->{texture} 847 my $tex = $self->{texture}
705 or return; 848 or return;
706 849
707 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
… …
717 860
718package CFClient::UI::ViewPort; 861package CFClient::UI::ViewPort;
719 862
720our @ISA = CFClient::UI::Window::; 863our @ISA = CFClient::UI::Window::;
721 864
865sub new {
866 my $class = shift;
867
868 $class->SUPER::new (
869 scroll_x => 0,
870 scroll_y => 1,
871 @_,
872 )
873}
874
722sub size_request { 875sub size_request {
723 my ($self) = @_; 876 my ($self) = @_;
724 877
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 878 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 879
728 @$self{qw(child_w child_h)} 880 $w = 10 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y};
882
883 ($w, $h)
729} 884}
730 885
731sub size_allocate { 886sub size_allocate {
732 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 895 $self->update;
735} 896}
736 897
737sub set_offset { 898sub set_offset {
738 my ($self, $x, $y) = @_; 899 my ($self, $x, $y) = @_;
… …
772} 933}
773 934
774sub _render { 935sub _render {
775 my ($self) = @_; 936 my ($self) = @_;
776 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
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 942
779 $self->SUPER::_render; 943 $self->SUPER::_render;
780} 944}
781 945
… …
789 my $class = shift; 953 my $class = shift;
790 954
791 my $self; 955 my $self;
792 956
793 my $slider = new CFClient::UI::Slider 957 my $slider = new CFClient::UI::Slider
794 vertical => 1, 958 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 959 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 960 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 961 $self->{vp}->set_offset (0, $_[1]);
798 }, 962 },
799 ; 963 ;
800 964
801 $self = $class->SUPER::new ( 965 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 966 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 967 slider => $slider,
804 @_, 968 @_,
805 ); 969 );
806 970
807 $self->{vp}->add ($self->{scrolled}); 971 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp}); 972 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 973 $self->add ($self->{slider});
810 974
811 $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]);
812} 995}
813 996
814#TODO# update range on size_allocate depending on child 997#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 998# update viewport offset on scroll
816 999
… …
860 1043
861our @ISA = CFClient::UI::Bin::; 1044our @ISA = CFClient::UI::Bin::;
862 1045
863use CFClient::OpenGL; 1046use CFClient::OpenGL;
864 1047
865my @tex = 1048my $bg =
1049 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1050 mipmap => 1, wrap => 1;
1051
1052my @border =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1053 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 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);
868 1055
869sub new { 1056sub new {
870 my $class = shift; 1057 my ($class, %arg) = @_;
871 1058
872 # TODO: user_x, user_y, overwrite moveto? 1059 my $title = delete $arg{title};
873 1060
874 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1064 border => 0.6,
878 toplevel => 1,
879 can_events => 1, 1065 can_events => 1,
880 @_ 1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
881 ); 1069 );
882 1070
883 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
884 align => 0, 1072 align => 0,
885 valign => 1, 1073 valign => 1,
886 text => $self->{title}, 1074 text => $title,
887 fontsize => $self->{border}; 1075 fontsize => $self->{border}
1076 if defined $title;
888 1077
889 $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};
890} 1086}
891 1087
892sub border { 1088sub border {
893 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
894} 1090}
895 1091
896sub size_request { 1092sub size_request {
897 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
898 1097
899 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
900 1099
901 ( 1100 (
902 $w + $self->border * 2, 1101 $w + $self->border * 2,
… …
905} 1104}
906 1105
907sub size_allocate { 1106sub size_allocate {
908 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
909 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
910 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
911 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
912 1119
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
914 if $self->{title};
915
916 $self->child->configure ($self->border, $self->border, $w, $h); 1120 $self->child->configure ($border, $border, $w, $h);
917} 1121}
918 1122
919sub button_down { 1123sub button_down {
920 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
921 1125
… …
937 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
938 1142
939 my $dx = $ev->{x} - $ox; 1143 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1144 my $dy = $ev->{y} - $oy;
941 1145
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148
1149 $self->realloc;
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size;
946 }; 1151 };
947 1152
948 } elsif ($lr ^ $td) { 1153 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1157 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
954 1159
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
956 1161
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update;
959 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
960 } 1168 1
961} 1169}
962 1170
963sub button_up { 1171sub button_up {
964 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
965 1173
966 delete $self->{motion}; 1174 !!delete $self->{motion}
967} 1175}
968 1176
969sub mouse_motion { 1177sub mouse_motion {
970 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
971 1179
972 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
973} 1183}
974 1184
975sub _draw { 1185sub _draw {
976 my ($self) = @_; 1186 my ($self) = @_;
977 1187
1188 my $child = $self->{children}[0];
1189
978 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
980 1192
981 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1195
984 my $border = $self->border; 1196 my $border = $self->border;
985 1197
986 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1203
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1205 glColor @{ $self->{bg} };
994 1206
995 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
1208 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1209 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1210 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1212 }
1006 1213
1007 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
1008 1215
1009 $self->{title}->draw if $self->{title};
1010
1011 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
1012} 1222}
1013 1223
1014############################################################################# 1224#############################################################################
1015 1225
1016package CFClient::UI::Table; 1226package CFClient::UI::Table;
… …
1024sub new { 1234sub new {
1025 my $class = shift; 1235 my $class = shift;
1026 1236
1027 $class->SUPER::new ( 1237 $class->SUPER::new (
1028 col_expand => [], 1238 col_expand => [],
1029 @_ 1239 @_,
1030 ) 1240 )
1241}
1242
1243sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1245}
1032 1246
1033sub add { 1247sub add {
1034 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
1035 1249
1036 $child->set_parent ($self); 1250 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
1038 1252
1039 $child->check_size; 1253 $self->realloc;
1040} 1254}
1041 1255
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# 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?
1047sub clear { 1257sub clear {
1048 my ($self) = @_; 1258 my ($self) = @_;
1049 1259
1050 my @children = $self->children; 1260 my @children = $self->children;
1051 delete $self->{children}; 1261 delete $self->{children};
… …
1053 for (@children) { 1263 for (@children) {
1054 delete $_->{parent}; 1264 delete $_->{parent};
1055 $_->hide; 1265 $_->hide;
1056 } 1266 }
1057 1267
1058 $self->update; 1268 $self->realloc;
1059} 1269}
1060 1270
1061sub get_wh { 1271sub get_wh {
1062 my ($self) = @_; 1272 my ($self) = @_;
1063 1273
… …
1094sub size_allocate { 1304sub size_allocate {
1095 my ($self, $w, $h) = @_; 1305 my ($self, $w, $h) = @_;
1096 1306
1097 my ($ws, $hs) = $self->get_wh; 1307 my ($ws, $hs) = $self->get_wh;
1098 1308
1099 my $req_w = sum @$ws; 1309 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1310 my $req_h = (sum @$hs) || 1;
1101 1311
1102 # TODO: nicer code && do row_expand 1312 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1313 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1314 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1315 my $col_expand = (sum @col_expand) || 1;
… …
1159 } 1369 }
1160} 1370}
1161 1371
1162############################################################################# 1372#############################################################################
1163 1373
1164package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1165
1166# TODO: wrap into common Box base class
1167 1375
1168our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1169 1377
1170sub size_request { 1378sub size_request {
1171 my ($self) = @_; 1379 my ($self) = @_;
1172 1380
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1174 1382 ? (
1175 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1176 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1177 (List::Util::max map $_->[1], @alloc), 1385 )
1178 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1179} 1390}
1180 1391
1181sub size_allocate { 1392sub size_allocate {
1182 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1183 1394
1184 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1185
1186 my $children = $self->{children}; 1396 my $children = $self->{children};
1187 1397
1188 my @h = map $_->{req_w}, @$children; 1398 my @req;
1189 1399
1190 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1191 1401 @req = ($space / (@$children || 1)) x @$children;
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } 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 {
1196 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1197 $exp ||= 1;
1198 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1199 for (0 .. $#$children) { 1415 for 0 .. $#$children;
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 } 1416 }
1206 } 1417 }
1207 1418
1208 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1209 1420
1210 my $y = 0; 1421 my $pos = 0;
1211 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1214 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1215 1425
1216 $y += $h; 1426 $pos += $alloc;
1217 } 1427 }
1218 1428
1219 1 1429 1
1220} 1430}
1221 1431
1222############################################################################# 1432#############################################################################
1223 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
1224package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1225 1450
1226# TODO: wrap into common Box base class
1227
1228our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1229 1452
1230sub size_request { 1453sub new {
1231 my ($self) = @_; 1454 my $class = shift;
1232 1455
1233 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1234 1457 vertical => 1,
1235 ( 1458 @_,
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1459 )
1239}
1240
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278} 1460}
1279 1461
1280############################################################################# 1462#############################################################################
1281 1463
1282package CFClient::UI::Label; 1464package CFClient::UI::Label;
… …
1299 ellipsise => 3, # end 1481 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1482 layout => (new CFClient::Layout),
1301 fontsize => 1, 1483 fontsize => 1,
1302 align => -1, 1484 align => -1,
1303 valign => -1, 1485 valign => -1,
1304 padding => 2, 1486 padding_x => 2,
1487 padding_y => 2,
1305 can_events => 0, 1488 can_events => 0,
1306 %arg 1489 %arg
1307 ); 1490 );
1308 1491
1309 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
… …
1345 $self->{text} = "T$text"; 1528 $self->{text} = "T$text";
1346 1529
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1349 1532
1533 $self->realloc;
1350 $self->update; 1534 $self->update;
1351 $self->check_size;
1352} 1535}
1353 1536
1354sub set_markup { 1537sub set_markup {
1355 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1356 1539
… …
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1543 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1544
1362 $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;
1363 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1364 1547
1548 $self->realloc;
1365 $self->update; 1549 $self->update;
1366 $self->check_size;
1367} 1550}
1368 1551
1369sub size_request { 1552sub size_request {
1370 my ($self) = @_; 1553 my ($self) = @_;
1371 1554
… …
1385 1568
1386 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1388 } 1571 }
1389 1572
1390 ( 1573 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1574}
1395 1575
1396sub size_allocate { 1576sub size_allocate {
1397 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1398 1578
1579 delete $self->{ox};
1580
1399 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1583}
1401 1584
1402sub set_fontsize { 1585sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1404 1587
1405 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1589 delete $self->{texture};
1407 1590
1408 $self->update; 1591 $self->realloc;
1409 $self->check_size;
1410} 1592}
1411 1593
1412sub _draw { 1594sub _draw {
1413 my ($self) = @_; 1595 my ($self) = @_;
1414 1596
… …
1420 $self->{layout}->set_width ($self->{w}); 1602 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1603 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1606
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1607 new_from_layout CFClient::Texture $self->{layout}
1608 };
1426 1609
1610 unless (exists $self->{ox}) {
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1429 : ($self->{w} - $tex->{w}) * 0.5); 1613 : ($self->{w} - $tex->{w}) * 0.5);
1430 1614
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1433 : ($self->{h} - $tex->{h}) * 0.5); 1617 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1436 }; 1618 };
1437 1619
1438 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1440 1622
… …
1466 active_fg => [0, 0, 0], 1648 active_fg => [0, 0, 0],
1467 can_hover => 1, 1649 can_hover => 1,
1468 can_focus => 1, 1650 can_focus => 1,
1469 valign => 0, 1651 valign => 0,
1470 can_events => 1, 1652 can_events => 1,
1653 #text => ...
1471 @_ 1654 @_
1472 ) 1655 )
1473} 1656}
1474 1657
1475sub _set_text { 1658sub _set_text {
… …
1485 $self->{text} = $text; 1668 $self->{text} = $text;
1486 1669
1487 $text =~ s/./*/g if $self->{hidden}; 1670 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1671 $self->{layout}->set_text ("$text ");
1489 1672
1490 $self->emit (changed => $self->{text}); 1673 $self->_emit (changed => $self->{text});
1491} 1674}
1492 1675
1493sub set_text { 1676sub set_text {
1494 my ($self, $text) = @_; 1677 my ($self, $text) = @_;
1495 1678
1496 $self->{cursor} = length $text; 1679 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1680 $self->_set_text ($text);
1498 $self->update; 1681
1499 $self->check_size; 1682 $self->realloc;
1500} 1683}
1501 1684
1502sub get_text { 1685sub get_text {
1503 $_[0]{text} 1686 $_[0]{text}
1504} 1687}
… …
1507 my ($self) = @_; 1690 my ($self) = @_;
1508 1691
1509 my ($w, $h) = $self->SUPER::size_request; 1692 my ($w, $h) = $self->SUPER::size_request;
1510 1693
1511 ($w + 1, $h) # add 1 for cursor 1694 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518} 1695}
1519 1696
1520sub key_down { 1697sub key_down {
1521 my ($self, $ev) = @_; 1698 my ($self, $ev) = @_;
1522 1699
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1714 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1715 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1716 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1718 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1719 $self->_emit ('escape');
1543 } elsif ($uni) { 1720 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1545 } 1724 }
1546 1725
1547 $self->_set_text ($text); 1726 $self->_set_text ($text);
1548 $self->update; 1727
1549 $self->check_size; 1728 $self->realloc;
1729
1730 1
1550} 1731}
1551 1732
1552sub focus_in { 1733sub focus_in {
1553 my ($self) = @_; 1734 my ($self) = @_;
1554 1735
… …
1569 utf8::encode $text; 1750 utf8::encode $text;
1570 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1571 1752
1572 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1573 $self->update; 1754 $self->update;
1755
1756 1
1574} 1757}
1575 1758
1576sub mouse_motion { 1759sub mouse_motion {
1577 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1578# 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
1579} 1764}
1580 1765
1581sub _draw { 1766sub _draw {
1582 my ($self) = @_; 1767 my ($self) = @_;
1583 1768
… …
1634 if ($sym == 13) { 1819 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1820 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1821 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1822 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1823 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1824 $self->_emit (activate => $txt);
1640 $self->update; 1825 $self->update;
1641 1826
1642 } elsif ($sym == CFClient::SDLK_UP) { 1827 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1828 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1829 $self->{history_saveback} = $self->get_text;
… …
1660 } else { 1845 } else {
1661 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1662 } 1847 }
1663 1848
1664 } else { 1849 } else {
1665 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1666 } 1853 1
1667
1668} 1854}
1669 1855
1670############################################################################# 1856#############################################################################
1671 1857
1672package CFClient::UI::Button; 1858package CFClient::UI::Button;
… …
1681 1867
1682sub new { 1868sub new {
1683 my $class = shift; 1869 my $class = shift;
1684 1870
1685 $class->SUPER::new ( 1871 $class->SUPER::new (
1686 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1687 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1689 can_hover => 1, 1876 can_hover => 1,
1690 align => 0, 1877 align => 0,
1691 valign => 0, 1878 valign => 0,
1692 can_events => 1, 1879 can_events => 1,
1693 @_ 1880 @_
1694 ) 1881 )
1695} 1882}
1696 1883
1884sub activate { }
1885
1697sub button_up { 1886sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1699 1888
1889 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1891 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate"); 1892
1703 } 1893 1
1704} 1894}
1705 1895
1706sub _draw { 1896sub _draw {
1707 my ($self) = @_; 1897 my ($self) = @_;
1708 1898
… …
1737 1927
1738sub new { 1928sub new {
1739 my $class = shift; 1929 my $class = shift;
1740 1930
1741 $class->SUPER::new ( 1931 $class->SUPER::new (
1742 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1743 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 1935 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 1936 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 1937 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 1938 state => 0,
… …
1751} 1942}
1752 1943
1753sub size_request { 1944sub size_request {
1754 my ($self) = @_; 1945 my ($self) = @_;
1755 1946
1756 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1757} 1948}
1758 1949
1759sub button_down { 1950sub button_down {
1760 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1761 1952
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1766 } 1961 1
1767} 1962}
1768 1963
1769sub _draw { 1964sub _draw {
1770 my ($self) = @_; 1965 my ($self) = @_;
1771 1966
1772 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1773 1968
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 1970
1776 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;
1777 1974
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 1976
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 1978
… …
2045 my $self = $class->SUPER::new ( 2242 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2244 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2245 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2246 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2247 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2248 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2249 min_h => $::WIDTH / 80,
2053 vertical => 0, 2250 vertical => 0,
2054 can_hover => 1, 2251 can_hover => 1,
2055 inner_pad => .05, 2252 inner_pad => 0.02,
2056 @_ 2253 @_
2057 ); 2254 );
2058 2255
2059 $self->set_value ($self->{range}[0]); 2256 $self->set_value ($self->{range}[0]);
2060 $self->update; 2257 $self->update;
2061 2258
2062 $self 2259 $self
2063} 2260}
2064 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
2065sub set_value { 2273sub set_value {
2066 my ($self, $value) = @_; 2274 my ($self, $value) = @_;
2067 2275
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2276 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2277
2070 $hi = $lo + 1 if $hi <= $lo; 2278 $hi = $lo + 1 if $hi <= $lo;
2071 2279
2280 $page = $hi - $lo if $page > $hi - $lo;
2281
2072 $value = $lo if $value < $lo; 2282 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2283 $value = $hi - $page if $value > $hi - $page;
2074 2284
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2285 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2286 if $unit;
2077 2287
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2288 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2289
2082 if ($value != $old_value) { 2290 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2291 $self->_emit (changed => $value);
2084 $self->update; 2292 $self->update;
2085 } 2293 }
2086} 2294}
2087 2295
2088sub size_request { 2296sub size_request {
2089 my ($self) = @_; 2297 my ($self) = @_;
2090 2298
2091 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2300}
2096 2301
2097sub button_down { 2302sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
2099 2304
2100 $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
2101 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
2102} 2310}
2103 2311
2104sub mouse_motion { 2312sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
2106 2314
2107 if ($GRAB == $self) { 2315 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2316 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2317
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2318 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2319
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2320 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2321
2114 $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
2115 } 2327 1
2116} 2328}
2117 2329
2118sub update { 2330sub update {
2119 my ($self) = @_; 2331 my ($self) = @_;
2120 2332
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2334 $self->set_value ($self->{range}[0]);
2123 2335
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2336 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100;
2125 2338
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2339 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2340
2128 $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;
2129 2343
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2344 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2345 $value = $value * $self->{scale} + $self->{offset};
2132 2346
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2347 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2348 $self->{knob_w} = $knob_w;
2140 }); 2349 });
2141 2350
2142 $self->SUPER::update; 2351 $self->SUPER::update;
2143} 2352}
2144 2353
… …
2168 # draw handle 2377 # draw handle
2169 $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);
2170 2379
2171 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
2172} 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 (@_) }
2173 2423
2174############################################################################# 2424#############################################################################
2175 2425
2176package CFClient::UI::TextView; 2426package CFClient::UI::TextView;
2177 2427
… …
2207 2457
2208 $self->{fontsize} = $fontsize; 2458 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2459 $self->reflow;
2210} 2460}
2211 2461
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2462sub size_allocate {
2232 my ($self, $w, $h) = @_; 2463 my ($self, $w, $h) = @_;
2233 2464
2234 $self->SUPER::size_allocate ($w, $h); 2465 $self->SUPER::size_allocate ($w, $h);
2235 2466
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2469 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2470
2240 $self->reflow; 2471 $self->reflow;
2241} 2472}
2242 2473
2474sub text_size {
2475 my ($self, $text, $indent) = @_;
2476
2477 my $layout = $self->{layout};
2478
2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2480 $layout->set_width ($self->{children}[0]{w} - $indent);
2481 $layout->set_markup ($text);
2482
2483 $layout->size
2484}
2485
2486sub reflow {
2487 my ($self) = @_;
2488
2489 $self->{need_reflow}++;
2490 $self->update;
2491}
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
2243sub add_paragraph { 2508sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2509 my ($self, $color, $text, $indent) = @_;
2245 2510
2246 #TODO: intelligently "reformat" paragraph 2511 for my $line (split /\n/, $text) {
2247 2512 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2513 $self->{height} += $h;
2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2515 }
2251 2516
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $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]);
2255 $self->{children}[1]->update;
2256} 2518}
2257 2519
2258sub update { 2520sub update {
2259 my ($self) = @_; 2521 my ($self) = @_;
2260 2522
… …
2263 return unless $self->{h} > 0; 2525 return unless $self->{h} > 0;
2264 2526
2265 delete $self->{texture}; 2527 delete $self->{texture};
2266 2528
2267 $ROOT->on_post_alloc ($self, sub { 2529 $ROOT->on_post_alloc ($self, sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531
2268 if (delete $self->{need_reflow}) { 2532 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2533 my $height = 0;
2270 2534
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2535 my $layout = $self->{layout};
2536
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538
2272 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 }
2273 2550
2274 $self->{height} = $height; 2551 $self->{height} = $height;
2275 2552
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2554
2278 delete $self->{texture}; 2555 delete $self->{texture};
2279 } 2556 }
2280 2557
2281 $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 {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2559 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2560 glClear GL_COLOR_BUFFER_BIT;
2284 2561
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2562 my $top = int $self->{children}[1]{range}[0];
2289 2563
2290 my $y0 = $top; 2564 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2565 my $y1 = $top + $H;
2292 2566
2293 my $y = 0; 2567 my $y = 0;
2294 2568
2295 my $layout = $self->{layout}; 2569 my $layout = $self->{layout};
2296 2570
2297 $layout->set_font ($self->{font}) if $self->{font}; 2571 $layout->set_font ($self->{font}) if $self->{font};
2298 2572
2573 glEnable GL_BLEND;
2574 #TODO# not correct in windows where rgba is forced off
2575 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2576
2299 for my $par (@{$self->{par}}) { 2577 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2578 my $h = $par->[1];
2301 2579
2302 if ($y0 < $y + $h && $y < $y1) { 2580 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2581 $layout->set_foreground (@{ $par->[2] });
2582 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2583 $layout->set_markup ($par->[4]);
2305 2584
2306 my ($W, $H) = $layout->size; 2585 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2586
2587 glRasterPos $par->[3], $y - $y0;
2588 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2589 }
2309 2590
2310 $y += $h; 2591 $y += $h;
2311 } 2592 }
2312 2593
2313 glDisable GL_TEXTURE_2D; 2594 glDisable GL_BLEND;
2314 }; 2595 };
2315 }); 2596 });
2316} 2597}
2317 2598
2318sub _draw { 2599sub _draw {
… …
2378 2659
2379sub new { 2660sub new {
2380 my $class = shift; 2661 my $class = shift;
2381 2662
2382 my $self = $class->SUPER::new ( 2663 my $self = $class->SUPER::new (
2383 state => 0, 2664 state => 0,
2384 connect_activate => \&toggle_flopper, 2665 on_activate => \&toggle_flopper,
2385 @_ 2666 @_
2386 ); 2667 );
2387 2668
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2669 $self
2394} 2670}
2395 2671
2396sub toggle_flopper { 2672sub toggle_flopper {
2397 my ($self) = @_; 2673 my ($self) = @_;
2398 2674
2399 # TODO: use animation 2675 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 2676}
2411 2677
2412############################################################################# 2678#############################################################################
2413 2679
2414package CFClient::UI::Tooltip; 2680package CFClient::UI::Tooltip;
… …
2427} 2693}
2428 2694
2429sub set_tooltip_from { 2695sub set_tooltip_from {
2430 my ($self, $widget) = @_; 2696 my ($self, $widget) = @_;
2431 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
2432 $self->add (new CFClient::UI::Label 2707 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip}, 2708 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 2710 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 2711 fg => [0, 0, 0, 1],
2437 ellipsise => 0, 2712 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 2713 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2449 2724
2450sub size_allocate { 2725sub size_allocate {
2451 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2452 2727
2453 $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 });
2454} 2747}
2455 2748
2456sub _draw { 2749sub _draw {
2457 my ($self) = @_; 2750 my ($self) = @_;
2458 2751
… …
2475 glVertex $w, $h; 2768 glVertex $w, $h;
2476 glVertex $w, 0; 2769 glVertex $w, 0;
2477 glEnd; 2770 glEnd;
2478 2771
2479 glTranslate 2 - 0.375, 2 - 0.375; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2773
2480 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2481} 2775}
2482 2776
2483############################################################################# 2777#############################################################################
2484 2778
… …
2489use CFClient::OpenGL; 2783use CFClient::OpenGL;
2490 2784
2491sub new { 2785sub new {
2492 my $class = shift; 2786 my $class = shift;
2493 2787
2494 $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2495 aspect => 1, 2789 aspect => 1,
2790 can_events => 0,
2496 @_, 2791 @_,
2497 ) 2792 );
2793
2794 if ($self->{anim} && $self->{animspeed}) {
2795 Scalar::Util::weaken (my $widget = $self);
2796
2797 $self->{timer} = Event->timer (
2798 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2799 hard => 1,
2800 interval => $self->{animspeed},
2801 cb => sub {
2802 ++$widget->{frame};
2803 $widget->update;
2804 },
2805 );
2806 }
2807
2808 $self
2498} 2809}
2499 2810
2500sub size_request { 2811sub size_request {
2501 (32, 8) 2812 (32, 8)
2502} 2813}
2503 2814
2815sub update {
2816 my ($self) = @_;
2817
2818 return unless $self->{visible};
2819
2820 $self->SUPER::update;
2821}
2822
2504sub _draw { 2823sub _draw {
2505 my ($self) = @_; 2824 my ($self) = @_;
2506 2825
2507 return unless $::CONN;#d# manage and cache textures differently 2826 return unless $::CONN;
2827
2828 my $face;
2829
2830 if ($self->{frame}) {
2831 my $anim = $::CONN->{anim}[$self->{anim}];
2832
2833 $face = $anim->[ $self->{frame} % @$anim ]
2834 if $anim && @$anim;
2835 }
2836
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2838
2510 # TODO animation
2511 if ($tex) { 2839 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2840 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2842 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2844 glDisable GL_TEXTURE_2D;
2517 } 2845 }
2518} 2846}
2519 2847
2520############################################################################# 2848sub DESTROY {
2521
2522package CFClient::UI::InventoryItem;
2523
2524our @ISA = CFClient::UI::HBox::;
2525
2526sub _item_to_desc {
2527 my ($item) = @_; 2849 my ($self) = @_;
2528 2850
2529 my $desc = 2851 $self->{timer}->cancel
2530 $item->{nrof} < 2 2852 if $self->{timer};
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533 2853
2534 $item->{flags} & Crossfire::Protocol::F_OPEN 2854 $self->SUPER::DESTROY;
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2552sub new {
2553 my $class = shift;
2554
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new (
2562 can_hover => 1,
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668} 2855}
2669 2856
2670############################################################################# 2857#############################################################################
2671 2858
2672package CFClient::UI::Menu; 2859package CFClient::UI::Menu;
… …
2707 2894
2708# 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)
2709sub popup { 2896sub popup {
2710 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2711 2898
2712 $self->emit ("popdown"); 2899 $self->_emit ("popdown");
2713 2900
2714 # maybe save $GRAB? must be careful about events... 2901 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 2902 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 2903 $self->{button} = $ev->{button};
2717 2904
2718 $self->show; 2905 $self->show;
2719 $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);
2720} 2907}
2721 2908
2722sub mouse_motion { 2909sub mouse_motion {
2723 my ($self, $ev, $x, $y) = @_; 2910 my ($self, $ev, $x, $y) = @_;
2724 2911
2725 # TODO: should use vbox->find_widget or so 2912 # TODO: should use vbox->find_widget or so
2726 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2727 $self->{hover} = $self->{item}{$HOVER}; 2914 $self->{hover} = $self->{item}{$HOVER};
2915
2916 0
2728} 2917}
2729 2918
2730sub button_up { 2919sub button_up {
2731 my ($self, $ev, $x, $y) = @_; 2920 my ($self, $ev, $x, $y) = @_;
2732 2921
2733 if ($ev->{button} == $self->{button}) { 2922 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 2923 undef $GRAB;
2735 $self->hide; 2924 $self->hide;
2736 2925
2737 $self->emit ("popdown"); 2926 $self->_emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 2927 $self->{hover}[1]->() if $self->{hover};
2928 } else {
2929 return 0
2930 }
2931
2739 } 2932 1
2740} 2933}
2741 2934
2742############################################################################# 2935#############################################################################
2743 2936
2744package CFClient::UI::Statusbox; 2937package CFClient::UI::Statusbox;
… …
2804sub add { 2997sub add {
2805 my ($self, $text, %arg) = @_; 2998 my ($self, $text, %arg) = @_;
2806 2999
2807 $text =~ s/^\s+//; 3000 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3001 $text =~ s/\s+$//;
3002
3003 return unless $text;
2809 3004
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3005 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 3006
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3008
… …
2847 $self->SUPER::reconfigure; 3042 $self->SUPER::reconfigure;
2848} 3043}
2849 3044
2850############################################################################# 3045#############################################################################
2851 3046
2852package CFClient::UI::Root; 3047package CFClient::UI::Inventory;
2853 3048
2854our @ISA = CFClient::UI::Container::; 3049our @ISA = CFClient::UI::ScrolledWindow::;
2855
2856use CFClient::OpenGL;
2857 3050
2858sub new { 3051sub new {
2859 my $class = shift; 3052 my $class = shift;
2860 3053
2861 $class->SUPER::new ( 3054 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2862 @_, 3056 @_,
2863 ) 3057 );
2864}
2865 3058
2866sub 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 {
2867 my ($self, $x, $y, $w, $h) = @_; 3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2868 3213
2869 $self->{w} = $w; 3214 $self->clear_command_list;
2870 $self->{h} = $h; 3215 $self->{recording} = 0;
2871} 3216 $self->{rec_btn}->set_text ("start recording");
2872 3217
2873sub 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 {
2874 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}
2875 3236
2876 $self->size_allocate ($self->{w}, $self->{h}) 3237sub update_binding_widgets {
2877 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
2878} 3360}
2879 3361
2880sub size_request { 3362sub size_request {
2881 my ($self) = @_; 3363 my ($self) = @_;
2882 3364
2883 ($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
2884} 3380}
2885 3381
2886sub size_allocate { 3382sub size_allocate {
2887 my ($self, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
2888 3384
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894
2895 for my $child ($self->children) { 3385 for my $child ($self->children) {
2896 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)};
2897 3387
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3388 $X = $child->{force_x} if exists $child->{force_x};
2899 if exists $child->{req_x}; 3389 $Y = $child->{force_y} if exists $child->{force_y};
2900 3390
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3391 $X = _to_pixel $X, $W, $self->{w};
2902 if exists $child->{req_y}; 3392 $Y = _to_pixel $Y, $H, $self->{h};
2903
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 3393
2907 $child->configure ($X, $Y, $W, $H); 3394 $child->configure ($X, $Y, $W, $H);
2908 } 3395 }
2909} 3396}
2910 3397
… …
2921} 3408}
2922 3409
2923sub update { 3410sub update {
2924 my ($self) = @_; 3411 my ($self) = @_;
2925 3412
2926 $self->check_size;
2927 $::WANT_REFRESH++; 3413 $::WANT_REFRESH++;
2928} 3414}
2929 3415
2930sub add { 3416sub add {
2931 my ($self, @children) = @_; 3417 my ($self, @children) = @_;
2932 3418
2933 for my $child (@children) {
2934 $child->{toplevel} = 1; 3419 $_->{is_toplevel} = 1
2935 3420 for @children;
2936 # integerise window positions
2937 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y};
2939 }
2940 3421
2941 $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;
3432
3433 while (@children) {
3434 my $w = pop @children;
3435 push @children, $w->children;
3436 $w->set_invisible;
3437 }
2942} 3438}
2943 3439
2944sub on_refresh { 3440sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3441 my ($self, $id, $cb) = @_;
2946 3442
… …
2959 while ($self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
2960 $_->() 3456 $_->()
2961 for values %{delete $self->{refresh_hook}}; 3457 for values %{delete $self->{refresh_hook}};
2962 } 3458 }
2963 3459
2964 if ($self->{check_size}) { 3460 if ($self->{realloc}) {
2965 my @queue = ([], []); 3461 my %queue;
3462 my @queue;
3463 my $widget;
2966 3464
2967 for (;;) { 3465 outer:
2968 if ($self->{check_size}) { 3466 while () {
2969 # heuristic: check containers last 3467 if (my $realloc = delete $self->{realloc}) {
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3468 for $widget (values %$realloc) {
2971 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 }
2972 } 3475 }
2973 3476
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3477 while () {
3478 @queue or last outer;
2975 3479
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3480 $widget = pop @{ $queue[-1] || [] }
2977 ? @$widget{qw(user_w user_h)} 3481 and last;
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983 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}) {
2984 $widget->{req_w} = $w; 3498 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h; 3499 $widget->{req_h} = $h;
2986 3500
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3501 $self->{size_alloc}{$widget+0} = $widget;
2988 3502
2989 $widget->{parent}->check_size
2990 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 }
2991 } 3510 }
3511
3512 delete $self->{realloc}{$widget+0};
2992 } 3513 }
2993 } 3514 }
2994 3515
2995 while ($self->{size_alloc}) { 3516 while (my $size_alloc = delete $self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) { 3517 my @queue = sort { $b->{visible} <=> $a->{visible} }
2997 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)};
2998 3524
2999 $w = 0 if $w < 0; 3525 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3526 $h = 0 if $h < 0;
3001 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
3002 $widget->{w} = $w; 3535 $widget->{w} = $w;
3003 $widget->{h} = $h; 3536 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h); 3537
3005 $widget->emit (size_allocate => $w, $h); 3538 $widget->emit (size_allocate => $w, $h);
3539 }
3006 } 3540 }
3007 } 3541 }
3008 3542
3009 while ($self->{post_alloc_hook}) { 3543 while ($self->{post_alloc_hook}) {
3010 $_->() 3544 $_->()
3011 for values %{delete $self->{post_alloc_hook}}; 3545 for values %{delete $self->{post_alloc_hook}};
3012 } 3546 }
3013 3547
3548
3014 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
3017 3552
3018 glMatrixMode GL_PROJECTION; 3553 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3554 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3557 glLoadIdentity;
3023 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
3024 $self->_draw; 3566 $self->_draw;
3025} 3567}
3026 3568
3027############################################################################# 3569#############################################################################
3028 3570

Diff Legend

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