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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.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 show_centered { 277sub set_visible {
217 my ($self) = @_; 278 my ($self) = @_;
279
218 return if $self->{parent}; 280 return if $self->{visible};
219 281
220 $self->show; 282 $self->{root} = $self->{parent}{root};
283 $self->{visible} = $self->{parent}{visible} + 1;
221 284
222 $CFClient::UI::ROOT->on_post_alloc ( 285 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 286
229sub hide { 287 $self->realloc if !exists $self->{req_w};
288
289 $_->set_visible for $self->children;
290}
291
292sub set_invisible {
230 my ($self) = @_; 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};
231 301
232 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
234 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
235 $self->{parent}->remove ($self) 334 $self->{parent}->remove ($self)
236 if $self->{parent}; 335 if $self->{parent};
237} 336}
238 337
239sub move { 338sub move_abs {
240 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
241 340
242 $self->{x} = int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
243 $self->{y} = int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
244 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
245 344
246 $self->update; 345 $self->update;
247} 346}
248 347
249sub set_size { 348sub set_size {
250 my ($self, $w, $h) = @_; 349 my ($self, $w, $h) = @_;
251 350
252 $self->{user_w} = $w; 351 $self->{force_w} = $w;
253 $self->{user_h} = $h; 352 $self->{force_h} = $h;
254 353
255 $self->check_size; 354 $self->realloc;
256} 355}
257 356
258sub size_request { 357sub size_request {
259 require Carp; 358 require Carp;
260 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
261} 360}
262 361
362sub baseline_shift {
363 0
364}
365
263sub configure { 366sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
265 368
266 if ($self->{aspect}) { 369 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h);
371
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
269 374
270 # use alignment to adjust x, y 375 # use alignment to adjust x, y
271 376
272 $x += int +($w - $w2) * 0.5; 377 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 378 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 379 }
277 380
278 if ($self->{x} != $x || $self->{y} != $y) { 381 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 382 $self->{x} = $x;
280 $self->{y} = $y; 383 $self->{y} = $y;
281 $self->update; 384 $self->update;
282 } 385 }
283 386
284 if ($self->{w} != $w || $self->{h} != $h) { 387 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 388 return unless $self->{visible};
286 }
287}
288 389
289sub size_allocate { 390 $self->{alloc_w} = $w;
290 # nothing to be done 391 $self->{alloc_h} = $h;
291}
292 392
293sub reconfigure { 393 $self->{root}{size_alloc}{$self+0} = $self;
294 my ($self) = @_; 394 }
295
296 $self->check_size (1);
297 $self->update;
298} 395}
299 396
300sub children { 397sub children {
398 # nop
399}
400
401sub visible_children {
402 $_[0]->children
301} 403}
302 404
303sub set_max_size { 405sub set_max_size {
304 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
305 407
306 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
308} 412}
309 413
310sub set_tooltip { 414sub set_tooltip {
311 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
312 416
417 $tooltip =~ s/^\s+//;
418 $tooltip =~ s/\s+$//;
419
420 return if $self->{tooltip} eq $tooltip;
421
313 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
314 423
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
318 } 427 }
319} 428}
320 429
321# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
322sub coord2local { 431sub coord2local {
323 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
324 433
434 Carp::confess unless $self->{parent};#d#
435
325 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
326} 437}
327 438
328# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
329sub coord2global { 440sub coord2global {
330 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
331 442
443 Carp::confess unless $self->{parent};#d#
444
332 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
333} 446}
334 447
335sub focus_in { 448sub invoke_focus_in {
336 my ($self) = @_; 449 my ($self) = @_;
337 450
338 return if $FOCUS == $self; 451 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
340 453
341 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
342 455
343 $self->emit (focus_in => $focus); 456 $self->update;
344 457
345 $focus->update if $focus; 458 0
346 $FOCUS->update;
347} 459}
348 460
349sub focus_out { 461sub invoke_focus_out {
350 my ($self) = @_; 462 my ($self) = @_;
351 463
352 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
353 465
354 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
355 467
356 $self->emit (focus_out => $focus); 468 $self->update;
357 469
358 $focus->update if $focus; #? 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
359} 471 unless $FOCUS;
360 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
361sub mouse_motion { } 483sub invoke_mouse_motion { 0 }
362sub button_up { } 484sub invoke_button_up { 0 }
363sub key_down { } 485sub invoke_key_down { 0 }
364sub key_up { } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
365 488
366sub button_down { 489sub invoke_button_down {
367 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
368 491
369 $self->focus_in; 492 $self->grab_focus;
370}
371 493
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 494 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 495}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 496
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 497sub connect {
376sub 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
377 583
378sub draw { 584sub draw {
379 my ($self) = @_; 585 my ($self) = @_;
380 586
381 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);
382 596
383 glPushMatrix; 597 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 598 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387 599
388 if ($self == $HOVER && $self->{can_hover}) { 600 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2; 601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392 glEnable GL_BLEND; 602 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 604 glBegin GL_QUADS;
395 glVertex $x , $y;
396 glVertex $x + $self->{w}, $y;
397 glVertex $x + $self->{w}, $y + $self->{h};
398 glVertex $x , $y + $self->{h};
399 glEnd;
400 glDisable GL_BLEND;
401 }
402
403 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix;
405 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 605 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 606 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h}; 607 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h}; 608 glVertex 0 , $self->{h};
412 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;
413 glPopMatrix; 623 glPopMatrix;
414 #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;
415 } 625 }
626
627 $self->_draw;
628 glPopMatrix;
416} 629}
417 630
418sub _draw { 631sub _draw {
419 my ($self) = @_; 632 my ($self) = @_;
420 633
421 warn "no draw defined for $self\n"; 634 warn "no draw defined for $self\n";
422} 635}
423 636
424sub find_widget {
425 my ($self, $x, $y) = @_;
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435
436sub set_parent {
437 my ($self, $parent) = @_;
438
439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446}
447
448sub check_size {
449 my ($self, $forced) = @_;
450
451 $self->{force_alloc} = 1 if $forced;
452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
453}
454
455sub update {
456 my ($self) = @_;
457
458 $self->{parent}->update
459 if $self->{parent};
460}
461
462sub connect {
463 my ($self, $signal, $cb) = @_;
464
465 push @{ $self->{signal_cb}{$signal} }, $cb;
466}
467
468sub emit {
469 my ($self, $signal, @args) = @_;
470
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472}
473
474sub DESTROY { 637sub DESTROY {
475 my ($self) = @_; 638 my ($self) = @_;
476 639
640 return if CFClient::in_destruct;
641
477 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
478 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
479} 646}
480 647
481############################################################################# 648#############################################################################
482 649
483package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
508 675
509 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
511 678
512 glEnable GL_BLEND; 679 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 681 glColor_premultiply @$color;
515 682
516 glBegin GL_QUADS; 683 glBegin GL_QUADS;
517 glVertex 0 , 0; 684 glVertex 0 , 0;
518 glVertex 0 , $h; 685 glVertex 0 , $h;
519 glVertex $w, $h; 686 glVertex $w, $h;
… …
534 my ($class, %arg) = @_; 701 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 702 $class->SUPER::new (can_events => 0, %arg);
536} 703}
537 704
538sub size_request { 705sub size_request {
539 (0, 0) 706 my ($self) = @_;
707
708 ($self->{w} + 0, $self->{h} + 0)
540} 709}
541 710
542sub draw { } 711sub draw { }
543 712
544############################################################################# 713#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 717our @ISA = CFClient::UI::Base::;
549 718
550sub new { 719sub new {
551 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
552 721
553 my $children = delete $arg{children} || []; 722 my $children = delete $arg{children};
554 723
555 my $self = $class->SUPER::new ( 724 my $self = $class->SUPER::new (
556 children => [], 725 children => [],
557 can_events => 0, 726 can_events => 0,
558 %arg, 727 %arg,
559 ); 728 );
729
560 $self->add ($_) for @$children; 730 $self->add (@$children)
731 if $children;
561 732
562 $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;
563} 742}
564 743
565sub add { 744sub add {
566 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
567 746
… …
573 $self->{children} = [ 752 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 753 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 754 @{$self->{children}}, @widgets
576 ]; 755 ];
577 756
578 $self->check_size (1); 757 $self->realloc;
579 $self->update;
580} 758}
581 759
582sub children { 760sub children {
583 @{ $_[0]{children} } 761 @{ $_[0]{children} }
584} 762}
… …
589 delete $child->{parent}; 767 delete $child->{parent};
590 $child->hide; 768 $child->hide;
591 769
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 771
594 $self->check_size; 772 $self->realloc;
595 $self->update;
596} 773}
597 774
598sub clear { 775sub clear {
599 my ($self) = @_; 776 my ($self) = @_;
600 777
… …
604 for (@$children) { 781 for (@$children) {
605 delete $_->{parent}; 782 delete $_->{parent};
606 $_->hide; 783 $_->hide;
607 } 784 }
608 785
609 $self->check_size; 786 $self->realloc;
610 $self->update;
611} 787}
612 788
613sub find_widget { 789sub find_widget {
614 my ($self, $x, $y) = @_; 790 my ($self, $x, $y) = @_;
615 791
616 $x -= $self->{x}; 792 $x -= $self->{x};
617 $y -= $self->{y}; 793 $y -= $self->{y};
618 794
619 my $res; 795 my $res;
620 796
621 for (reverse @{ $self->{children} }) { 797 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 798 $res = $_->find_widget ($x, $y)
623 and return $res; 799 and return $res;
624 } 800 }
625 801
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 802 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
647} 823}
648 824
649sub add { 825sub add {
650 my ($self, $child) = @_; 826 my ($self, $child) = @_;
651 827
652 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
653
654 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
655} 830}
656 831
657sub remove { 832sub remove {
658 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
667 842
668sub size_request { 843sub size_request {
669 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
670} 845}
671 846
672sub size_allocate { 847sub invoke_size_allocate {
673 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
674 849
675 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
676} 853}
677 854
678############################################################################# 855#############################################################################
856
857# back-buffered drawing area
679 858
680package CFClient::UI::Window; 859package CFClient::UI::Window;
681 860
682our @ISA = CFClient::UI::Bin::; 861our @ISA = CFClient::UI::Bin::;
683 862
… …
694 873
695 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
696 $self->SUPER::update; 875 $self->SUPER::update;
697} 876}
698 877
699sub size_allocate { 878sub invoke_size_allocate {
700 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
701 880
702 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
704} 884}
705 885
706sub _render { 886sub _render {
887 my ($self) = @_;
888
707 $_[0]{children}[0]->draw; 889 $self->{children}[0]->draw;
708} 890}
709 891
710sub render_child { 892sub render_child {
711 my ($self) = @_; 893 my ($self) = @_;
712 894
713 $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 {
714 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
716 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
717 $self->_render; 906 $self->_render;
718 }; 907 };
719} 908}
720 909
721sub _draw { 910sub _draw {
722 my ($self) = @_; 911 my ($self) = @_;
723 912
724 my ($w, $h) = ($self->w, $self->h); 913 my ($w, $h) = @$self{qw(w h)};
725 914
726 my $tex = $self->{texture} 915 my $tex = $self->{texture}
727 or return; 916 or return;
728 917
729 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1; 920 glColor 0, 0, 0, 1;
732 921
733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
734 923
735 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
736} 925}
… …
739 928
740package CFClient::UI::ViewPort; 929package CFClient::UI::ViewPort;
741 930
742our @ISA = CFClient::UI::Window::; 931our @ISA = CFClient::UI::Window::;
743 932
933sub new {
934 my $class = shift;
935
936 $class->SUPER::new (
937 scroll_x => 0,
938 scroll_y => 1,
939 @_,
940 )
941}
942
744sub size_request { 943sub size_request {
745 my ($self) = @_; 944 my ($self) = @_;
746 945
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 946 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 947
750 @$self{qw(child_w child_h)} 948 $w = 10 if $self->{scroll_x};
751} 949 $h = 10 if $self->{scroll_y};
752 950
951 ($w, $h)
952}
953
753sub size_allocate { 954sub invoke_size_allocate {
754 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
755 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);
756 $self->update; 963 $self->update;
964
965 1
757} 966}
758 967
759sub set_offset { 968sub set_offset {
760 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
761 970
… …
794} 1003}
795 1004
796sub _render { 1005sub _render {
797 my ($self) = @_; 1006 my ($self) = @_;
798 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
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800 1012
801 $self->SUPER::_render; 1013 $self->SUPER::_render;
802} 1014}
803 1015
… …
806package CFClient::UI::ScrolledWindow; 1018package CFClient::UI::ScrolledWindow;
807 1019
808our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFClient::UI::HBox::;
809 1021
810sub new { 1022sub new {
811 my $class = shift; 1023 my ($class, %arg) = @_;
1024
1025 my $child = delete $arg{child};
812 1026
813 my $self; 1027 my $self;
814 1028
815 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFClient::UI::Slider
816 vertical => 1, 1030 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 1031 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 1032 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 1033 $self->{vp}->set_offset (0, $_[1]);
820 }, 1034 },
821 ; 1035 ;
822 1036
823 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
825 slider => $slider, 1040 slider => $slider,
826 @_, 1041 %arg,
827 ); 1042 );
828 1043
829 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
1045 $self->add ($child) if $child;
832 1046
833 $self 1047 $self
834} 1048}
835 1049
836#TODO# update range on size_allocate depending on child 1050#TODO# update range on size_allocate depending on child
837# 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}
838 1089
839############################################################################# 1090#############################################################################
840 1091
841package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
842 1093
… …
858 1109
859 if ($self->{bg}) { 1110 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
861 1112
862 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
864 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
865 1116
866 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
867 glVertex 0 , 0; 1118 glVertex 0 , 0;
868 glVertex 0 , $h; 1119 glVertex 0 , $h;
869 glVertex $w, $h; 1120 glVertex $w, $h;
… …
882 1133
883our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFClient::UI::Bin::;
884 1135
885use CFClient::OpenGL; 1136use CFClient::OpenGL;
886 1137
887my @tex = 1138my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1;
1141
1142my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890 1145
891sub new { 1146sub new {
892 my $class = shift; 1147 my ($class, %arg) = @_;
893
894 # TODO: user_x, user_y, overwrite moveto?
895 1148
896 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1152 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1153 can_events => 1,
902 @_ 1154 min_w => 64,
1155 min_h => 32,
1156 %arg,
903 ); 1157 );
904 1158
905 $self->{title} &&= new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
906 align => 0, 1160 align => 0,
907 valign => 1, 1161 valign => 1,
908 text => $self->{title}, 1162 text => $self->{title},
909 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 }
910 1174
911 $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};
912} 1184}
913 1185
914sub border { 1186sub border {
915 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
916} 1188}
917 1189
918sub size_request { 1190sub size_request {
919 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};
920 1198
921 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
922 1200
923 ( 1201 (
924 $w + $self->border * 2, 1202 $w + $self->border * 2,
925 $h + $self->border * 2, 1203 $h + $self->border * 2,
926 ) 1204 )
927} 1205}
928 1206
929sub size_allocate { 1207sub invoke_size_allocate {
930 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
931 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
932 $h -= List::Util::max 0, $self->border * 2; 1218 $h -= List::Util::max 0, $border * 2;
933 $w -= List::Util::max 0, $self->border * 2; 1219 $w -= List::Util::max 0, $border * 2;
934 1220
935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
936 if $self->{title};
937
938 $self->child->configure ($self->border, $self->border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
939}
940 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
941sub button_down { 1237sub invoke_button_down {
942 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
943 1239
944 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
945 my $border = $self->border; 1241 my $border = $self->border;
946 1242
… …
959 my ($ev, $x, $y) = @_; 1255 my ($ev, $x, $y) = @_;
960 1256
961 my $dx = $ev->{x} - $ox; 1257 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
963 1259
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1262
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size; 1264 $self->realloc;
968 }; 1265 };
969 1266
970 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1271 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
976 1273
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
978 1275
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update; 1277 # HACK: the next line is required to enforce placement
1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
981 }; 1279 };
1280 } else {
1281 return 0;
1282 }
1283
982 } 1284 1
983} 1285}
984 1286
985sub button_up { 1287sub invoke_button_up {
986 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
987 1289
988 delete $self->{motion}; 1290 ! ! delete $self->{motion}
989} 1291}
990 1292
991sub mouse_motion { 1293sub invoke_mouse_motion {
992 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
993 1295
994 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297
1298 ! ! $self->{motion}
995} 1299}
996 1300
997sub _draw { 1301sub _draw {
998 my ($self) = @_; 1302 my ($self) = @_;
999 1303
1304 my $child = $self->{children}[0];
1305
1000 my ($w, $h ) = ($self->{w}, $self->{h}); 1306 my ($w, $h ) = ($self->{w}, $self->{h});
1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1307 my ($cw, $ch) = ($child->{w}, $child->{h});
1002 1308
1003 glEnable GL_TEXTURE_2D; 1309 glEnable GL_TEXTURE_2D;
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1311
1006 my $border = $self->border; 1312 my $border = $self->border;
1007 1313
1008 glColor @{ $self->{border_bg} }; 1314 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1315 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1316 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1317 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1318 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1319
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1320 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1321 glColor @{ $self->{bg} };
1016 1322
1017 # TODO: repeat texture not scale 1323 # TODO: repeat texture not scale
1324 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1325 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1326 $bg->{t} = $ch / $bg->{h};
1020
1021 glColor @{ $self->{bg} };
1022
1023 $bg->{s} = $rep_x;
1024 $bg->{t} = $rep_y;
1025 $bg->{wrap_mode} = 1;
1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1327 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1328 }
1028 1329
1029 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1030 1331
1031 $self->{title}->draw if $self->{title};
1032
1033 $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};
1034} 1343}
1035 1344
1036############################################################################# 1345#############################################################################
1037 1346
1038package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1046sub new { 1355sub new {
1047 my $class = shift; 1356 my $class = shift;
1048 1357
1049 $class->SUPER::new ( 1358 $class->SUPER::new (
1050 col_expand => [], 1359 col_expand => [],
1051 @_ 1360 @_,
1052 ) 1361 )
1053}
1054
1055sub add {
1056 my ($self, $x, $y, $child) = @_;
1057
1058 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child;
1060
1061 $child->check_size;
1062} 1362}
1063 1363
1064sub children { 1364sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066} 1366}
1067 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
1068# 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?
1069sub clear { 1389sub clear {
1070 my ($self) = @_; 1390 my ($self) = @_;
1071 1391
1072 my @children = $self->children; 1392 my @children = $self->children;
1073 delete $self->{children}; 1393 delete $self->{children};
… …
1075 for (@children) { 1395 for (@children) {
1076 delete $_->{parent}; 1396 delete $_->{parent};
1077 $_->hide; 1397 $_->hide;
1078 } 1398 }
1079 1399
1080 $self->update; 1400 $self->realloc;
1081} 1401}
1082 1402
1083sub get_wh { 1403sub get_wh {
1084 my ($self) = @_; 1404 my ($self) = @_;
1085 1405
… …
1111 (sum @$ws), 1431 (sum @$ws),
1112 (sum @$hs), 1432 (sum @$hs),
1113 ) 1433 )
1114} 1434}
1115 1435
1116sub size_allocate { 1436sub invoke_size_allocate {
1117 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1118 1438
1119 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1120 1440
1121 my $req_w = sum @$ws; 1441 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1442 my $req_h = (sum @$hs) || 1;
1123 1443
1124 # TODO: nicer code && do row_expand 1444 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1445 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1446 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1447 my $col_expand = (sum @col_expand) || 1;
… …
1153 } 1473 }
1154 1474
1155 $y += $row_h; 1475 $y += $row_h;
1156 } 1476 }
1157 1477
1478 1
1158} 1479}
1159 1480
1160sub find_widget { 1481sub find_widget {
1161 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1162 1483
… …
1181 } 1502 }
1182} 1503}
1183 1504
1184############################################################################# 1505#############################################################################
1185 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
1186package CFClient::UI::HBox; 1567package CFClient::UI::HBox;
1187 1568
1188# TODO: wrap into common Box base class
1189
1190our @ISA = CFClient::UI::Container::; 1569our @ISA = CFClient::UI::Box::;
1191 1570
1192sub size_request { 1571sub new {
1193 my ($self) = @_; 1572 my $class = shift;
1194 1573
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1574 $class->SUPER::new (
1196 1575 vertical => 0,
1197 ( 1576 @_,
1198 (List::Util::sum map $_->[0], @alloc),
1199 (List::Util::max map $_->[1], @alloc),
1200 ) 1577 )
1201} 1578}
1202 1579
1203sub size_allocate {
1204 my ($self, $w, $h) = @_;
1205
1206 ($h, $w) = ($w, $h);
1207
1208 my $children = $self->{children};
1209
1210 my @h = map $_->{req_w}, @$children;
1211
1212 my $req_h = List::Util::sum @h;
1213
1214 if ($req_h > $h) {
1215 # ah well, not enough space
1216 $_ *= $h / $req_h for @h;
1217 } else {
1218 my $exp = List::Util::sum map $_->{expand}, @$children;
1219 $exp ||= 1;
1220
1221 for (0 .. $#$children) {
1222 my $child = $children->[$_];
1223
1224 my $alloc_h = $h[$_];
1225 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226 $h[$_] = $alloc_h;
1227 }
1228 }
1229
1230 CFClient::UI::harmonize \@h;
1231
1232 my $y = 0;
1233 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_];
1236 $child->configure ($y, 0, $h, $w);
1237
1238 $y += $h;
1239 }
1240
1241 1
1242}
1243
1244############################################################################# 1580#############################################################################
1245 1581
1246package CFClient::UI::VBox; 1582package CFClient::UI::VBox;
1247 1583
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1584our @ISA = CFClient::UI::Box::;
1251 1585
1252sub size_request { 1586sub new {
1253 my ($self) = @_; 1587 my $class = shift;
1254 1588
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1589 $class->SUPER::new (
1256 1590 vertical => 1,
1257 ( 1591 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1592 )
1261}
1262
1263sub size_allocate {
1264 my ($self, $w, $h) = @_;
1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268 my $children = $self->{children};
1269
1270 my @h = map $_->{req_h}, @$children;
1271
1272 my $req_h = List::Util::sum @h;
1273
1274 if ($req_h > $h) {
1275 # ah well, not enough space
1276 $_ *= $h / $req_h for @h;
1277 } else {
1278 my $exp = List::Util::sum map $_->{expand}, @$children;
1279 $exp ||= 1;
1280
1281 for (0 .. $#$children) {
1282 my $child = $children->[$_];
1283
1284 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285 }
1286 }
1287
1288 CFClient::UI::harmonize \@h;
1289
1290 my $y = 0;
1291 for (0 .. $#$children) {
1292 my $child = $children->[$_];
1293 my $h = $h[$_];
1294 $child->configure (0, $y, $w, $h);
1295
1296 $y += $h;
1297 }
1298
1299 1
1300} 1593}
1301 1594
1302############################################################################# 1595#############################################################################
1303 1596
1304package CFClient::UI::Label; 1597package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1614 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1615 layout => (new CFClient::Layout),
1323 fontsize => 1, 1616 fontsize => 1,
1324 align => -1, 1617 align => -1,
1325 valign => -1, 1618 valign => -1,
1326 padding => 2, 1619 padding_x => 2,
1620 padding_y => 2,
1327 can_events => 0, 1621 can_events => 0,
1328 %arg 1622 %arg
1329 ); 1623 );
1330 1624
1331 if (exists $self->{template}) { 1625 if (exists $self->{template}) {
… …
1341 } 1635 }
1342 1636
1343 $self 1637 $self
1344} 1638}
1345 1639
1346sub escape($) {
1347 local $_ = $_[0];
1348
1349 s/&/&amp;/g;
1350 s/>/&gt;/g;
1351 s/</&lt;/g;
1352
1353 $_
1354}
1355
1356sub update { 1640sub update {
1357 my ($self) = @_; 1641 my ($self) = @_;
1358 1642
1359 delete $self->{texture}; 1643 delete $self->{texture};
1360 $self->SUPER::update; 1644 $self->SUPER::update;
1361} 1645}
1362 1646
1647sub realloc {
1648 my ($self) = @_;
1649
1650 delete $self->{ox};
1651 $self->SUPER::realloc;
1652}
1653
1363sub set_text { 1654sub set_text {
1364 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1365 1656
1366 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1368 1659
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1371 1661
1662 delete $self->{size_req};
1663 $self->realloc;
1372 $self->update; 1664 $self->update;
1373 $self->check_size;
1374} 1665}
1375 1666
1376sub set_markup { 1667sub set_markup {
1377 my ($self, $markup) = @_; 1668 my ($self, $markup) = @_;
1378 1669
1379 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1380 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1381 1672
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1674
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1386 1676
1677 delete $self->{size_req};
1678 $self->realloc;
1387 $self->update; 1679 $self->update;
1388 $self->check_size;
1389} 1680}
1390 1681
1391sub size_request { 1682sub size_request {
1392 my ($self) = @_; 1683 my ($self) = @_;
1393 1684
1685 $self->{size_req} ||= do {
1394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1395 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1399 1691
1400 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1401 1693
1402 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1403 $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);
1404 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1405 1698
1406 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1407 1700
1408 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1703 }
1704
1705 [$w, $h]
1410 } 1706 };
1411 1707
1412 ( 1708 @{ $self->{size_req} }
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1709}
1417 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1418sub size_allocate { 1715sub invoke_size_allocate {
1419 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1420 1717
1718 delete $self->{ox};
1719
1421 delete $self->{texture}; 1720 delete $self->{texture}
1721 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1722
1723 1
1422} 1724}
1423 1725
1424sub set_fontsize { 1726sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1426 1728
1427 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1428 delete $self->{texture}; 1731 delete $self->{texture};
1429 1732
1430 $self->update; 1733 $self->realloc;
1431 $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;
1432} 1743}
1433 1744
1434sub _draw { 1745sub _draw {
1435 my ($self) = @_; 1746 my ($self) = @_;
1436 1747
1437 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1438 1749
1439 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1440 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1441 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1442 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1757
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1758 [$self->{layout}->size]
1448
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1451 : ($self->{w} - $tex->{w}) * 0.5);
1452
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1455 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1458 }; 1759 };
1459 1760
1460 glEnable GL_TEXTURE_2D; 1761 unless (exists $self->{ox}) {
1461 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);
1462 1765
1463 if ($tex->{format} == GL_ALPHA) { 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1464 glColor @{$self->{fg}}; 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1465 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1768 : ($self->{h} - $size->[1]) * 0.5);
1466 } else {
1467 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1468 } 1769 };
1469 1770
1470 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});
1471} 1775}
1472 1776
1473############################################################################# 1777#############################################################################
1474 1778
1475package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1488 active_fg => [0, 0, 0], 1792 active_fg => [0, 0, 0],
1489 can_hover => 1, 1793 can_hover => 1,
1490 can_focus => 1, 1794 can_focus => 1,
1491 valign => 0, 1795 valign => 0,
1492 can_events => 1, 1796 can_events => 1,
1797 #text => ...
1798 #hidden => "*",
1493 @_ 1799 @_
1494 ) 1800 )
1495} 1801}
1496 1802
1497sub _set_text { 1803sub _set_text {
… …
1499 1805
1500 delete $self->{cur_h}; 1806 delete $self->{cur_h};
1501 1807
1502 return if $self->{text} eq $text; 1808 return if $self->{text} eq $text;
1503 1809
1504 delete $self->{texture};
1505
1506 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1507 $self->{text} = $text; 1811 $self->{text} = $text;
1508 1812
1509 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1815 delete $self->{size_req};
1511 1816
1512 $self->emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1818
1819 $self->realloc;
1820 $self->update;
1513} 1821}
1514 1822
1515sub set_text { 1823sub set_text {
1516 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1517 1825
1518 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1827 $self->_set_text ($text);
1520 $self->update;
1521 $self->check_size;
1522} 1828}
1523 1829
1524sub get_text { 1830sub get_text {
1525 $_[0]{text} 1831 $_[0]{text}
1526} 1832}
… …
1531 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1532 1838
1533 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1534} 1840}
1535 1841
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540}
1541
1542sub key_down { 1842sub invoke_key_down {
1543 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1544 1844
1545 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1546 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1547 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1562 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1864 $self->emit ('escape');
1565 } elsif ($uni) { 1865 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else {
1868 return 0;
1567 } 1869 }
1568 1870
1569 $self->_set_text ($text); 1871 $self->_set_text ($text);
1570 $self->update;
1571 $self->check_size;
1572}
1573 1872
1873 $self->realloc;
1874
1875 1
1876}
1877
1574sub focus_in { 1878sub invoke_focus_in {
1575 my ($self) = @_; 1879 my ($self) = @_;
1576 1880
1577 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1578 1882
1579 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1580} 1884}
1581 1885
1582sub button_down { 1886sub invoke_button_down {
1583 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1584 1888
1585 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1586 1890
1587 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1588 1892
1589 # byte-index to char-index 1893 # byte-index to char-index
1590 my $text = $self->{text}; 1894 my $text = $self->{text};
1591 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1592 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1593 1897
1594 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1595 $self->update; 1899 $self->update;
1900
1901 1
1596} 1902}
1597 1903
1598sub mouse_motion { 1904sub invoke_mouse_motion {
1599 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1600# 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
1601} 1909}
1602 1910
1603sub _draw { 1911sub _draw {
1604 my ($self) = @_; 1912 my ($self) = @_;
1605 1913
1606 local $self->{fg} = $self->{fg}; 1914 local $self->{fg} = $self->{fg};
1607 1915
1608 if ($FOCUS == $self) { 1916 if ($FOCUS == $self) {
1609 glColor @{$self->{active_bg}}; 1917 glColor_premultiply @{$self->{active_bg}};
1610 $self->{fg} = $self->{active_fg}; 1918 $self->{fg} = $self->{active_fg};
1611 } else { 1919 } else {
1612 glColor @{$self->{bg}}; 1920 glColor_premultiply @{$self->{bg}};
1613 } 1921 }
1614 1922
1615 glEnable GL_BLEND; 1923 glEnable GL_BLEND;
1616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1924 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1617 glBegin GL_QUADS; 1925 glBegin GL_QUADS;
1618 glVertex 0 , 0; 1926 glVertex 0 , 0;
1619 glVertex 0 , $self->{h}; 1927 glVertex 0 , $self->{h};
1620 glVertex $self->{w}, $self->{h}; 1928 glVertex $self->{w}, $self->{h};
1621 glVertex $self->{w}, 0; 1929 glVertex $self->{w}, 0;
… …
1646 1954
1647our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1648 1956
1649use CFClient::OpenGL; 1957use CFClient::OpenGL;
1650 1958
1651sub key_down { 1959sub invoke_key_down {
1652 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1653 1961
1654 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1655 1963
1656 if ($sym == 13) { 1964 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1659 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1970 $self->emit (activate => $txt);
1662 $self->update; 1971 $self->update;
1663 1972
… …
1682 } else { 1991 } else {
1683 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1684 } 1993 }
1685 1994
1686 } else { 1995 } else {
1687 $self->SUPER::key_down ($ev); 1996 return $self->SUPER::invoke_key_down ($ev)
1997 }
1998
1688 } 1999 1
1689
1690} 2000}
1691 2001
1692############################################################################# 2002#############################################################################
1693 2003
1694package CFClient::UI::Button; 2004package CFClient::UI::Button;
… …
1703 2013
1704sub new { 2014sub new {
1705 my $class = shift; 2015 my $class = shift;
1706 2016
1707 $class->SUPER::new ( 2017 $class->SUPER::new (
1708 padding => 4, 2018 padding_x => 4,
2019 padding_y => 4,
1709 fg => [1, 1, 1], 2020 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 2021 active_fg => [0, 0, 1],
1711 can_hover => 1, 2022 can_hover => 1,
1712 align => 0, 2023 align => 0,
1713 valign => 0, 2024 valign => 0,
1714 can_events => 1, 2025 can_events => 1,
1715 @_ 2026 @_
1716 ) 2027 )
1717} 2028}
1718 2029
1719sub button_up { 2030sub invoke_button_up {
1720 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1721 2032
2033 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 2035 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate"); 2036
1725 } 2037 1
1726} 2038}
1727 2039
1728sub _draw { 2040sub _draw {
1729 my ($self) = @_; 2041 my ($self) = @_;
1730 2042
1731 local $self->{fg} = $self->{fg}; 2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1732
1733 if ($GRAB == $self) {
1734 $self->{fg} = $self->{active_fg};
1735 }
1736 2044
1737 glEnable GL_TEXTURE_2D; 2045 glEnable GL_TEXTURE_2D;
1738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1739 glColor 0, 0, 0, 1; 2047 glColor 0, 0, 0, 1;
1740 2048
… …
1759 2067
1760sub new { 2068sub new {
1761 my $class = shift; 2069 my $class = shift;
1762 2070
1763 $class->SUPER::new ( 2071 $class->SUPER::new (
1764 padding => 2, 2072 padding_x => 2,
2073 padding_y => 2,
1765 fg => [1, 1, 1], 2074 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 2075 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 2076 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 2077 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 2078 state => 0,
… …
1773} 2082}
1774 2083
1775sub size_request { 2084sub size_request {
1776 my ($self) = @_; 2085 my ($self) = @_;
1777 2086
1778 ($self->{padding} * 2 + 6) x 2 2087 (6) x 2
1779} 2088}
1780 2089
2090sub toggle {
2091 my ($self) = @_;
2092
2093 $self->{state} = !$self->{state};
2094 $self->emit (changed => $self->{state});
2095 $self->update;
2096}
2097
1781sub button_down { 2098sub invoke_button_down {
1782 my ($self, $ev, $x, $y) = @_; 2099 my ($self, $ev, $x, $y) = @_;
1783 2100
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2101 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2102 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 2103 $self->toggle;
1787 $self->emit (changed => $self->{state}); 2104 } else {
2105 return 0
2106 }
2107
1788 } 2108 1
1789} 2109}
1790 2110
1791sub _draw { 2111sub _draw {
1792 my ($self) = @_; 2112 my ($self) = @_;
1793 2113
1794 $self->SUPER::_draw; 2114 $self->SUPER::_draw;
1795 2115
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2116 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 2117
1798 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;
1799 2121
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2122 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 2123
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2124 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 2125
… …
1811package CFClient::UI::Image; 2133package CFClient::UI::Image;
1812 2134
1813our @ISA = CFClient::UI::Base::; 2135our @ISA = CFClient::UI::Base::;
1814 2136
1815use CFClient::OpenGL; 2137use CFClient::OpenGL;
1816use Carp qw/confess/;
1817 2138
1818our %loaded_images; 2139our %texture_cache;
1819 2140
1820sub new { 2141sub new {
1821 my $class = shift; 2142 my $class = shift;
1822 2143
1823 my $self = $class->SUPER::new (can_events => 0, @_); 2144 my $self = $class->SUPER::new (
2145 can_events => 0,
2146 @_,
2147 );
1824 2148
1825 $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";
1826 2151
1827 $loaded_images{$self->{image}} ||= 2152 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1828 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;
1829 2154
1830 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2155 Scalar::Util::weaken $texture_cache{$self->{path}};
1831 2156
1832 Scalar::Util::weaken $loaded_images{$self->{image}}; 2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1833
1834 $self->{aspect} = $tex->{w} / $tex->{h};
1835 2158
1836 $self 2159 $self
1837} 2160}
1838 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
1839sub size_request { 2177sub size_request {
1840 my ($self) = @_; 2178 my ($self) = @_;
1841 2179
1842 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
1843} 2181}
1844 2182
1845sub _draw { 2183sub _draw {
1846 my ($self) = @_; 2184 my ($self) = @_;
1847 2185
… …
1857 } 2195 }
1858 2196
1859 glEnable GL_TEXTURE_2D; 2197 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 2199
1862 $tex->draw_quad_alpha (0, 0, $w, $h); 2200 $tex->draw_quad (0, 0, $w, $h);
1863 2201
1864 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
1865} 2239}
1866 2240
1867############################################################################# 2241#############################################################################
1868 2242
1869package CFClient::UI::VGauge; 2243package CFClient::UI::VGauge;
… …
1956 my $ycut1 = max 0, min 1, $ycut; 2330 my $ycut1 = max 0, min 1, $ycut;
1957 my $ycut2 = max 0, min 1, $ycut - 1; 2331 my $ycut2 = max 0, min 1, $ycut - 1;
1958 2332
1959 my $h1 = $self->{h} * (1 - $ycut1); 2333 my $h1 = $self->{h} * (1 - $ycut1);
1960 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);
1961 2338
1962 glEnable GL_BLEND; 2339 glEnable GL_BLEND;
1963 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;
1964 glEnable GL_TEXTURE_2D; 2342 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2343 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966 2344
1967 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2345 glBindTexture GL_TEXTURE_2D, $t1->{name};
1968 glBegin GL_QUADS; 2346 glBegin GL_QUADS;
… …
1983 2361
1984 if ($t3) { 2362 if ($t3) {
1985 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2363 glBindTexture GL_TEXTURE_2D, $t3->{name};
1986 glBegin GL_QUADS; 2364 glBegin GL_QUADS;
1987 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2365 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1988 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2366 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1989 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2367 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1990 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2368 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1991 glEnd; 2369 glEnd;
1992 } 2370 }
1993 2371
1994 glDisable GL_BLEND; 2372 glDisable GL_BLEND;
… …
2067 my $self = $class->SUPER::new ( 2445 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2446 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2447 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2448 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2449 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2450 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2451 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2452 min_h => $::WIDTH / 80,
2075 vertical => 0, 2453 vertical => 0,
2076 can_hover => 1, 2454 can_hover => 1,
2077 inner_pad => 0.02, 2455 inner_pad => 0.02,
2078 @_ 2456 @_
2079 ); 2457 );
… …
2082 $self->update; 2460 $self->update;
2083 2461
2084 $self 2462 $self
2085} 2463}
2086 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
2087sub set_value { 2476sub set_value {
2088 my ($self, $value) = @_; 2477 my ($self, $value) = @_;
2089 2478
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2479 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2480
2092 $hi = $lo + 1 if $hi <= $lo; 2481 $hi = $lo + 1 if $hi <= $lo;
2093 2482
2483 $page = $hi - $lo if $page > $hi - $lo;
2484
2094 $value = $lo if $value < $lo; 2485 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2486 $value = $hi - $page if $value > $hi - $page;
2096 2487
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2488 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2489 if $unit;
2099
2100 $page = $hi - $lo if $page > $hi - $lo;
2101 2490
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2491 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2492
2104 if ($value != $old_value) { 2493 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2494 $self->emit (changed => $value);
… …
2108} 2497}
2109 2498
2110sub size_request { 2499sub size_request {
2111 my ($self) = @_; 2500 my ($self) = @_;
2112 2501
2113 my $w = $self->{req_w}; 2502 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2503}
2118 2504
2119sub button_down { 2505sub invoke_button_down {
2120 my ($self, $ev, $x, $y) = @_; 2506 my ($self, $ev, $x, $y) = @_;
2121 2507
2122 $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
2123 $self->mouse_motion ($ev, $x, $y); 2512 $self->invoke_mouse_motion ($ev, $x, $y)
2124} 2513}
2125 2514
2126sub mouse_motion { 2515sub invoke_mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
2128 2517
2129 if ($GRAB == $self) { 2518 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2519 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2520
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2521 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2522
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2523 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2524
2136 $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
2137 } 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
2138} 2541}
2139 2542
2140sub update { 2543sub update {
2141 my ($self) = @_; 2544 my ($self) = @_;
2142 2545
2143 $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}) {
2144 $self->set_value ($self->{range}[0]); 2554 $self->set_value ($self->{range}[0]);
2145 2555
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2556 my ($value, $lo, $hi, $page) = @{$self->{range}};
2557 my $range = ($hi - $page - $lo) || 1e-100;
2147 2558
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2559 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2560
2150 $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;
2151 2563
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2564 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2565 $value = $value * $self->{scale} + $self->{offset};
2154 2566
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2567 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2568 $self->{knob_w} = $knob_w;
2162 }); 2569 }
2163
2164 $self->SUPER::update;
2165}
2166
2167sub _draw {
2168 my ($self) = @_;
2169 2570
2170 $self->SUPER::_draw (); 2571 $self->SUPER::_draw ();
2171 2572
2172 glScale $self->{w}, $self->{h}; 2573 glScale $self->{w}, $self->{h};
2173 2574
… …
2193 glDisable GL_TEXTURE_2D; 2594 glDisable GL_TEXTURE_2D;
2194} 2595}
2195 2596
2196############################################################################# 2597#############################################################################
2197 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
2198package CFClient::UI::TextView; 2640package CFClient::UI::TextScroller;
2199 2641
2200our @ISA = CFClient::UI::HBox::; 2642our @ISA = CFClient::UI::HBox::;
2201 2643
2202use CFClient::OpenGL; 2644use CFClient::OpenGL;
2203 2645
2204sub new { 2646sub new {
2205 my $class = shift; 2647 my $class = shift;
2206 2648
2207 my $self = $class->SUPER::new ( 2649 my $self = $class->SUPER::new (
2208 fontsize => 1, 2650 fontsize => 1,
2209 can_events => 0, 2651 can_events => 1,
2652 indent => 0,
2210 #font => default_font 2653 #font => default_font
2211 @_, 2654 @_,
2212 2655
2213 layout => (new CFClient::Layout 1), 2656 layout => (new CFClient::Layout),
2214 par => [], 2657 par => [],
2215 height => 0, 2658 height => 0,
2216 children => [ 2659 children => [
2217 (new CFClient::UI::Empty expand => 1), 2660 (new CFClient::UI::Empty expand => 1),
2218 (new CFClient::UI::Slider vertical => 1), 2661 (new CFClient::UI::Slider vertical => 1),
… …
2229 2672
2230 $self->{fontsize} = $fontsize; 2673 $self->{fontsize} = $fontsize;
2231 $self->reflow; 2674 $self->reflow;
2232} 2675}
2233 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
2234sub size_allocate { 2686sub invoke_size_allocate {
2235 my ($self, $w, $h) = @_; 2687 my ($self, $w, $h) = @_;
2236 2688
2237 $self->SUPER::size_allocate ($w, $h); 2689 my ($empty, $slider, @other) = @{ $self->{children} };
2690 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2238 2691
2239 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2692 $self->{layout}->set_font ($self->{font}) if $self->{font};
2240 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2241 $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});
2242 2696
2243 $self->reflow; 2697 $self->reflow;
2244}
2245 2698
2246sub text_height { 2699 local $self->{children} = [$empty, $slider];
2700 $self->SUPER::invoke_size_allocate ($w, $h)
2701}
2702
2703sub invoke_mouse_wheel {
2247 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) = @_;
2248 2715
2249 my $layout = $self->{layout}; 2716 my $layout = $self->{layout};
2250 2717
2718 $layout->set_font ($self->{font}) if $self->{font};
2719 $layout->set_foreground (@{$para->{fg}});
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2720 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $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});
2253 $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}}
2254 2729 );
2255 ($layout->size)[1] 2730
2731 $layout
2256} 2732}
2257 2733
2258sub reflow { 2734sub reflow {
2259 my ($self) = @_; 2735 my ($self) = @_;
2260 2736
2261 $self->{need_reflow}++; 2737 $self->{need_reflow}++;
2262 $self->update; 2738 $self->update;
2263} 2739}
2264 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
2265sub add_paragraph { 2759sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2760 my ($self, $color, $para, $indent) = @_;
2267 2761
2268 #TODO: intelligently "reformat" paragraph 2762 my ($text, @w) = ref $para ? @$para : $para;
2269 2763
2270 for my $line (split /\n/, $text) { 2764 $para = {
2271 my $height = $self->text_height ($line); 2765 w => 1e10,
2272 $self->{height} += $height; 2766 wrapped => 1,
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2274 } 2771 };
2275 2772
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2773 $self->add (@w) if @w;
2277 $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;
2278} 2785}
2279 2786
2280sub update { 2787sub update {
2281 my ($self) = @_; 2788 my ($self) = @_;
2282 2789
… …
2284 2791
2285 return unless $self->{h} > 0; 2792 return unless $self->{h} > 0;
2286 2793
2287 delete $self->{texture}; 2794 delete $self->{texture};
2288 2795
2289 $ROOT->on_post_alloc ($self, sub { 2796 $ROOT->on_post_alloc ($self => sub {
2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798
2290 if (delete $self->{need_reflow}) { 2799 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2800 my $height = 0;
2292 2801
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2294 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 }
2295 2814
2296 $self->{height} = $height; 2815 $self->{height} = $height;
2297 2816
2298 $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]);
2299 $self->{children}[1]->update; 2818
2300
2301 delete $self->{texture}; 2819 delete $self->{texture};
2302 } 2820 }
2303 2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2824 }
2825
2304 $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 {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2827 glClearColor 0, 0, 0, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2828 glClear GL_COLOR_BUFFER_BIT;
2307 2829
2308 my $top = int $self->{children}[1]{range}[0]; 2830 my $top = int $self->{children}[1]{range}[0];
2309 2831
2310 my $y0 = $top; 2832 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2833 my $y1 = $top + $H;
2312 2834
2313 my $y = 0; 2835 my $y = 0;
2314 2836
2315 my $layout = $self->{layout};
2316
2317 $layout->set_font ($self->{font}) if $self->{font};
2318
2319 glEnable GL_BLEND;
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321
2322 for my $par (@{$self->{par}}) { 2837 for my $para (@{$self->{par}}) {
2323 my $h = $par->[0]; 2838 my $h = $para->{h};
2324 2839
2325 if ($y0 < $y + $h && $y < $y1) { 2840 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] });
2327 $layout->set_width ($self->{w} - $par->[2]);
2328 $layout->set_markup ($par->[3]);
2329 2841
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2842 my $layout = $self->get_layout ($para);
2331 2843
2332 glRasterPos $par->[2], $y - $y0; 2844 $layout->render ($para->{indent}, $y - $y0);
2333 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 }
2334 } 2858 }
2335 2859
2336 $y += $h; 2860 $y += $h;
2337 } 2861 }
2338
2339 glDisable GL_BLEND;
2340 }; 2862 };
2341 }); 2863 });
2342} 2864}
2343 2865
2866sub reconfigure {
2867 my ($self) = @_;
2868
2869 $self->SUPER::reconfigure;
2870
2871 $_->{w} = 1e10 for @{ $self->{par} };
2872 $self->reflow;
2873}
2874
2344sub _draw { 2875sub _draw {
2345 my ($self) = @_; 2876 my ($self) = @_;
2346 2877
2347 glEnable GL_TEXTURE_2D; 2878 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1; 2880 glColor 0, 0, 0, 1;
2350 $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});
2351 glDisable GL_TEXTURE_2D; 2882 glDisable GL_TEXTURE_2D;
2352 2883
2353 $self->{children}[1]->draw; 2884 $self->{children}[1]->draw;
2354
2355} 2885}
2356 2886
2357############################################################################# 2887#############################################################################
2358 2888
2359package CFClient::UI::Animator; 2889package CFClient::UI::Animator;
… …
2404 2934
2405sub new { 2935sub new {
2406 my $class = shift; 2936 my $class = shift;
2407 2937
2408 my $self = $class->SUPER::new ( 2938 my $self = $class->SUPER::new (
2409 state => 0, 2939 state => 0,
2410 connect_activate => \&toggle_flopper, 2940 on_activate => \&toggle_flopper,
2411 @_ 2941 @_
2412 ); 2942 );
2413 2943
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2944 $self
2420} 2945}
2421 2946
2422sub toggle_flopper { 2947sub toggle_flopper {
2423 my ($self) = @_; 2948 my ($self) = @_;
2424 2949
2425 # TODO: use animation 2950 $self->{other}->toggle_visibility;
2426 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open");
2430 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close");
2433 }
2434
2435 $self->emit (changed => $self->{state});
2436} 2951}
2437 2952
2438############################################################################# 2953#############################################################################
2439 2954
2440package CFClient::UI::Tooltip; 2955package CFClient::UI::Tooltip;
… …
2453} 2968}
2454 2969
2455sub set_tooltip_from { 2970sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2971 my ($self, $widget) = @_;
2457 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
2458 $self->add (new CFClient::UI::Label 2985 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2986 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2988 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2989 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2990 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2991 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2471 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2998 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2472 2999
2473 ($w + 4, $h + 4) 3000 ($w + 4, $h + 4)
2474} 3001}
2475 3002
2476sub size_allocate { 3003sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 3004 my ($self, $w, $h) = @_;
2478 3005
2479 $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 });
2480} 3029}
2481 3030
2482sub _draw { 3031sub _draw {
2483 my ($self) = @_; 3032 my ($self) = @_;
2484 3033
… …
2501 glVertex $w, $h; 3050 glVertex $w, $h;
2502 glVertex $w, 0; 3051 glVertex $w, 0;
2503 glEnd; 3052 glEnd;
2504 3053
2505 glTranslate 2 - 0.375, 2 - 0.375; 3054 glTranslate 2 - 0.375, 2 - 0.375;
3055
2506 $self->SUPER::_draw; 3056 $self->SUPER::_draw;
2507} 3057}
2508 3058
2509############################################################################# 3059#############################################################################
2510 3060
2511package CFClient::UI::Face; 3061package CFClient::UI::Face;
2512 3062
2513our @ISA = CFClient::UI::Base::; 3063our @ISA = CFClient::UI::DrawBG::;
2514 3064
2515use CFClient::OpenGL; 3065use CFClient::OpenGL;
2516 3066
2517sub new { 3067sub new {
2518 my $class = shift; 3068 my $class = shift;
2519 3069
2520 my $self = $class->SUPER::new ( 3070 my $self = $class->SUPER::new (
2521 aspect => 1, 3071 aspect => 1,
3072 can_events => 0,
2522 @_, 3073 @_,
2523 ); 3074 );
2524 3075
2525 if ($self->{anim} && $self->{animspeed}) { 3076 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 3077 Scalar::Util::weaken (my $widget = $self);
… …
2552} 3103}
2553 3104
2554sub _draw { 3105sub _draw {
2555 my ($self) = @_; 3106 my ($self) = @_;
2556 3107
2557 return unless $::CONN;#d# manage and cache textures differently 3108 return unless $::CONN;
3109
3110 $self->SUPER::_draw;
2558 3111
2559 my $face; 3112 my $face;
2560 3113
2561 if ($self->{frame}) { 3114 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 3115 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2568 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3121 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2569 3122
2570 if ($tex) { 3123 if ($tex) {
2571 glEnable GL_TEXTURE_2D; 3124 glEnable GL_TEXTURE_2D;
2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3125 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573 glColor 1, 1, 1, 1; 3126 glColor 0, 0, 0, 1;
2574 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3127 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2575 glDisable GL_TEXTURE_2D; 3128 glDisable GL_TEXTURE_2D;
2576 } 3129 }
2577} 3130}
2578 3131
2579sub DESTROY { 3132sub destroy {
2580 my ($self) = @_; 3133 my ($self) = @_;
2581 3134
2582 $self->{timer}->cancel 3135 $self->{timer}->cancel
2583 if $self->{timer}; 3136 if $self->{timer};
2584 3137
2585 $self->SUPER::DESTROY; 3138 $self->SUPER::destroy;
2586} 3139}
2587 3140
2588############################################################################# 3141#############################################################################
2589 3142
2590package CFClient::UI::InventoryItem; 3143package CFClient::UI::Buttonbar;
2591 3144
2592our @ISA = CFClient::UI::HBox::; 3145our @ISA = CFClient::UI::HBox::;
2593 3146
2594sub _item_to_desc { 3147# TODO: should actualyl wrap buttons and other goodies.
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619
2620sub new {
2621 my $class = shift;
2622
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new (
2630 can_hover => 1,
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 1) {
2647 $::CONN->send ("examine $item->{tag}");
2648 } elsif ($ev->{button} == 2) {
2649 $::CONN->send ("apply $item->{tag}");
2650 } elsif ($ev->{button} == 3) {
2651 my @menu_items = (
2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663 )
2664 ),
2665 );
2666
2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2668 }
2669
2670 1
2671 },
2672 %args
2673 );
2674
2675
2676 $self->add (new CFClient::UI::Face
2677 can_events => 0,
2678 face => $item->{face},
2679 anim => $item->{anim},
2680 animspeed => $item->{animspeed},
2681 );
2682
2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2684
2685 $self->{item} = $item;
2686
2687 $self->update_item;
2688
2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2698}
2699
2700#############################################################################
2701
2702package CFClient::UI::Inventory;
2703
2704our @ISA = CFClient::UI::ScrolledWindow::;
2705
2706sub new {
2707 my $class = shift;
2708
2709 my $self = $class->SUPER::new (
2710 scrolled => (new CFClient::UI::Table),
2711 @_,
2712 );
2713
2714 $self
2715}
2716
2717sub set_items {
2718 my ($self, $items) = @_;
2719
2720 $self->{scrolled}->clear;
2721 return unless $items;
2722
2723 my @items = sort {
2724 ($a->{type} <=> $b->{type})
2725 or ($a->{name} cmp $b->{name})
2726 } @$items;
2727
2728 $self->{real_items} = \@items;
2729
2730 for my $item (@items) {
2731 $item->{item} = $item;
2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2734 }
2735
2736 my $i = 0;
2737 for (@items) {
2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741 }
2742
2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2744}
2745
2746sub size_request {
2747 my ($self) = @_;
2748 ($self->{req_w}, $self->{req_h});
2749}
2750 3148
2751############################################################################# 3149#############################################################################
2752 3150
2753package CFClient::UI::Menu; 3151package CFClient::UI::Menu;
2754 3152
… …
2766 ); 3164 );
2767 3165
2768 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3166 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2769 3167
2770 for my $item (@{ $self->{items} }) { 3168 for my $item (@{ $self->{items} }) {
2771 my ($widget, $cb) = @$item; 3169 my ($widget, $cb, $tooltip) = @$item;
2772 3170
2773 # handle various types of items, only text for now 3171 # handle various types of items, only text for now
2774 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 {
2775 $widget = new CFClient::UI::Label 3187 $widget = new CFClient::UI::Label
2776 can_hover => 1, 3188 can_hover => 1,
2777 can_events => 1, 3189 can_events => 1,
2778 text => $widget; 3190 markup => $widget,
3191 tooltip => $tooltip;
3192 }
2779 } 3193 }
2780 3194
2781 $self->{item}{$widget} = $item; 3195 $self->{item}{$widget} = $item;
2782 3196
2783 $self->{vbox}->add ($widget); 3197 $self->{vbox}->add ($widget);
… …
2795 # maybe save $GRAB? must be careful about events... 3209 # maybe save $GRAB? must be careful about events...
2796 $GRAB = $self; 3210 $GRAB = $self;
2797 $self->{button} = $ev->{button}; 3211 $self->{button} = $ev->{button};
2798 3212
2799 $self->show; 3213 $self->show;
2800 $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);
2801} 3215}
2802 3216
2803sub mouse_motion { 3217sub invoke_mouse_motion {
2804 my ($self, $ev, $x, $y) = @_; 3218 my ($self, $ev, $x, $y) = @_;
2805 3219
2806 # TODO: should use vbox->find_widget or so 3220 # TODO: should use vbox->find_widget or so
2807 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3221 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2808 $self->{hover} = $self->{item}{$HOVER}; 3222 $self->{hover} = $self->{item}{$HOVER};
2809}
2810 3223
3224 0
3225}
3226
2811sub button_up { 3227sub invoke_button_up {
2812 my ($self, $ev, $x, $y) = @_; 3228 my ($self, $ev, $x, $y) = @_;
2813 3229
2814 if ($ev->{button} == $self->{button}) { 3230 if ($ev->{button} == $self->{button}) {
2815 undef $GRAB; 3231 undef $GRAB;
2816 $self->hide; 3232 $self->hide;
2817 3233
2818 $self->emit ("popdown"); 3234 $self->emit ("popdown");
2819 $self->{hover}[1]->() if $self->{hover}; 3235 $self->{hover}[1]->() if $self->{hover};
3236 } else {
3237 return 0
3238 }
3239
2820 } 3240 1
2821} 3241}
2822 3242
2823############################################################################# 3243#############################################################################
2824 3244
2825package CFClient::UI::Statusbox; 3245package CFClient::UI::Multiplexer;
2826 3246
2827our @ISA = CFClient::UI::VBox::; 3247our @ISA = CFClient::UI::Container::;
2828 3248
2829sub new { 3249sub new {
2830 my $class = shift; 3250 my $class = shift;
2831 3251
2832 $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 (
2833 fontsize => 0.8, 3431 fontsize => 0.8,
2834 @_, 3432 @_,
2835 ) 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
2836} 3440}
2837 3441
2838sub reorder { 3442sub reorder {
2839 my ($self) = @_; 3443 my ($self) = @_;
2840 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} };
2841 3450
2842 while (my ($k, $v) = each %{ $self->{item} }) { 3451 while (my ($k, $v) = each %{ $self->{item} }) {
2843 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3452 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2844 } 3453 }
2845 3454
… …
2848 my @items = sort { 3457 my @items = sort {
2849 $a->{pri} <=> $b->{pri} 3458 $a->{pri} <=> $b->{pri}
2850 or $b->{id} <=> $a->{id} 3459 or $b->{id} <=> $a->{id}
2851 } values %{ $self->{item} }; 3460 } values %{ $self->{item} };
2852 3461
3462 $self->{timer}->interval (1);
3463
2853 my $count = 10 + 1; 3464 my $count = 10 + 1;
2854 for my $item (@items) { 3465 for my $item (@items) {
2855 last unless --$count; 3466 last unless --$count;
2856 3467
2857 push @widgets, $item->{label} ||= do { 3468 my $label = $item->{label} ||= do {
2858 # TODO: doesn't handle markup well (read as: at all) 3469 # TODO: doesn't handle markup well (read as: at all)
2859 my $short = $item->{count} > 1 3470 my $short = $item->{count} > 1
2860 ? "<b>$item->{count} ×</b> $item->{text}" 3471 ? "<b>$item->{count} ×</b> $item->{text}"
2861 : $item->{text}; 3472 : $item->{text};
2862 3473
… …
2870 tooltip => $item->{tooltip}, 3481 tooltip => $item->{tooltip},
2871 tooltip_font => $::FONT_PROP, 3482 tooltip_font => $::FONT_PROP,
2872 tooltip_width => 0.67, 3483 tooltip_width => 0.67,
2873 fontsize => $item->{fontsize} || $self->{fontsize}, 3484 fontsize => $item->{fontsize} || $self->{fontsize},
2874 max_w => $::WIDTH * 0.44, 3485 max_w => $::WIDTH * 0.44,
2875 fg => $item->{fg}, 3486 fg => [@{ $item->{fg} }],
2876 can_events => 1, 3487 can_events => 1,
2877 can_hover => 1 3488 can_hover => 1
2878 }; 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;
2879 } 3502 }
2880 3503
2881 $self->clear; 3504 $self->clear;
2882 $self->SUPER::add (reverse @widgets); 3505 $self->SUPER::add (reverse @widgets);
2883} 3506}
… …
2886 my ($self, $text, %arg) = @_; 3509 my ($self, $text, %arg) = @_;
2887 3510
2888 $text =~ s/^\s+//; 3511 $text =~ s/^\s+//;
2889 $text =~ s/\s+$//; 3512 $text =~ s/\s+$//;
2890 3513
3514 return unless $text;
3515
2891 my $timeout = time + ((delete $arg{timeout}) || 60); 3516 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2892 3517
2893 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3518 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894 3519
2895 if (my $item = $self->{item}{$group}) { 3520 if (my $item = $self->{item}{$group}) {
2896 if ($item->{text} eq $text) { 3521 if ($item->{text} eq $text) {
2897 $item->{count}++; 3522 $item->{count}++;
2898 } else { 3523 } else {
2899 $item->{count} = 1; 3524 $item->{count} = 1;
2900 $item->{text} = $item->{tooltip} = $text; 3525 $item->{text} = $item->{tooltip} = $text;
2901 } 3526 }
2902 $item->{id} = ++$self->{id}; 3527 $item->{id} += 0.2;#d#
2903 $item->{timeout} = $timeout; 3528 $item->{timeout} = $timeout;
2904 delete $item->{label}; 3529 delete $item->{label};
2905 } else { 3530 } else {
2906 $self->{item}{$group} = { 3531 $self->{item}{$group} = {
2907 id => ++$self->{id}, 3532 id => ++$self->{id},
… …
2913 count => 1, 3538 count => 1,
2914 %arg, 3539 %arg,
2915 }; 3540 };
2916 } 3541 }
2917 3542
3543 $ROOT->on_refresh (reorder => sub {
2918 $self->reorder; 3544 $self->reorder;
3545 });
2919} 3546}
2920 3547
2921sub reconfigure { 3548sub reconfigure {
2922 my ($self) = @_; 3549 my ($self) = @_;
2923 3550
… …
2926 3553
2927 $self->reorder; 3554 $self->reorder;
2928 $self->SUPER::reconfigure; 3555 $self->SUPER::reconfigure;
2929} 3556}
2930 3557
3558sub destroy {
3559 my ($self) = @_;
3560
3561 $self->{timer}->cancel;
3562
3563 $self->SUPER::destroy;
3564}
3565
2931############################################################################# 3566#############################################################################
2932 3567
2933package CFClient::UI::Root; 3568package CFClient::UI::Inventory;
2934 3569
2935our @ISA = CFClient::UI::Container::; 3570our @ISA = CFClient::UI::Table::;
2936
2937use CFClient::OpenGL;
2938 3571
2939sub new { 3572sub new {
2940 my $class = shift; 3573 my $class = shift;
2941 3574
2942 $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 => [],
2943 @_, 3640 @_,
2944 ) 3641 )
2945} 3642}
2946 3643
2947sub configure { 3644my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2948 my ($self, $x, $y, $w, $h) = @_;
2949 3645
2950 $self->{w} = $w; 3646my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2951 $self->{h} = $h; 3647 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2952} 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");
2953 3656
2954sub 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 {
2955 my ($self) = @_; 3730 my ($self, $spell) = @_;
2956 3731
2957 $self->size_allocate ($self->{w}, $self->{h}) 3732 $self->{spell}->{$spell->{name}} = $spell;
2958 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
2959} 3771}
2960 3772
2961sub size_request { 3773sub size_request {
2962 my ($self) = @_; 3774 my ($self) = @_;
2963 3775
2964 ($self->{w}, $self->{h}) 3776 ($self->{w}, $self->{h})
2965} 3777}
2966 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
2967sub size_allocate { 3793sub invoke_size_allocate {
2968 my ($self, $w, $h) = @_; 3794 my ($self, $w, $h) = @_;
2969
2970 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2971 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2972
2973 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2974 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2975 3795
2976 for my $child ($self->children) { 3796 for my $child ($self->children) {
2977 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)};
2978 3798
2979 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3799 $X = $child->{force_x} if exists $child->{force_x};
2980 if exists $child->{req_x}; 3800 $Y = $child->{force_y} if exists $child->{force_y};
2981 3801
2982 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3802 $X = _to_pixel $X, $W, $self->{w};
2983 if exists $child->{req_y}; 3803 $Y = _to_pixel $Y, $H, $self->{h};
2984
2985 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2986 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987 3804
2988 $child->configure ($X, $Y, $W, $H); 3805 $child->configure ($X, $Y, $W, $H);
2989 } 3806 }
3807
3808 1
2990} 3809}
2991 3810
2992sub coord2local { 3811sub coord2local {
2993 my ($self, $x, $y) = @_; 3812 my ($self, $x, $y) = @_;
2994 3813
… …
3002} 3821}
3003 3822
3004sub update { 3823sub update {
3005 my ($self) = @_; 3824 my ($self) = @_;
3006 3825
3007 $self->check_size;
3008 $::WANT_REFRESH++; 3826 $::WANT_REFRESH++;
3009} 3827}
3010 3828
3011sub add { 3829sub add {
3012 my ($self, @children) = @_; 3830 my ($self, @children) = @_;
3013 3831
3014 for my $child (@children) {
3015 $child->{toplevel} = 1; 3832 $_->{is_toplevel} = 1
3016 3833 for @children;
3017 # integerise window positions
3018 $child->{x} = int $child->{x};
3019 $child->{y} = int $child->{y};
3020 }
3021 3834
3022 $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;
3023 3845
3024 while (@children) { 3846 while (@children) {
3025 my $w = pop @children; 3847 my $w = pop @children;
3026 push @children, $w->children; 3848 push @children, $w->children;
3027 $w->{visible} = 1; 3849 $w->set_invisible;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 } 3850 }
3041} 3851}
3042 3852
3043sub on_refresh { 3853sub on_refresh {
3044 my ($self, $id, $cb) = @_; 3854 my ($self, $id, $cb) = @_;
… …
3058 while ($self->{refresh_hook}) { 3868 while ($self->{refresh_hook}) {
3059 $_->() 3869 $_->()
3060 for values %{delete $self->{refresh_hook}}; 3870 for values %{delete $self->{refresh_hook}};
3061 } 3871 }
3062 3872
3063 if ($self->{check_size}) { 3873 if ($self->{realloc}) {
3064 my @queue = ([], []); 3874 my %queue;
3875 my @queue;
3876 my $widget;
3065 3877
3066 for (;;) { 3878 outer:
3067 if ($self->{check_size}) { 3879 while () {
3068 # heuristic: check containers last 3880 if (my $realloc = delete $self->{realloc}) {
3069 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3881 for $widget (values %$realloc) {
3070 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 }
3071 } 3888 }
3072 3889
3073 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3890 while () {
3891 @queue or last outer;
3074 3892
3075 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3893 $widget = pop @{ $queue[-1] || [] }
3076 ? @$widget{qw(user_w user_h)} 3894 and last;
3077 : $widget->size_request;
3078
3079 if (delete $widget->{force_alloc}
3080 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3082 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}) {
3083 $widget->{req_w} = $w; 3914 $widget->{req_w} = $w;
3084 $widget->{req_h} = $h; 3915 $widget->{req_h} = $h;
3085 3916
3086 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3917 $self->{size_alloc}{$widget+0} = $widget;
3087 3918
3088 $widget->{parent}->check_size
3089 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 }
3090 } 3926 }
3927
3928 delete $self->{realloc}{$widget+0};
3091 } 3929 }
3092 } 3930 }
3093 3931
3094 while ($self->{size_alloc}) { 3932 while (my $size_alloc = delete $self->{size_alloc}) {
3095 for (values %{delete $self->{size_alloc}}) { 3933 my @queue = sort { $b->{visible} <=> $a->{visible} }
3096 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)};
3097 3940
3098 $w = 0 if $w < 0; 3941 $w = 0 if $w < 0;
3099 $h = 0 if $h < 0; 3942 $h = 0 if $h < 0;
3100 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
3101 $widget->{w} = $w; 3960 $widget->{w} = $w;
3102 $widget->{h} = $h; 3961 $widget->{h} = $h;
3103 $widget->size_allocate ($w, $h); 3962
3104 $widget->emit (size_allocate => $w, $h); 3963 $widget->emit (size_allocate => $w, $h);
3964 }
3105 } 3965 }
3106 } 3966 }
3107 3967
3108 while ($self->{post_alloc_hook}) { 3968 while ($self->{post_alloc_hook}) {
3109 $_->() 3969 $_->()
3110 for values %{delete $self->{post_alloc_hook}}; 3970 for values %{delete $self->{post_alloc_hook}};
3111 } 3971 }
3972
3112 3973
3113 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3974 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3975 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3115 glClear GL_COLOR_BUFFER_BIT; 3976 glClear GL_COLOR_BUFFER_BIT;
3116 3977
… …
3118 glLoadIdentity; 3979 glLoadIdentity;
3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3980 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3120 glMatrixMode GL_MODELVIEW; 3981 glMatrixMode GL_MODELVIEW;
3121 glLoadIdentity; 3982 glLoadIdentity;
3122 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
3123 $self->_draw; 3991 $self->_draw;
3124} 3992}
3125 3993
3126############################################################################# 3994#############################################################################
3127 3995

Diff Legend

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