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

Diff Legend

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