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

Diff Legend

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