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.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.309 by elmex, Wed Jun 21 12:59:23 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $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 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
166 } 190 }
167
168 $widget->reconfigure;
169 } 191 }
192
193 reconfigure_widgets;
170} 194}
171 195
172############################################################################# 196#############################################################################
173 197
174package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 264
229sub hide { 265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
230 my ($self) = @_; 271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
278 delete $self->{root};
231 279
232 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
234 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->emit ("focus_out");
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
235 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
236 if $self->{parent}; 313 if $self->{parent};
237} 314}
238 315
239sub move { 316sub move_abs {
240 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
241 318
242 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
243 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
244 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
245 322
246 $self->update; 323 $self->update;
247} 324}
248 325
249sub set_size { 326sub set_size {
250 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
251 328
252 $self->{user_w} = $w; 329 $self->{force_w} = $w;
253 $self->{user_h} = $h; 330 $self->{force_h} = $h;
254 331
255 $self->check_size; 332 $self->realloc;
256} 333}
257 334
258sub size_request { 335sub size_request {
259 require Carp; 336 require Carp;
260 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
262 339
263sub configure { 340sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
265 342
266 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
269 348
270 # use alignment to adjust x, y 349 # use alignment to adjust x, y
271 350
272 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 353 }
277 354
278 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 356 $self->{x} = $x;
280 $self->{y} = $y; 357 $self->{y} = $y;
281 $self->update; 358 $self->update;
282 } 359 }
283 360
284 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
286 }
287}
288 363
289sub size_allocate { 364 $self->{alloc_w} = $w;
290 # nothing to be done 365 $self->{alloc_h} = $h;
291}
292 366
293sub reconfigure { 367 $self->{root}{size_alloc}{$self+0} = $self;
294 my ($self) = @_; 368 }
295
296 $self->check_size (1);
297 $self->update;
298} 369}
299 370
300sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
301} 377}
302 378
303sub set_max_size { 379sub set_max_size {
304 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
305 381
306 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
308} 386}
309 387
310sub set_tooltip { 388sub set_tooltip {
311 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
312 390
391 $tooltip =~ s/^\s+//;
392 $tooltip =~ s/\s+$//;
393
394 return if $self->{tooltip} eq $tooltip;
395
313 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
314 397
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
318 } 401 }
319} 402}
320 403
321# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
322sub coord2local { 405sub coord2local {
… …
330 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
331 414
332 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
333} 416}
334 417
335sub focus_in { 418sub invoke_focus_in {
336 my ($self) = @_; 419 my ($self) = @_;
337 420
338 return if $FOCUS == $self; 421 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
340 423
341 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
342 425
343 $self->emit (focus_in => $focus);
344
345 $focus->update if $focus; 426 $focus->update if $focus;
346 $FOCUS->update; 427 $FOCUS->update;
347}
348 428
429 0
430}
431
349sub focus_out { 432sub invoke_focus_out {
350 my ($self) = @_; 433 my ($self) = @_;
351 434
352 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
353 436
354 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
355 438
356 $self->emit (focus_out => $focus);
357
358 $focus->update if $focus; #? 439 $focus->update if $focus; #?
359}
360 440
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS;
443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
361sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
362sub button_up { } 454sub invoke_button_up { 1 }
363sub key_down { } 455sub invoke_key_down { 1 }
364sub key_up { } 456sub invoke_key_up { 1 }
365 457
366sub button_down { 458sub invoke_button_down {
367 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
368 460
369 $self->focus_in; 461 $self->grab_focus;
370}
371 462
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
376sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479}
480
481sub find_widget {
482 my ($self, $x, $y) = @_;
483
484 return () unless $self->{can_events};
485
486 return $self
487 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
488 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
489
490 ()
491}
492
493sub set_parent {
494 my ($self, $parent) = @_;
495
496 Scalar::Util::weaken ($self->{parent} = $parent);
497 $self->set_visible if $parent->{visible};
498}
499
500sub realloc {
501 my ($self) = @_;
502
503 if ($self->{visible}) {
504 return if $self->{root}{realloc}{$self+0};
505
506 $self->{root}{realloc}{$self+0} = $self;
507 $self->{root}->update;
508 } else {
509 delete $self->{req_w};
510 delete $self->{req_h};
511 }
512}
513
514sub update {
515 my ($self) = @_;
516
517 $self->{parent}->update
518 if $self->{parent};
519}
520
521sub reconfigure {
522 my ($self) = @_;
523
524 $self->realloc;
525 $self->update;
526}
527
528# using global variables seems a bit hacky, but passing through all drawing
529# functions seems pointless.
530our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
377 531
378sub draw { 532sub draw {
379 my ($self) = @_; 533 my ($self) = @_;
380 534
381 return unless $self->{h} && $self->{w}; 535 return unless $self->{h} && $self->{w};
536
537 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542
543 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
382 546
383 glPushMatrix; 547 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387 549
388 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392 glEnable GL_BLEND; 552 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 554 glBegin GL_QUADS;
395 glVertex $x , $y;
396 glVertex $x + $self->{w}, $y;
397 glVertex $x + $self->{w}, $y + $self->{h};
398 glVertex $x , $y + $self->{h};
399 glEnd;
400 glDisable GL_BLEND;
401 }
402
403 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix;
405 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 555 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 556 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h}; 557 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h}; 558 glVertex 0 , $self->{h};
412 glEnd; 559 glEnd;
560 glDisable GL_BLEND;
561 }
562
563 if ($ENV{CFPLUS_DEBUG} & 1) {
564 glPushMatrix;
565 glColor 1, 1, 0, 1;
566 glTranslate 0.375, 0.375;
567 glBegin GL_LINE_LOOP;
568 glVertex 0 , 0;
569 glVertex $self->{w} - 1, 0;
570 glVertex $self->{w} - 1, $self->{h} - 1;
571 glVertex 0 , $self->{h} - 1;
572 glEnd;
413 glPopMatrix; 573 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
416} 579}
417 580
418sub _draw { 581sub _draw {
419 my ($self) = @_; 582 my ($self) = @_;
420 583
421 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
422} 585}
423 586
424sub find_widget {
425 my ($self, $x, $y) = @_;
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435
436sub set_parent {
437 my ($self, $parent) = @_;
438
439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446}
447
448sub check_size {
449 my ($self, $forced) = @_;
450
451 $self->{force_alloc} = 1 if $forced;
452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
453}
454
455sub update {
456 my ($self) = @_;
457
458 $self->{parent}->update
459 if $self->{parent};
460}
461
462sub connect {
463 my ($self, $signal, $cb) = @_;
464
465 push @{ $self->{signal_cb}{$signal} }, $cb;
466}
467
468sub emit {
469 my ($self, $signal, @args) = @_;
470
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472}
473
474sub DESTROY { 587sub DESTROY {
475 my ($self) = @_; 588 my ($self) = @_;
476 589
477 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
478 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
479} 594}
480 595
481############################################################################# 596#############################################################################
482 597
483package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
508 623
509 if ($color && (@$color < 4 || $color->[3])) { 624 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
511 626
512 glEnable GL_BLEND; 627 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 629 glColor_premultiply @$color;
515 630
516 glBegin GL_QUADS; 631 glBegin GL_QUADS;
517 glVertex 0 , 0; 632 glVertex 0 , 0;
518 glVertex 0 , $h; 633 glVertex 0 , $h;
519 glVertex $w, $h; 634 glVertex $w, $h;
… …
534 my ($class, %arg) = @_; 649 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 650 $class->SUPER::new (can_events => 0, %arg);
536} 651}
537 652
538sub size_request { 653sub size_request {
539 (0, 0) 654 my ($self) = @_;
655
656 ($self->{w} + 0, $self->{h} + 0)
540} 657}
541 658
542sub draw { } 659sub draw { }
543 660
544############################################################################# 661#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
549 666
550sub new { 667sub new {
551 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
552 669
553 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
554 671
555 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
556 children => [], 673 children => [],
557 can_events => 0, 674 can_events => 0,
558 %arg, 675 %arg,
559 ); 676 );
677
560 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
561 680
562 $self 681 $self
563} 682}
564 683
565sub add { 684sub add {
… …
573 $self->{children} = [ 692 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 693 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 694 @{$self->{children}}, @widgets
576 ]; 695 ];
577 696
578 $self->check_size (1); 697 $self->realloc;
579 $self->update;
580} 698}
581 699
582sub children { 700sub children {
583 @{ $_[0]{children} } 701 @{ $_[0]{children} }
584} 702}
… …
589 delete $child->{parent}; 707 delete $child->{parent};
590 $child->hide; 708 $child->hide;
591 709
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 710 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 711
594 $self->check_size; 712 $self->realloc;
595 $self->update;
596} 713}
597 714
598sub clear { 715sub clear {
599 my ($self) = @_; 716 my ($self) = @_;
600 717
… …
604 for (@$children) { 721 for (@$children) {
605 delete $_->{parent}; 722 delete $_->{parent};
606 $_->hide; 723 $_->hide;
607 } 724 }
608 725
609 $self->check_size; 726 $self->realloc;
610 $self->update;
611} 727}
612 728
613sub find_widget { 729sub find_widget {
614 my ($self, $x, $y) = @_; 730 my ($self, $x, $y) = @_;
615 731
616 $x -= $self->{x}; 732 $x -= $self->{x};
617 $y -= $self->{y}; 733 $y -= $self->{y};
618 734
619 my $res; 735 my $res;
620 736
621 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
623 and return $res; 739 and return $res;
624 } 740 }
625 741
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
647} 763}
648 764
649sub add { 765sub add {
650 my ($self, $child) = @_; 766 my ($self, $child) = @_;
651 767
652 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
653
654 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
655} 770}
656 771
657sub remove { 772sub remove {
658 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
667 782
668sub size_request { 783sub size_request {
669 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
670} 785}
671 786
672sub size_allocate { 787sub invoke_size_allocate {
673 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
674 789
675 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
676} 793}
677 794
678############################################################################# 795#############################################################################
796
797# back-buffered drawing area
679 798
680package CFClient::UI::Window; 799package CFClient::UI::Window;
681 800
682our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
683 802
… …
694 813
695 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
696 $self->SUPER::update; 815 $self->SUPER::update;
697} 816}
698 817
699sub size_allocate { 818sub invoke_size_allocate {
700 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
701 820
702 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
704} 824}
705 825
706sub _render { 826sub _render {
827 my ($self) = @_;
828
707 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
708} 830}
709 831
710sub render_child { 832sub render_child {
711 my ($self) = @_; 833 my ($self) = @_;
712 834
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
716 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
717 $self->_render; 846 $self->_render;
718 }; 847 };
719} 848}
720 849
721sub _draw { 850sub _draw {
722 my ($self) = @_; 851 my ($self) = @_;
723 852
724 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
725 854
726 my $tex = $self->{texture} 855 my $tex = $self->{texture}
727 or return; 856 or return;
728 857
729 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
732 861
733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
734 863
735 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
736} 865}
… …
739 868
740package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
741 870
742our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
743 872
873sub new {
874 my $class = shift;
875
876 $class->SUPER::new (
877 scroll_x => 0,
878 scroll_y => 1,
879 @_,
880 )
881}
882
744sub size_request { 883sub size_request {
745 my ($self) = @_; 884 my ($self) = @_;
746 885
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 887
749 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
750} 889 $h = 10 if $self->{scroll_y};
751 890
891 ($w, $h)
892}
893
752sub size_allocate { 894sub invoke_size_allocate {
753 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
754 896
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 897 my $child = $self->child;
756# $w = $self->{w}; 898
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901
757 $self->child->configure (0, 0, $cw, $ch); 902 $self->child->configure (0, 0, $w, $h);
758 $self->update; 903 $self->update;
904
905 1
759} 906}
760 907
761sub set_offset { 908sub set_offset {
762 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
763 910
… …
796} 943}
797 944
798sub _render { 945sub _render {
799 my ($self) = @_; 946 my ($self) = @_;
800 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802 952
803 $self->SUPER::_render; 953 $self->SUPER::_render;
804} 954}
805 955
… …
808package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
809 959
810our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
811 961
812sub new { 962sub new {
813 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
814 966
815 my $self; 967 my $self;
816 968
817 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
818 vertical => 1, 970 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 972 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 973 $self->{vp}->set_offset (0, $_[1]);
822 }, 974 },
823 ; 975 ;
824 976
825 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
827 slider => $slider, 979 slider => $slider,
828 @_, 980 %arg,
829 ); 981 );
830 982
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
834 985
835 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
993}
994
995sub update {
996 my ($self) = @_;
997
998 $self->SUPER::update;
999
1000 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003}
1004
1005sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_;
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
836} 1012}
837 1013
838#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 1015# update viewport offset on scroll
840 1016
… …
860 1036
861 if ($self->{bg}) { 1037 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
863 1039
864 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
866 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
867 1043
868 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
869 glVertex 0 , 0; 1045 glVertex 0 , 0;
870 glVertex 0 , $h; 1046 glVertex 0 , $h;
871 glVertex $w, $h; 1047 glVertex $w, $h;
… …
884 1060
885our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
886 1062
887use CFClient::OpenGL; 1063use CFClient::OpenGL;
888 1064
889my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892 1072
893sub new { 1073sub new {
894 my $class = shift; 1074 my ($class, %arg) = @_;
895
896 # TODO: user_x, user_y, overwrite moveto?
897 1075
898 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1079 border => 0.6,
902 toplevel => 1,
903 can_events => 1, 1080 can_events => 1,
904 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
905 ); 1084 );
906 1085
907 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
908 align => 0, 1087 align => 0,
909 valign => 1, 1088 valign => 1,
910 text => $self->{title}, 1089 text => $self->{title},
911 fontsize => $self->{border}; 1090 fontsize => $self->{border},
1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 image => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
912 1101
913 $self 1102 $self
1103}
1104
1105sub add {
1106 my ($self, @widgets) = @_;
1107
1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
914} 1111}
915 1112
916sub border { 1113sub border {
917 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
918} 1115}
919 1116
920sub size_request { 1117sub size_request {
921 my ($self) = @_; 1118 my ($self) = @_;
1119
1120 $self->{title_widget}->size_request
1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
922 1125
923 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
924 1127
925 ( 1128 (
926 $w + $self->border * 2, 1129 $w + $self->border * 2,
927 $h + $self->border * 2, 1130 $h + $self->border * 2,
928 ) 1131 )
929} 1132}
930 1133
931sub size_allocate { 1134sub invoke_size_allocate {
932 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
933 1136
1137 if ($self->{title_widget}) {
1138 $self->{title_widget}{w} = $w;
1139 $self->{title_widget}{h} = $h;
1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1141 }
1142
1143 my $border = $self->border;
1144
934 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
935 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
936 1147
937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
938 if $self->{title};
939
940 $self->child->configure ($self->border, $self->border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
941}
942 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
943sub button_down { 1156sub invoke_button_down {
944 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
945 1158
946 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
947 my $border = $self->border; 1160 my $border = $self->border;
948 1161
… …
961 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
962 1175
963 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
965 1178
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969 $self->check_size; 1183 $self->realloc;
970 }; 1184 };
971 1185
972 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
974 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
976 $self->{motion} = sub { 1190 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
978 1192
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
980 1194
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
983 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
984 } 1203 1
985} 1204}
986 1205
987sub button_up { 1206sub invoke_button_up {
988 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
989 1208
990 delete $self->{motion}; 1209 ! ! delete $self->{motion}
991} 1210}
992 1211
993sub mouse_motion { 1212sub invoke_mouse_motion {
994 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
995 1214
996 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
997} 1218}
998 1219
999sub _draw { 1220sub _draw {
1000 my ($self) = @_; 1221 my ($self) = @_;
1001 1222
1223 my $child = $self->{children}[0];
1224
1002 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
1004 1227
1005 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007 1230
1008 my $border = $self->border; 1231 my $border = $self->border;
1009 1232
1010 glColor @{ $self->{border_bg} }; 1233 glColor @{ $self->{border_bg} };
1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1234 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015 1238
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017 my $bg = $tex[0]; 1240 glColor @{ $self->{bg} };
1018 1241
1019 # TODO: repeat texture not scale 1242 # TODO: repeat texture not scale
1243 # solve this better(?)
1020 my $rep_x = $cw / $bg->{w}; 1244 $bg->{s} = $cw / $bg->{w};
1021 my $rep_y = $ch / $bg->{h}; 1245 $bg->{t} = $ch / $bg->{h};
1022
1023 glColor @{ $self->{bg} };
1024
1025 $bg->{s} = $rep_x;
1026 $bg->{t} = $rep_y;
1027 $bg->{wrap_mode} = 1;
1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 } 1247 }
1030 1248
1031 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1032 1250
1033 $self->{title}->draw if $self->{title};
1034
1035 $self->child->draw; 1251 $child->draw;
1252
1253 if ($self->{title_widget}) {
1254 glTranslate 0, $border - $self->{h};
1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1036} 1262}
1037 1263
1038############################################################################# 1264#############################################################################
1039 1265
1040package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1048sub new { 1274sub new {
1049 my $class = shift; 1275 my $class = shift;
1050 1276
1051 $class->SUPER::new ( 1277 $class->SUPER::new (
1052 col_expand => [], 1278 col_expand => [],
1053 @_ 1279 @_,
1054 ) 1280 )
1281}
1282
1283sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1285}
1056 1286
1057sub add { 1287sub add {
1058 my ($self, $x, $y, $child) = @_; 1288 my ($self, $x, $y, $child) = @_;
1059 1289
1060 $child->set_parent ($self); 1290 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1062 1292
1063 $child->check_size; 1293 $self->realloc;
1064} 1294}
1065 1295
1066sub children { 1296sub remove {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1297 my ($self, $child) = @_;
1068}
1069 1298
1299 # TODO: not yet implemented
1300}
1301
1070# TODO: move to container class maybe? send childs a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1303sub clear {
1072 my ($self) = @_; 1304 my ($self) = @_;
1073 1305
1074 my @children = $self->children; 1306 my @children = $self->children;
1075 delete $self->{children}; 1307 delete $self->{children};
… …
1077 for (@children) { 1309 for (@children) {
1078 delete $_->{parent}; 1310 delete $_->{parent};
1079 $_->hide; 1311 $_->hide;
1080 } 1312 }
1081 1313
1082 $self->update; 1314 $self->realloc;
1083} 1315}
1084 1316
1085sub get_wh { 1317sub get_wh {
1086 my ($self) = @_; 1318 my ($self) = @_;
1087 1319
… …
1113 (sum @$ws), 1345 (sum @$ws),
1114 (sum @$hs), 1346 (sum @$hs),
1115 ) 1347 )
1116} 1348}
1117 1349
1118sub size_allocate { 1350sub invoke_size_allocate {
1119 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1120 1352
1121 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1122 1354
1123 my $req_w = sum @$ws; 1355 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1356 my $req_h = (sum @$hs) || 1;
1125 1357
1126 # TODO: nicer code && do row_expand 1358 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1359 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1360 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1361 my $col_expand = (sum @col_expand) || 1;
… …
1155 } 1387 }
1156 1388
1157 $y += $row_h; 1389 $y += $row_h;
1158 } 1390 }
1159 1391
1392 1
1160} 1393}
1161 1394
1162sub find_widget { 1395sub find_widget {
1163 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1164 1397
… …
1183 } 1416 }
1184} 1417}
1185 1418
1186############################################################################# 1419#############################################################################
1187 1420
1421package CFClient::UI::Box;
1422
1423our @ISA = CFClient::UI::Container::;
1424
1425sub size_request {
1426 my ($self) = @_;
1427
1428 $self->{vertical}
1429 ? (
1430 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1431 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1432 )
1433 : (
1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1436 )
1437}
1438
1439sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_;
1441
1442 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children};
1444
1445 my @req;
1446
1447 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children;
1449 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1451 my $req = List::Util::sum @req;
1452
1453 if ($req > $space) {
1454 # ah well, not enough space
1455 $_ *= $space / $req for @req;
1456 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1458
1459 $space = ($space - $req) / $expand; # remaining space to give away
1460
1461 $req[$_] += $space * $children->[$_]{expand}
1462 for 0 .. $#$children;
1463 }
1464 }
1465
1466 CFClient::UI::harmonize \@req;
1467
1468 my $pos = 0;
1469 for (0 .. $#$children) {
1470 my $alloc = $req[$_];
1471 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472
1473 $pos += $alloc;
1474 }
1475
1476 1
1477}
1478
1479#############################################################################
1480
1188package CFClient::UI::HBox; 1481package CFClient::UI::HBox;
1189 1482
1190# TODO: wrap into common Box base class
1191
1192our @ISA = CFClient::UI::Container::; 1483our @ISA = CFClient::UI::Box::;
1193 1484
1194sub size_request { 1485sub new {
1195 my ($self) = @_; 1486 my $class = shift;
1196 1487
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1488 $class->SUPER::new (
1198 1489 vertical => 0,
1199 ( 1490 @_,
1200 (List::Util::sum map $_->[0], @alloc),
1201 (List::Util::max map $_->[1], @alloc),
1202 ) 1491 )
1203} 1492}
1204 1493
1205sub size_allocate {
1206 my ($self, $w, $h) = @_;
1207
1208 ($h, $w) = ($w, $h);
1209
1210 my $children = $self->{children};
1211
1212 my @h = map $_->{req_w}, @$children;
1213
1214 my $req_h = List::Util::sum @h;
1215
1216 if ($req_h > $h) {
1217 # ah well, not enough space
1218 $_ *= $h / $req_h for @h;
1219 } else {
1220 my $exp = List::Util::sum map $_->{expand}, @$children;
1221 $exp ||= 1;
1222
1223 for (0 .. $#$children) {
1224 my $child = $children->[$_];
1225
1226 my $alloc_h = $h[$_];
1227 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228 $h[$_] = $alloc_h;
1229 }
1230 }
1231
1232 CFClient::UI::harmonize \@h;
1233
1234 my $y = 0;
1235 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_];
1238 $child->configure ($y, 0, $h, $w);
1239
1240 $y += $h;
1241 }
1242
1243 1
1244}
1245
1246############################################################################# 1494#############################################################################
1247 1495
1248package CFClient::UI::VBox; 1496package CFClient::UI::VBox;
1249 1497
1250# TODO: wrap into common Box base class
1251
1252our @ISA = CFClient::UI::Container::; 1498our @ISA = CFClient::UI::Box::;
1253 1499
1254sub size_request { 1500sub new {
1255 my ($self) = @_; 1501 my $class = shift;
1256 1502
1257 my @alloc = map [$_->size_request], @{$self->{children}}; 1503 $class->SUPER::new (
1258 1504 vertical => 1,
1259 ( 1505 @_,
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1506 )
1263}
1264
1265sub size_allocate {
1266 my ($self, $w, $h) = @_;
1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270 my $children = $self->{children};
1271
1272 my @h = map $_->{req_h}, @$children;
1273
1274 my $req_h = List::Util::sum @h;
1275
1276 if ($req_h > $h) {
1277 # ah well, not enough space
1278 $_ *= $h / $req_h for @h;
1279 } else {
1280 my $exp = List::Util::sum map $_->{expand}, @$children;
1281 $exp ||= 1;
1282
1283 for (0 .. $#$children) {
1284 my $child = $children->[$_];
1285
1286 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287 }
1288 }
1289
1290 CFClient::UI::harmonize \@h;
1291
1292 my $y = 0;
1293 for (0 .. $#$children) {
1294 my $child = $children->[$_];
1295 my $h = $h[$_];
1296 $child->configure (0, $y, $w, $h);
1297
1298 $y += $h;
1299 }
1300
1301 1
1302} 1507}
1303 1508
1304############################################################################# 1509#############################################################################
1305 1510
1306package CFClient::UI::Label; 1511package CFClient::UI::Label;
… …
1323 ellipsise => 3, # end 1528 ellipsise => 3, # end
1324 layout => (new CFClient::Layout), 1529 layout => (new CFClient::Layout),
1325 fontsize => 1, 1530 fontsize => 1,
1326 align => -1, 1531 align => -1,
1327 valign => -1, 1532 valign => -1,
1328 padding => 2, 1533 padding_x => 2,
1534 padding_y => 2,
1329 can_events => 0, 1535 can_events => 0,
1330 %arg 1536 %arg
1331 ); 1537 );
1332 1538
1333 if (exists $self->{template}) { 1539 if (exists $self->{template}) {
… …
1360 1566
1361 delete $self->{texture}; 1567 delete $self->{texture};
1362 $self->SUPER::update; 1568 $self->SUPER::update;
1363} 1569}
1364 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1365sub set_text { 1578sub set_text {
1366 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1367 1580
1368 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1369 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1370 1583
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1373 1586
1587 delete $self->{size_req};
1588 $self->realloc;
1374 $self->update; 1589 $self->update;
1375 $self->check_size;
1376} 1590}
1377 1591
1378sub set_markup { 1592sub set_markup {
1379 my ($self, $markup) = @_; 1593 my ($self, $markup) = @_;
1380 1594
… …
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385 1599
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1388 1602
1603 delete $self->{size_req};
1604 $self->realloc;
1389 $self->update; 1605 $self->update;
1390 $self->check_size;
1391} 1606}
1392 1607
1393sub size_request { 1608sub size_request {
1394 my ($self) = @_; 1609 my ($self) = @_;
1395 1610
1611 $self->{size_req} ||= do {
1396 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1397 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1617
1402 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1403 1619
1404 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1405 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1406 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1407 1623
1408 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1409 1625
1410 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1411 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1412 } 1631 };
1413 1632
1414 ( 1633 @{ $self->{size_req} }
1415 $w + $self->{padding} * 2,
1416 $h + $self->{padding} * 2,
1417 )
1418} 1634}
1419 1635
1420sub size_allocate { 1636sub invoke_size_allocate {
1421 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1422 1638
1639 delete $self->{ox};
1640
1423 delete $self->{texture}; 1641 delete $self->{texture}
1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1424} 1645}
1425 1646
1426sub set_fontsize { 1647sub set_fontsize {
1427 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1428 1649
1429 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1430 delete $self->{texture}; 1651 delete $self->{texture};
1431 1652
1432 $self->update; 1653 $self->realloc;
1433 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1434} 1662}
1435 1663
1436sub _draw { 1664sub _draw {
1437 my ($self) = @_; 1665 my ($self) = @_;
1438 1666
… …
1444 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448 1676
1449 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1450 1679
1680 unless (exists $self->{ox}) {
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1453 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1454 1684
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1457 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1460 }; 1688 };
1461 1689
1462 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1464 1694
1465 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1468 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1470 } 1702 }
1471 1703
1472 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1473} 1705}
1474 1706
… …
1491 can_hover => 1, 1723 can_hover => 1,
1492 can_focus => 1, 1724 can_focus => 1,
1493 valign => 0, 1725 valign => 0,
1494 can_events => 1, 1726 can_events => 1,
1495 #text => ... 1727 #text => ...
1728 #hidden => "*",
1496 @_ 1729 @_
1497 ) 1730 )
1498} 1731}
1499 1732
1500sub _set_text { 1733sub _set_text {
… …
1502 1735
1503 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1504 1737
1505 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1506 1739
1507 delete $self->{texture};
1508
1509 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1510 $self->{text} = $text; 1741 $self->{text} = $text;
1511 1742
1512 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1514 1746
1515 $self->emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1516} 1751}
1517 1752
1518sub set_text { 1753sub set_text {
1519 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1520 1755
1521 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1522 $self->_set_text ($text); 1757 $self->_set_text ($text);
1523 $self->update;
1524 $self->check_size;
1525} 1758}
1526 1759
1527sub get_text { 1760sub get_text {
1528 $_[0]{text} 1761 $_[0]{text}
1529} 1762}
… …
1534 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1535 1768
1536 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1537} 1770}
1538 1771
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543}
1544
1545sub key_down { 1772sub invoke_key_down {
1546 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1547 1774
1548 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1549 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1550 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1565 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1794 $self->emit ('escape');
1568 } elsif ($uni) { 1795 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1570 } 1799 }
1571 1800
1572 $self->_set_text ($text); 1801 $self->_set_text ($text);
1573 $self->update;
1574 $self->check_size;
1575}
1576 1802
1803 $self->realloc;
1804
1805 1
1806}
1807
1577sub focus_in { 1808sub invoke_focus_in {
1578 my ($self) = @_; 1809 my ($self) = @_;
1579 1810
1580 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1581 1812
1582 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1583} 1814}
1584 1815
1585sub button_down { 1816sub invoke_button_down {
1586 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1587 1818
1588 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1589 1820
1590 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1591 1822
1592 # byte-index to char-index 1823 # byte-index to char-index
1593 my $text = $self->{text}; 1824 my $text = $self->{text};
1594 utf8::encode $text; 1825 utf8::encode $text;
1595 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1596 1827
1597 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1598 $self->update; 1829 $self->update;
1830
1831 1
1599} 1832}
1600 1833
1601sub mouse_motion { 1834sub invoke_mouse_motion {
1602 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1603# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 1
1604} 1839}
1605 1840
1606sub _draw { 1841sub _draw {
1607 my ($self) = @_; 1842 my ($self) = @_;
1608 1843
1609 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1610 1845
1611 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1612 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1613 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1614 } else { 1849 } else {
1615 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1616 } 1851 }
1617 1852
1618 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1620 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1621 glVertex 0 , 0; 1856 glVertex 0 , 0;
1622 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1623 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1624 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1649 1884
1650our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1651 1886
1652use CFClient::OpenGL; 1887use CFClient::OpenGL;
1653 1888
1654sub key_down { 1889sub invoke_key_down {
1655 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1656 1891
1657 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1658 1893
1659 if ($sym == 13) { 1894 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1662 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1900 $self->emit (activate => $txt);
1665 $self->update; 1901 $self->update;
1666 1902
… …
1685 } else { 1921 } else {
1686 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1687 } 1923 }
1688 1924
1689 } else { 1925 } else {
1690 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1691 } 1929 1
1692
1693} 1930}
1694 1931
1695############################################################################# 1932#############################################################################
1696 1933
1697package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1706 1943
1707sub new { 1944sub new {
1708 my $class = shift; 1945 my $class = shift;
1709 1946
1710 $class->SUPER::new ( 1947 $class->SUPER::new (
1711 padding => 4, 1948 padding_x => 4,
1949 padding_y => 4,
1712 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1713 active_fg => [0, 0, 1], 1951 active_fg => [0, 0, 1],
1714 can_hover => 1, 1952 can_hover => 1,
1715 align => 0, 1953 align => 0,
1716 valign => 0, 1954 valign => 0,
1717 can_events => 1, 1955 can_events => 1,
1718 @_ 1956 @_
1719 ) 1957 )
1720} 1958}
1721 1959
1722sub button_up { 1960sub invoke_button_up {
1723 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1724 1962
1963 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1965 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate"); 1966
1728 } 1967 1
1729} 1968}
1730 1969
1731sub _draw { 1970sub _draw {
1732 my ($self) = @_; 1971 my ($self) = @_;
1733 1972
1734 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1735
1736 if ($GRAB == $self) {
1737 $self->{fg} = $self->{active_fg};
1738 }
1739 1974
1740 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1743 1978
… …
1748 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1749} 1984}
1750 1985
1751############################################################################# 1986#############################################################################
1752 1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
2020}
2021
2022#############################################################################
2023
1753package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
1754 2025
1755our @ISA = CFClient::UI::DrawBG::; 2026our @ISA = CFClient::UI::DrawBG::;
1756 2027
1757my @tex = 2028my @tex =
… …
1762 2033
1763sub new { 2034sub new {
1764 my $class = shift; 2035 my $class = shift;
1765 2036
1766 $class->SUPER::new ( 2037 $class->SUPER::new (
1767 padding => 2, 2038 padding_x => 2,
2039 padding_y => 2,
1768 fg => [1, 1, 1], 2040 fg => [1, 1, 1],
1769 active_fg => [1, 1, 0], 2041 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2], 2042 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5], 2043 active_bg => [1, 1, 1, 0.5],
1772 state => 0, 2044 state => 0,
… …
1776} 2048}
1777 2049
1778sub size_request { 2050sub size_request {
1779 my ($self) = @_; 2051 my ($self) = @_;
1780 2052
1781 ($self->{padding} * 2 + 6) x 2 2053 (6) x 2
1782} 2054}
1783 2055
1784sub button_down { 2056sub invoke_button_down {
1785 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1786 2058
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1791 } 2067 1
1792} 2068}
1793 2069
1794sub _draw { 2070sub _draw {
1795 my ($self) = @_; 2071 my ($self) = @_;
1796 2072
1797 $self->SUPER::_draw; 2073 $self->SUPER::_draw;
1798 2074
1799 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800 2076
1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2077 my ($w, $h) = @$self{qw(w h)};
2078
2079 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802 2080
1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804 2082
1805 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806 2084
… …
1961 2239
1962 my $h1 = $self->{h} * (1 - $ycut1); 2240 my $h1 = $self->{h} * (1 - $ycut1);
1963 my $h2 = $self->{h} * (1 - $ycut2); 2241 my $h2 = $self->{h} * (1 - $ycut2);
1964 2242
1965 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
1966 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1967 glEnable GL_TEXTURE_2D; 2246 glEnable GL_TEXTURE_2D;
1968 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1969 2248
1970 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2249 glBindTexture GL_TEXTURE_2D, $t1->{name};
1971 glBegin GL_QUADS; 2250 glBegin GL_QUADS;
… …
2071 fg => [1, 1, 1], 2350 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2351 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2352 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2353 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10, 0], 2354 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2355 min_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2356 min_h => $::WIDTH / 80,
2078 vertical => 0, 2357 vertical => 0,
2079 can_hover => 1, 2358 can_hover => 1,
2080 inner_pad => 0.02, 2359 inner_pad => 0.02,
2081 @_ 2360 @_
2082 ); 2361 );
… …
2088} 2367}
2089 2368
2090sub set_range { 2369sub set_range {
2091 my ($self, $range) = @_; 2370 my ($self, $range) = @_;
2092 2371
2093 $self->{range} = $range; 2372 ($range, $self->{range}) = ($self->{range}, $range);
2094 2373
2374 if ("@$range" ne "@{$self->{range}}") {
2095 $self->update; 2375 $self->update;
2376 $self->set_value ($self->{range}[0]);
2377 }
2096} 2378}
2097 2379
2098sub set_value { 2380sub set_value {
2099 my ($self, $value) = @_; 2381 my ($self, $value) = @_;
2100 2382
… …
2119} 2401}
2120 2402
2121sub size_request { 2403sub size_request {
2122 my ($self) = @_; 2404 my ($self) = @_;
2123 2405
2124 my $w = $self->{req_w}; 2406 ($self->{req_w}, $self->{req_h})
2125 my $h = $self->{req_h};
2126
2127 $self->{vertical} ? ($h, $w) : ($w, $h)
2128} 2407}
2129 2408
2130sub button_down { 2409sub invoke_button_down {
2131 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2132 2411
2133 $self->SUPER::button_down ($ev, $x, $y); 2412 $self->SUPER::invoke_button_down ($ev, $x, $y);
2134 2413
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136 2415
2137 $self->mouse_motion ($ev, $x, $y); 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2138} 2417}
2139 2418
2140sub mouse_motion { 2419sub invoke_mouse_motion {
2141 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2142 2421
2143 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2145 2424
2146 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2425 my (undef, $lo, $hi, $page) = @{$self->{range}};
2147 2426
2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2427 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2149 2428
2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2429 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2430 } else {
2431 return 0;
2432 }
2433
2151 } 2434 1
2152} 2435}
2153 2436
2154sub update { 2437sub update {
2155 my ($self) = @_; 2438 my ($self) = @_;
2156 2439
2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2440 delete $self->{knob_w};
2441 $self->SUPER::update;
2442}
2443
2444sub _draw {
2445 my ($self) = @_;
2446
2447 unless ($self->{knob_w}) {
2158 $self->set_value ($self->{range}[0]); 2448 $self->set_value ($self->{range}[0]);
2159 2449
2160 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2450 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100; 2451 my $range = ($hi - $page - $lo) || 1e-100;
2162 2452
… …
2168 $value = ($value - $lo) / $range; 2458 $value = ($value - $lo) / $range;
2169 $value = $value * $self->{scale} + $self->{offset}; 2459 $value = $value * $self->{scale} + $self->{offset};
2170 2460
2171 $self->{knob_x} = $value - $knob_w * 0.5; 2461 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $knob_w; 2462 $self->{knob_w} = $knob_w;
2173 }); 2463 }
2174
2175 $self->SUPER::update;
2176}
2177
2178sub _draw {
2179 my ($self) = @_;
2180 2464
2181 $self->SUPER::_draw (); 2465 $self->SUPER::_draw ();
2182 2466
2183 glScale $self->{w}, $self->{h}; 2467 glScale $self->{w}, $self->{h};
2184 2468
… …
2245sub set_range { shift->{slider}->set_range (@_) } 2529sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) } 2530sub set_value { shift->{slider}->set_value (@_) }
2247 2531
2248############################################################################# 2532#############################################################################
2249 2533
2250package CFClient::UI::TextView; 2534package CFClient::UI::TextScroller;
2251 2535
2252our @ISA = CFClient::UI::HBox::; 2536our @ISA = CFClient::UI::HBox::;
2253 2537
2254use CFClient::OpenGL; 2538use CFClient::OpenGL;
2255 2539
… …
2257 my $class = shift; 2541 my $class = shift;
2258 2542
2259 my $self = $class->SUPER::new ( 2543 my $self = $class->SUPER::new (
2260 fontsize => 1, 2544 fontsize => 1,
2261 can_events => 0, 2545 can_events => 0,
2546 indent => 0,
2262 #font => default_font 2547 #font => default_font
2263 @_, 2548 @_,
2264 2549
2265 layout => (new CFClient::Layout 1), 2550 layout => (new CFClient::Layout 1),
2266 par => [], 2551 par => [],
… …
2281 2566
2282 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2283 $self->reflow; 2568 $self->reflow;
2284} 2569}
2285 2570
2286sub size_allocate { 2571sub invoke_size_allocate {
2287 my ($self, $w, $h) = @_; 2572 my ($self, $w, $h) = @_;
2288
2289 $self->SUPER::size_allocate ($w, $h);
2290 2573
2291 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2576 $self->{layout}->set_width ($self->{children}[0]{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2294 2578
2295 $self->reflow; 2579 $self->reflow;
2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2296} 2582}
2297 2583
2298sub text_size { 2584sub text_size {
2299 my ($self, $text, $indent) = @_; 2585 my ($self, $text, $indent) = @_;
2300 2586
2301 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2302 2588
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2590 $layout->set_width ($self->{children}[0]{w} - $indent);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2305 $layout->set_markup ($text); 2592 $layout->set_markup ($text);
2306 2593
2307 $layout->size 2594 $layout->size
2308} 2595}
2309 2596
… …
2348 2635
2349 return unless $self->{h} > 0; 2636 return unless $self->{h} > 0;
2350 2637
2351 delete $self->{texture}; 2638 delete $self->{texture};
2352 2639
2353 $ROOT->on_post_alloc ($self, sub { 2640 $ROOT->on_post_alloc ($self => sub {
2354 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2355 2642
2356 if (delete $self->{need_reflow}) { 2643 if (delete $self->{need_reflow}) {
2357 my $height = 0; 2644 my $height = 0;
2358 2645
… …
2361 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2362 2649
2363 for (@{$self->{par}}) { 2650 for (@{$self->{par}}) {
2364 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2365 $layout->set_width ($W - $_->[3]); 2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2366 $layout->set_markup ($_->[4]); 2654 $layout->set_markup ($_->[4]);
2367 my ($w, $h) = $layout->size; 2655 my ($w, $h) = $layout->size;
2368 $_->[0] = $w + $_->[3]; 2656 $_->[0] = $w + $_->[3];
2369 $_->[1] = $h; 2657 $_->[1] = $h;
2370 } 2658 }
… …
2373 } 2661 }
2374 2662
2375 $self->{height} = $height; 2663 $self->{height} = $height;
2376 2664
2377 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2378 2666
2379 delete $self->{texture}; 2667 delete $self->{texture};
2380 } 2668 }
2381 2669
2382 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2383 glClearColor 0.5, 0.5, 0.5, 0; 2671 glClearColor 0, 0, 0, 0;
2384 glClear GL_COLOR_BUFFER_BIT; 2672 glClear GL_COLOR_BUFFER_BIT;
2385 2673
2386 my $top = int $self->{children}[1]{range}[0]; 2674 my $top = int $self->{children}[1]{range}[0];
2387 2675
2388 my $y0 = $top; 2676 my $y0 = $top;
… …
2402 my $h = $par->[1]; 2690 my $h = $par->[1];
2403 2691
2404 if ($y0 < $y + $h && $y < $y1) { 2692 if ($y0 < $y + $h && $y < $y1) {
2405 $layout->set_foreground (@{ $par->[2] }); 2693 $layout->set_foreground (@{ $par->[2] });
2406 $layout->set_width ($W - $par->[3]); 2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($par->[4]); 2696 $layout->set_markup ($par->[4]);
2408 2697
2409 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2698 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2410 2699
2411 glRasterPos $par->[3], $y - $y0; 2700 glRasterPos $par->[3], $y - $y0;
… …
2423sub _draw { 2712sub _draw {
2424 my ($self) = @_; 2713 my ($self) = @_;
2425 2714
2426 glEnable GL_TEXTURE_2D; 2715 glEnable GL_TEXTURE_2D;
2427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2428 glColor 1, 1, 1, 1; 2717 glColor 0, 0, 0, 1;
2429 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2430 glDisable GL_TEXTURE_2D; 2719 glDisable GL_TEXTURE_2D;
2431 2720
2432 $self->{children}[1]->draw; 2721 $self->{children}[1]->draw;
2433 2722
2434} 2723}
… …
2483 2772
2484sub new { 2773sub new {
2485 my $class = shift; 2774 my $class = shift;
2486 2775
2487 my $self = $class->SUPER::new ( 2776 my $self = $class->SUPER::new (
2488 state => 0, 2777 state => 0,
2489 connect_activate => \&toggle_flopper, 2778 on_activate => \&toggle_flopper,
2490 @_ 2779 @_
2491 ); 2780 );
2492 2781
2493 if ($self->{state}) {
2494 $self->{state} = 0;
2495 $self->toggle_flopper;
2496 }
2497
2498 $self 2782 $self
2499} 2783}
2500 2784
2501sub toggle_flopper { 2785sub toggle_flopper {
2502 my ($self) = @_; 2786 my ($self) = @_;
2503 2787
2504 # TODO: use animation 2788 $self->{other}->toggle_visibility;
2505 if ($self->{state} = !$self->{state}) {
2506 $CFClient::UI::ROOT->add ($self->{other});
2507 $self->{other}->move ($self->coord2global (0, $self->{h}));
2508 $self->emit ("open");
2509 } else {
2510 $CFClient::UI::ROOT->remove ($self->{other});
2511 $self->emit ("close");
2512 }
2513
2514 $self->emit (changed => $self->{state});
2515} 2789}
2516 2790
2517############################################################################# 2791#############################################################################
2518 2792
2519package CFClient::UI::Tooltip; 2793package CFClient::UI::Tooltip;
… …
2532} 2806}
2533 2807
2534sub set_tooltip_from { 2808sub set_tooltip_from {
2535 my ($self, $widget) = @_; 2809 my ($self, $widget) = @_;
2536 2810
2811 my $tooltip = $widget->{tooltip};
2812
2813 if ($ENV{CFPLUS_DEBUG} & 2) {
2814 $tooltip .= "\n\n" . (ref $widget) . "\n"
2815 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2816 . "req $widget->{req_w} $widget->{req_h}\n"
2817 . "visible $widget->{visible}";
2818 }
2819
2820 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//;
2822
2537 $self->add (new CFClient::UI::Label 2823 $self->add (new CFClient::UI::Label
2538 markup => $widget->{tooltip}, 2824 markup => $tooltip,
2539 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2540 fontsize => 0.8, 2826 fontsize => 0.8,
2541 fg => [0, 0, 0, 1], 2827 fg => [0, 0, 0, 1],
2542 ellipsise => 0, 2828 ellipsise => 0,
2543 font => ($widget->{tooltip_font} || $::FONT_PROP), 2829 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2550 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2551 2837
2552 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2553} 2839}
2554 2840
2555sub size_allocate { 2841sub invoke_size_allocate {
2556 my ($self, $w, $h) = @_; 2842 my ($self, $w, $h) = @_;
2557 2843
2558 $self->SUPER::size_allocate ($w - 4, $h - 4); 2844 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2845}
2846
2847sub invoke_visibility_change {
2848 my ($self, $visible) = @_;
2849
2850 return unless $visible;
2851
2852 $self->{root}->on_post_alloc ("move_$self" => sub {
2853 my $widget = $self->{owner}
2854 or return;
2855
2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857
2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859 if $x + $self->{w} > $self->{root}{w};
2860
2861 $self->move_abs ($x, $y);
2862 });
2559} 2863}
2560 2864
2561sub _draw { 2865sub _draw {
2562 my ($self) = @_; 2866 my ($self) = @_;
2563 2867
… …
2580 glVertex $w, $h; 2884 glVertex $w, $h;
2581 glVertex $w, 0; 2885 glVertex $w, 0;
2582 glEnd; 2886 glEnd;
2583 2887
2584 glTranslate 2 - 0.375, 2 - 0.375; 2888 glTranslate 2 - 0.375, 2 - 0.375;
2889
2585 $self->SUPER::_draw; 2890 $self->SUPER::_draw;
2586} 2891}
2587 2892
2588############################################################################# 2893#############################################################################
2589 2894
… …
2595 2900
2596sub new { 2901sub new {
2597 my $class = shift; 2902 my $class = shift;
2598 2903
2599 my $self = $class->SUPER::new ( 2904 my $self = $class->SUPER::new (
2600 aspect => 1, 2905 aspect => 1,
2906 can_events => 0,
2601 @_, 2907 @_,
2602 ); 2908 );
2603 2909
2604 if ($self->{anim} && $self->{animspeed}) { 2910 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self); 2911 Scalar::Util::weaken (my $widget = $self);
… …
2647 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2648 2954
2649 if ($tex) { 2955 if ($tex) {
2650 glEnable GL_TEXTURE_2D; 2956 glEnable GL_TEXTURE_2D;
2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2652 glColor 1, 1, 1, 1; 2958 glColor 0, 0, 0, 1;
2653 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2654 glDisable GL_TEXTURE_2D; 2960 glDisable GL_TEXTURE_2D;
2655 } 2961 }
2656} 2962}
2657 2963
2658sub DESTROY { 2964sub destroy {
2659 my ($self) = @_; 2965 my ($self) = @_;
2660 2966
2661 $self->{timer}->cancel 2967 $self->{timer}->cancel
2662 if $self->{timer}; 2968 if $self->{timer};
2663 2969
2664 $self->SUPER::DESTROY; 2970 $self->SUPER::destroy;
2665} 2971}
2666 2972
2667############################################################################# 2973#############################################################################
2668 2974
2669package CFClient::UI::InventoryItem; 2975package CFClient::UI::Buttonbar;
2670 2976
2671our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFClient::UI::HBox::;
2672 2978
2673sub _item_to_desc { 2979# TODO: should actualyl wrap buttons and other goodies.
2674 my ($item) = @_;
2675
2676 my $desc =
2677 $item->{nrof} < 2
2678 ? $item->{name}
2679 : "$item->{nrof} × $item->{name_pl}";
2680
2681 $item->{flags} & Crossfire::Protocol::F_OPEN
2682 and $desc .= " (open)";
2683 $item->{flags} & Crossfire::Protocol::F_APPLIED
2684 and $desc .= " (applied)";
2685 $item->{flags} & Crossfire::Protocol::F_UNPAID
2686 and $desc .= " (unpaid)";
2687 $item->{flags} & Crossfire::Protocol::F_MAGIC
2688 and $desc .= " (magic)";
2689 $item->{flags} & Crossfire::Protocol::F_CURSED
2690 and $desc .= " (cursed)";
2691 $item->{flags} & Crossfire::Protocol::F_DAMNED
2692 and $desc .= " (damned)";
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED
2694 and $desc .= " *";
2695
2696 $desc
2697}
2698
2699sub new {
2700 my $class = shift;
2701
2702 my %args = @_;
2703
2704 my $item = delete $args{item};
2705
2706 my $desc = _item_to_desc ($item);
2707
2708 my $self = $class->SUPER::new (
2709 can_hover => 1,
2710 can_events => 1,
2711 tooltip => ((CFClient::UI::Label::escape $desc)
2712 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2713 connect_button_down => sub {
2714 my ($self, $ev, $x, $y) = @_;
2715
2716 # todo: maybe put examine on 1? but should just be a tooltip :(
2717 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718 my $targ = $::CONN->{player}{tag};
2719
2720 if ($item->{container} == $::CONN->{player}{tag}) {
2721 $targ = $main::OPENCONT;
2722 }
2723
2724 $::CONN->send ("move $targ $item->{tag} 0");
2725 } elsif ($ev->{button} == 1) {
2726 $::CONN->send ("examine $item->{tag}");
2727 } elsif ($ev->{button} == 2) {
2728 $::CONN->send ("apply $item->{tag}");
2729 } elsif ($ev->{button} == 3) {
2730 my @menu_items = (
2731 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2732 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2733 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734 (
2735 $item->{flags} & Crossfire::Protocol::F_LOCKED
2736 ? (
2737 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738 )
2739 : (
2740 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2741 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742 )
2743 ),
2744 );
2745
2746 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2747 }
2748
2749 1
2750 },
2751 %args
2752 );
2753
2754
2755 $self->add (new CFClient::UI::Face
2756 can_events => 0,
2757 face => $item->{face},
2758 anim => $item->{anim},
2759 animspeed => $item->{animspeed},
2760 );
2761
2762 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2763
2764 $self->{item} = $item;
2765
2766 $self->update_item;
2767
2768 $self
2769}
2770
2771sub update_item {
2772 my ($self) = @_;
2773
2774 my $desc = _item_to_desc ($self->{item});
2775
2776 $self->{name_lbl}->set_text ($desc);
2777}
2778
2779#############################################################################
2780
2781package CFClient::UI::Inventory;
2782
2783our @ISA = CFClient::UI::ScrolledWindow::;
2784
2785sub new {
2786 my $class = shift;
2787
2788 my $self = $class->SUPER::new (
2789 scrolled => (new CFClient::UI::Table),
2790 @_,
2791 );
2792
2793 $self
2794}
2795
2796sub set_items {
2797 my ($self, $items) = @_;
2798
2799 $self->{scrolled}->clear;
2800 return unless $items;
2801
2802 my @items = sort {
2803 ($a->{type} <=> $b->{type})
2804 or ($a->{name} cmp $b->{name})
2805 } @$items;
2806
2807 $self->{real_items} = \@items;
2808
2809 for my $item (@items) {
2810 $item->{item} = $item;
2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812 $item->update_item ();
2813 }
2814
2815 my $i = 0;
2816 for (@items) {
2817 $self->{scrolled}->add (0, $i, $_);
2818 my $nrof = $_->{item}->{nrof} || 1;
2819 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820 }
2821
2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2823}
2824
2825sub size_request {
2826 my ($self) = @_;
2827 ($self->{req_w}, $self->{req_h});
2828}
2829 2980
2830############################################################################# 2981#############################################################################
2831 2982
2832package CFClient::UI::Menu; 2983package CFClient::UI::Menu;
2833 2984
… …
2845 ); 2996 );
2846 2997
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2998 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2848 2999
2849 for my $item (@{ $self->{items} }) { 3000 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3001 my ($widget, $cb, $tooltip) = @$item;
2851 3002
2852 # handle various types of items, only text for now 3003 # handle various types of items, only text for now
2853 if (!ref $widget) { 3004 if (!ref $widget) {
2854 $widget = new CFClient::UI::Label 3005 $widget = new CFClient::UI::Label
2855 can_hover => 1, 3006 can_hover => 1,
2856 can_events => 1, 3007 can_events => 1,
2857 text => $widget; 3008 markup => $widget,
3009 tooltip => $tooltip
2858 } 3010 }
2859 3011
2860 $self->{item}{$widget} = $item; 3012 $self->{item}{$widget} = $item;
2861 3013
2862 $self->{vbox}->add ($widget); 3014 $self->{vbox}->add ($widget);
… …
2874 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3027 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2877 3029
2878 $self->show; 3030 $self->show;
2879 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3031 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880} 3032}
2881 3033
2882sub mouse_motion { 3034sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2884 3036
2885 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3040
3041 0
3042}
3043
2890sub button_up { 3044sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2892 3046
2893 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3048 undef $GRAB;
2895 $self->hide; 3049 $self->hide;
2896 3050
2897 $self->emit ("popdown"); 3051 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
3053 } else {
3054 return 0
3055 }
3056
2899 } 3057 1
2900} 3058}
2901 3059
2902############################################################################# 3060#############################################################################
2903 3061
2904package CFClient::UI::Statusbox; 3062package CFClient::UI::Multiplexer;
2905 3063
2906our @ISA = CFClient::UI::VBox::; 3064our @ISA = CFClient::UI::Container::;
2907 3065
2908sub new { 3066sub new {
2909 my $class = shift; 3067 my $class = shift;
2910 3068
2911 $class->SUPER::new ( 3069 my $self = $class->SUPER::new (
3070 @_,
3071 );
3072
3073 $self->{current} = $self->{children}[0]
3074 if @{ $self->{children} };
3075
3076 $self
3077}
3078
3079sub add {
3080 my ($self, @widgets) = @_;
3081
3082 $self->SUPER::add (@widgets);
3083
3084 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} };
3086}
3087
3088sub set_current_page {
3089 my ($self, $page_or_widget) = @_;
3090
3091 my $widget = ref $page_or_widget
3092 ? $page_or_widget
3093 : $self->{children}[$page_or_widget];
3094
3095 $self->{current} = $widget;
3096 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3097
3098 $self->emit (page_changed => $self->{current});
3099
3100 $self->realloc;
3101}
3102
3103sub visible_children {
3104 $_[0]{current}
3105}
3106
3107sub size_request {
3108 my ($self) = @_;
3109
3110 $self->{current}->size_request
3111}
3112
3113sub invoke_size_allocate {
3114 my ($self, $w, $h) = @_;
3115
3116 $self->{current}->configure (0, 0, $w, $h);
3117
3118 1
3119}
3120
3121sub _draw {
3122 my ($self) = @_;
3123
3124 $self->{current}->draw;
3125}
3126
3127#############################################################################
3128
3129package CFClient::UI::Notebook;
3130
3131our @ISA = CFClient::UI::VBox::;
3132
3133sub new {
3134 my $class = shift;
3135
3136 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self
3140 @_,
3141 );
3142
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3144 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3145
3146 $self
3147}
3148
3149sub add {
3150 my ($self, $title, $widget, $tooltip) = @_;
3151
3152 Scalar::Util::weaken $self;
3153
3154 $self->{buttonbar}->add (new CFClient::UI::Button
3155 markup => $title,
3156 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) },
3158 );
3159
3160 $self->{multiplexer}->add ($widget);
3161}
3162
3163sub set_current_page {
3164 my ($self, $page) = @_;
3165
3166 $self->{multiplexer}->set_current_page ($page);
3167 $self->emit (page_changed => $self->{multiplexer}{current});
3168}
3169
3170#############################################################################
3171
3172package CFClient::UI::Combobox;
3173
3174use utf8;
3175
3176our @ISA = CFClient::UI::Button::;
3177
3178sub new {
3179 my $class = shift;
3180
3181 my $self = $class->SUPER::new (
3182 options => [], # [value, title, longdesc], ...
3183 value => undef,
3184 @_,
3185 );
3186
3187 $self->_set_value ($self->{value});
3188
3189 $self
3190}
3191
3192sub invoke_button_down {
3193 my ($self, $ev) = @_;
3194
3195 my @menu_items;
3196
3197 for (@{ $self->{options} }) {
3198 my ($value, $title, $tooltip) = @$_;
3199
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 }
3202
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204}
3205
3206sub _set_value {
3207 my ($self, $value) = @_;
3208
3209 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3210 or return;
3211
3212 $self->{value} = $item->[0];
3213 $self->set_markup ("$item->[1] ⇓");
3214 $self->set_tooltip ($item->[2]);
3215}
3216
3217sub set_value {
3218 my ($self, $value) = @_;
3219
3220 return unless $self->{value} ne $value;
3221
3222 $self->_set_value ($value);
3223 $self->emit (changed => $value);
3224}
3225
3226#############################################################################
3227
3228package CFClient::UI::Statusbox;
3229
3230our @ISA = CFClient::UI::VBox::;
3231
3232sub new {
3233 my $class = shift;
3234
3235 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3236 fontsize => 0.8,
2913 @_, 3237 @_,
2914 ) 3238 );
3239
3240 Scalar::Util::weaken (my $this = $self);
3241
3242 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243
3244 $self
2915} 3245}
2916 3246
2917sub reorder { 3247sub reorder {
2918 my ($self) = @_; 3248 my ($self) = @_;
2919 my $NOW = time; 3249 my $NOW = Time::HiRes::time;
3250
3251 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} };
2920 3255
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3256 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3257 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3258 }
2924 3259
… …
2927 my @items = sort { 3262 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3263 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3264 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3265 } values %{ $self->{item} };
2931 3266
3267 $self->{timer}->interval (1);
3268
2932 my $count = 10 + 1; 3269 my $count = 10 + 1;
2933 for my $item (@items) { 3270 for my $item (@items) {
2934 last unless --$count; 3271 last unless --$count;
2935 3272
2936 push @widgets, $item->{label} ||= do { 3273 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3274 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3275 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3276 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3277 : $item->{text};
2941 3278
… …
2949 tooltip => $item->{tooltip}, 3286 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3287 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3288 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3289 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3290 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3291 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3292 can_events => 1,
2956 can_hover => 1 3293 can_hover => 1
2957 }; 3294 };
3295
3296 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3297 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3298 $label->update;
3299 $label->set_max_size (undef, $label->{req_h} * $diff)
3300 if $diff < 1;
3301 $self->{timer}->interval (1/30);
3302 } else {
3303 $label->{fg}[3] = $item->{fg}[3] || 1;
3304 }
3305
3306 push @widgets, $label;
2958 } 3307 }
2959 3308
2960 $self->clear; 3309 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3310 $self->SUPER::add (reverse @widgets);
2962} 3311}
… …
2965 my ($self, $text, %arg) = @_; 3314 my ($self, $text, %arg) = @_;
2966 3315
2967 $text =~ s/^\s+//; 3316 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3317 $text =~ s/\s+$//;
2969 3318
3319 return unless $text;
3320
2970 my $timeout = time + ((delete $arg{timeout}) || 60); 3321 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2971 3322
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3323 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973 3324
2974 if (my $item = $self->{item}{$group}) { 3325 if (my $item = $self->{item}{$group}) {
2975 if ($item->{text} eq $text) { 3326 if ($item->{text} eq $text) {
2976 $item->{count}++; 3327 $item->{count}++;
2977 } else { 3328 } else {
2978 $item->{count} = 1; 3329 $item->{count} = 1;
2979 $item->{text} = $item->{tooltip} = $text; 3330 $item->{text} = $item->{tooltip} = $text;
2980 } 3331 }
2981 $item->{id} = ++$self->{id}; 3332 $item->{id} += 0.2;#d#
2982 $item->{timeout} = $timeout; 3333 $item->{timeout} = $timeout;
2983 delete $item->{label}; 3334 delete $item->{label};
2984 } else { 3335 } else {
2985 $self->{item}{$group} = { 3336 $self->{item}{$group} = {
2986 id => ++$self->{id}, 3337 id => ++$self->{id},
… …
3005 3356
3006 $self->reorder; 3357 $self->reorder;
3007 $self->SUPER::reconfigure; 3358 $self->SUPER::reconfigure;
3008} 3359}
3009 3360
3361sub destroy {
3362 my ($self) = @_;
3363
3364 $self->{timer}->cancel;
3365
3366 $self->SUPER::destroy;
3367}
3368
3010############################################################################# 3369#############################################################################
3011 3370
3012package CFClient::UI::Root; 3371package CFClient::UI::Inventory;
3013 3372
3014our @ISA = CFClient::UI::Container::; 3373our @ISA = CFClient::UI::ScrolledWindow::;
3015
3016use CFClient::OpenGL;
3017 3374
3018sub new { 3375sub new {
3019 my $class = shift; 3376 my $class = shift;
3020 3377
3021 $class->SUPER::new ( 3378 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380 @_,
3381 );
3382
3383 $self
3384}
3385
3386sub set_items {
3387 my ($self, $items) = @_;
3388
3389 $self->{child}->clear;
3390 return unless $items;
3391
3392 my @items = sort {
3393 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name})
3395 } @$items;
3396
3397 $self->{real_items} = \@items;
3398
3399 my $row = 0;
3400 for my $item (@items) {
3401 CFClient::Item::update_widgets $item;
3402
3403 $self->{child}->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget});
3406
3407 $row++;
3408 }
3409}
3410
3411#############################################################################
3412
3413package CFClient::UI::BindEditor;
3414
3415our @ISA = CFClient::UI::FancyFrame::;
3416
3417sub new {
3418 my $class = shift;
3419
3420 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422 $self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426 text => "start recording",
3427 tooltip => "Start/Stops recording of actions."
3428 ."All subsequent actions after the recording started will be captured."
3429 ."The actions are displayed after the record was stopped."
3430 ."To bind the action you have to click on the 'Bind' button",
3431 on_activate => sub {
3432 unless ($self->{recording}) {
3433 $self->start;
3434 } else {
3435 $self->stop;
3436 }
3437 });
3438
3439 $vb->add (new CFClient::UI::Label text => "Actions:");
3440 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3443 $vb->add (my $hb = new CFClient::UI::HBox);
3444 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445 $hb->add (new CFClient::UI::Button
3446 text => "bind",
3447 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448 on_activate => sub {
3449 $self->ask_for_bind;
3450 });
3451
3452 $vb->add (my $hb = new CFClient::UI::HBox);
3453 $hb->add (new CFClient::UI::Button
3454 text => "ok",
3455 expand => 1,
3456 tooltip => "This closes the binding editor and saves the binding",
3457 on_activate => sub {
3458 $self->hide;
3459 $self->commit;
3460 });
3461
3462 $hb->add (new CFClient::UI::Button
3463 text => "cancel",
3464 expand => 1,
3465 tooltip => "This closes the binding editor without saving",
3466 on_activate => sub {
3467 $self->hide;
3468 $self->{binding_cancel}->()
3469 if $self->{binding_cancel};
3470 });
3471
3472 $self->update_binding_widgets;
3473
3474 $self
3475}
3476
3477sub cfg_bind {
3478 my ($self, $mod, $sym, $cmds) = @_;
3479 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3480 ::update_bindings ();
3481}
3482
3483sub cfg_unbind {
3484 my ($self, $mod, $sym, $cmds) = @_;
3485 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3486 ::update_bindings ();
3487}
3488
3489sub commit {
3490 my ($self) = @_;
3491 my ($mod, $sym, $cmds) = $self->get_binding;
3492 if ($sym != 0 && @$cmds > 0) {
3493 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3494 ."'. Don't forget 'Save Config'!");
3495 $self->{binding_change}->($mod, $sym, $cmds)
3496 if $self->{binding_change};
3497 } else {
3498 $::STATUSBOX->add ("No action bound, no key or action specified!");
3499 $self->{binding_cancel}->()
3500 if $self->{binding_cancel};
3501 }
3502}
3503
3504sub start {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("stop recording");
3508 $self->{recording} = 1;
3509 $self->clear_command_list;
3510 $::CONN->start_record if $::CONN;
3511}
3512
3513sub stop {
3514 my ($self) = @_;
3515
3516 $self->{rec_btn}->set_text ("start recording");
3517 $self->{recording} = 0;
3518
3519 my $rec;
3520 $rec = $::CONN->stop_record if $::CONN;
3521 return unless ref $rec eq 'ARRAY';
3522 $self->set_command_list ($rec);
3523}
3524
3525
3526sub ask_for_bind_and_commit {
3527 my ($self) = @_;
3528 $self->ask_for_bind (1);
3529}
3530
3531sub ask_for_bind {
3532 my ($self, $commit, $end_cb) = @_;
3533
3534 CFClient::Binder::open_binding_dialog (sub {
3535 my ($mod, $sym) = @_;
3536 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3537 $self->update_binding_widgets;
3538 $self->commit if $commit;
3539 $end_cb->() if $end_cb;
3540 });
3541}
3542
3543# $mod and $sym are the modifiers and key symbol
3544# $cmds is a array ref of strings (the commands)
3545# $cb is the callback that is executed on OK
3546# $ccb is the callback that is executed on CANCEL and
3547# when the binding was unsuccessful on OK
3548sub set_binding {
3549 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3550
3551 $self->clear_command_list;
3552 $self->{recording} = 0;
3553 $self->{rec_btn}->set_text ("start recording");
3554
3555 $self->{binding} = [$mod, $sym];
3556 $self->{commands} = $cmds;
3557
3558 $self->{binding_change} = $cb;
3559 $self->{binding_cancel} = $ccb;
3560
3561 $self->update_binding_widgets;
3562}
3563
3564# this is a shortcut method that asks for a binding
3565# and then just binds it.
3566sub do_quick_binding {
3567 my ($self, $cmds, $end_cb) = @_;
3568 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3569 $self->ask_for_bind (1, $end_cb);
3570}
3571
3572sub update_binding_widgets {
3573 my ($self) = @_;
3574 my ($mod, $sym, $cmds) = $self->get_binding;
3575 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3576 $self->set_command_list ($cmds);
3577}
3578
3579sub get_binding {
3580 my ($self) = @_;
3581 return (
3582 $self->{binding}->[0],
3583 $self->{binding}->[1],
3584 [ grep { defined $_ } @{$self->{commands}} ]
3585 );
3586}
3587
3588sub clear_command_list {
3589 my ($self) = @_;
3590 $self->{cmdbox}->clear ();
3591}
3592
3593sub set_command_list {
3594 my ($self, $cmds) = @_;
3595
3596 $self->{cmdbox}->clear ();
3597 $self->{commands} = $cmds;
3598
3599 my $idx = 0;
3600
3601 for (@$cmds) {
3602 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3603
3604 my $i = $idx;
3605 $hb->add (new CFClient::UI::Label text => $_);
3606 $hb->add (new CFClient::UI::Button
3607 text => "delete",
3608 tooltip => "Deletes the action from the record",
3609 on_activate => sub {
3610 $self->{cmdbox}->remove ($hb);
3611 $cmds->[$i] = undef;
3612 });
3613
3614
3615 $idx++
3616 }
3617}
3618
3619#############################################################################
3620
3621package CFClient::UI::SpellList;
3622
3623our @ISA = CFClient::UI::Table::;
3624
3625sub new {
3626 my $class = shift;
3627
3628 my $self = $class->SUPER::new (
3629 binding => [],
3630 commands => [],
3022 @_, 3631 @_,
3023 ) 3632 )
3024} 3633}
3025 3634
3026sub configure { 3635my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3027 my ($self, $x, $y, $w, $h) = @_;
3028 3636
3029 $self->{w} = $w; 3637my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3030 $self->{h} = $h; 3638 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3031} 3639my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3640 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3641my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3642 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3643my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3644 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3645my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3646 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3032 3647
3033sub check_size { 3648sub rebuild_spell_list {
3649 my ($self) = @_;
3650
3651 $CFClient::UI::ROOT->on_refresh ($self => sub {
3652 $self->clear;
3653
3654 return unless $::CONN;
3655
3656 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3657 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3658 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3659 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3660 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3661
3662 my $row = 0;
3663
3664 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3665 my $spell = $self->{spell}{$_};
3666
3667 $row++;
3668
3669 my $spell_cb = sub {
3670 my ($widget, $ev) = @_;
3671
3672 if ($ev->{button} == 1) {
3673 $::CONN->user_send ("cast $spell->{name}");
3674 } elsif ($ev->{button} == 2) {
3675 $::CONN->user_send ("invoke $spell->{name}");
3676 } elsif ($ev->{button} == 3) {
3677 (new CFClient::UI::Menu
3678 items => [
3679 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3680 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3681 ],
3682 )->popup ($ev);
3683 } else {
3684 return 0;
3685 }
3686
3687 1
3688 };
3689
3690 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3691
3692 #TODO: add path info to tooltip
3693 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3694
3695 $self->add (0, $row, new CFClient::UI::Face
3696 face => $spell->{face},
3697 can_hover => 1,
3698 can_events => 1,
3699 tooltip => $tooltip,
3700 on_button_down => $spell_cb,
3701 );
3702
3703 $self->add (1, $row, new CFClient::UI::Label
3704 expand => 1,
3705 text => $spell->{name},
3706 can_hover => 1,
3707 can_events => 1,
3708 tooltip => $tooltip,
3709 on_button_down => $spell_cb,
3710 );
3711
3712 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3713 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3714 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3715 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3716 }
3717 });
3718}
3719
3720sub add_spell {
3034 my ($self) = @_; 3721 my ($self, $spell) = @_;
3035 3722
3036 $self->size_allocate ($self->{w}, $self->{h}) 3723 $self->{spell}->{$spell->{name}} = $spell;
3037 if $self->{w}; 3724 $self->rebuild_spell_list;
3725}
3726
3727sub remove_spell {
3728 my ($self, $spell) = @_;
3729
3730 delete $self->{spell}->{$spell->{name}};
3731 $self->rebuild_spell_list;
3732}
3733
3734sub clear_spells {
3735 my ($self) = @_;
3736
3737 $self->{spell} = {};
3738 $self->rebuild_spell_list;
3739}
3740
3741#############################################################################
3742
3743package CFClient::UI::Root;
3744
3745our @ISA = CFClient::UI::Container::;
3746
3747use List::Util qw(min max);
3748
3749use CFClient::OpenGL;
3750
3751sub new {
3752 my $class = shift;
3753
3754 my $self = $class->SUPER::new (
3755 visible => 1,
3756 @_,
3757 );
3758
3759 Scalar::Util::weaken ($self->{root} = $self);
3760
3761 $self
3038} 3762}
3039 3763
3040sub size_request { 3764sub size_request {
3041 my ($self) = @_; 3765 my ($self) = @_;
3042 3766
3043 ($self->{w}, $self->{h}) 3767 ($self->{w}, $self->{h})
3044} 3768}
3045 3769
3770sub _to_pixel {
3771 my ($coord, $size, $max) = @_;
3772
3773 $coord =
3774 $coord eq "center" ? ($max - $size) * 0.5
3775 : $coord eq "max" ? $max
3776 : $coord;
3777
3778 $coord = 0 if $coord < 0;
3779 $coord = $max - $size if $coord > $max - $size;
3780
3781 int $coord + 0.5
3782}
3783
3046sub size_allocate { 3784sub invoke_size_allocate {
3047 my ($self, $w, $h) = @_; 3785 my ($self, $w, $h) = @_;
3048
3049 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054 3786
3055 for my $child ($self->children) { 3787 for my $child ($self->children) {
3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3788 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057 3789
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3790 $X = $child->{force_x} if exists $child->{force_x};
3059 if exists $child->{req_x}; 3791 $Y = $child->{force_y} if exists $child->{force_y};
3060 3792
3061 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3793 $X = _to_pixel $X, $W, $self->{w};
3062 if exists $child->{req_y}; 3794 $Y = _to_pixel $Y, $H, $self->{h};
3063
3064 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3065 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066 3795
3067 $child->configure ($X, $Y, $W, $H); 3796 $child->configure ($X, $Y, $W, $H);
3068 } 3797 }
3798
3799 1
3069} 3800}
3070 3801
3071sub coord2local { 3802sub coord2local {
3072 my ($self, $x, $y) = @_; 3803 my ($self, $x, $y) = @_;
3073 3804
… …
3081} 3812}
3082 3813
3083sub update { 3814sub update {
3084 my ($self) = @_; 3815 my ($self) = @_;
3085 3816
3086 $self->check_size;
3087 $::WANT_REFRESH++; 3817 $::WANT_REFRESH++;
3088} 3818}
3089 3819
3090sub add { 3820sub add {
3091 my ($self, @children) = @_; 3821 my ($self, @children) = @_;
3092 3822
3093 for my $child (@children) {
3094 $child->{toplevel} = 1; 3823 $_->{is_toplevel} = 1
3095 3824 for @children;
3096 # integerise window positions
3097 $child->{x} = int $child->{x};
3098 $child->{y} = int $child->{y};
3099 }
3100 3825
3101 $self->SUPER::add (@children); 3826 $self->SUPER::add (@children);
3827}
3828
3829sub remove {
3830 my ($self, @children) = @_;
3831
3832 $self->SUPER::remove (@children);
3833
3834 delete $self->{is_toplevel}
3835 for @children;
3102 3836
3103 while (@children) { 3837 while (@children) {
3104 my $w = pop @children; 3838 my $w = pop @children;
3105 push @children, $w->children; 3839 push @children, $w->children;
3106 $w->{visible} = 1; 3840 $w->set_invisible;
3107 }
3108}
3109
3110sub remove {
3111 my ($self, @children) = @_;
3112
3113 $self->SUPER::remove (@children);
3114
3115 while (@children) {
3116 my $w = pop @children;
3117 push @children, $w->children;
3118 delete $w->{visible};
3119 } 3841 }
3120} 3842}
3121 3843
3122sub on_refresh { 3844sub on_refresh {
3123 my ($self, $id, $cb) = @_; 3845 my ($self, $id, $cb) = @_;
… …
3137 while ($self->{refresh_hook}) { 3859 while ($self->{refresh_hook}) {
3138 $_->() 3860 $_->()
3139 for values %{delete $self->{refresh_hook}}; 3861 for values %{delete $self->{refresh_hook}};
3140 } 3862 }
3141 3863
3142 if ($self->{check_size}) { 3864 if ($self->{realloc}) {
3143 my @queue = ([], []); 3865 my %queue;
3866 my @queue;
3867 my $widget;
3144 3868
3145 for (;;) { 3869 outer:
3146 if ($self->{check_size}) { 3870 while () {
3147 # heuristic: check containers last 3871 if (my $realloc = delete $self->{realloc}) {
3148 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3872 for $widget (values %$realloc) {
3149 for values %{delete $self->{check_size}} 3873 $widget->{visible} or next; # do not resize invisible widgets
3874
3875 $queue{$widget+0}++ and next; # duplicates are common
3876
3877 push @{ $queue[$widget->{visible}] }, $widget;
3878 }
3150 } 3879 }
3151 3880
3152 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3881 while () {
3882 @queue or last outer;
3153 3883
3154 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3884 $widget = pop @{ $queue[-1] || [] }
3155 ? @$widget{qw(user_w user_h)} 3885 and last;
3156 : $widget->size_request;
3157
3158 if (delete $widget->{force_alloc}
3159 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3160 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3161 3886
3887 pop @queue;
3888 }
3889
3890 delete $queue{$widget+0};
3891
3892 my ($w, $h) = $widget->size_request;
3893
3894 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3895 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3896
3897 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3898 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3899
3900 $w = $widget->{force_w} if exists $widget->{force_w};
3901 $h = $widget->{force_h} if exists $widget->{force_h};
3902
3903 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3904 || delete $widget->{force_realloc}) {
3162 $widget->{req_w} = $w; 3905 $widget->{req_w} = $w;
3163 $widget->{req_h} = $h; 3906 $widget->{req_h} = $h;
3164 3907
3165 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3908 $self->{size_alloc}{$widget+0} = $widget;
3166 3909
3167 $widget->{parent}->check_size
3168 if $widget->{parent}; 3910 if (my $parent = $widget->{parent}) {
3911 $self->{realloc}{$parent+0} = $parent
3912 unless $queue{$parent+0};
3913
3914 $parent->{force_size_alloc} = 1;
3915 $self->{size_alloc}{$parent+0} = $parent;
3916 }
3169 } 3917 }
3918
3919 delete $self->{realloc}{$widget+0};
3170 } 3920 }
3171 } 3921 }
3172 3922
3173 while ($self->{size_alloc}) { 3923 while (my $size_alloc = delete $self->{size_alloc}) {
3174 for (values %{delete $self->{size_alloc}}) { 3924 my @queue = sort { $b->{visible} <=> $a->{visible} }
3175 my ($widget, $w, $h) = @$_; 3925 values %$size_alloc;
3926
3927 while () {
3928 my $widget = pop @queue || last;
3929
3930 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 3931
3177 $w = 0 if $w < 0; 3932 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0; 3933 $h = 0 if $h < 0;
3179 3934
3935 $w = int $w + 0.5;
3936 $h = int $h + 0.5;
3937
3938 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3939 $widget->{old_w} = $widget->{w};
3940 $widget->{old_h} = $widget->{h};
3941
3180 $widget->{w} = $w; 3942 $widget->{w} = $w;
3181 $widget->{h} = $h; 3943 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h); 3944
3183 $widget->emit (size_allocate => $w, $h); 3945 $widget->emit (size_allocate => $w, $h);
3946 }
3184 } 3947 }
3185 } 3948 }
3186 3949
3187 while ($self->{post_alloc_hook}) { 3950 while ($self->{post_alloc_hook}) {
3188 $_->() 3951 $_->()
3189 for values %{delete $self->{post_alloc_hook}}; 3952 for values %{delete $self->{post_alloc_hook}};
3190 } 3953 }
3954
3191 3955
3192 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3956 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3957 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194 glClear GL_COLOR_BUFFER_BIT; 3958 glClear GL_COLOR_BUFFER_BIT;
3195 3959
… …
3197 glLoadIdentity; 3961 glLoadIdentity;
3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3962 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199 glMatrixMode GL_MODELVIEW; 3963 glMatrixMode GL_MODELVIEW;
3200 glLoadIdentity; 3964 glLoadIdentity;
3201 3965
3966 {
3967 package CFClient::UI::Base;
3968
3969 ($draw_x, $draw_y, $draw_w, $draw_h) =
3970 (0, 0, $self->{w}, $self->{h});
3971 }
3972
3202 $self->_draw; 3973 $self->_draw;
3203} 3974}
3204 3975
3205############################################################################# 3976#############################################################################
3206 3977

Diff Legend

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