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.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.337 by root, Mon Jul 24 04:24:43 2006 UTC

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

Diff Legend

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