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

Diff Legend

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