ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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