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.225 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.336 by root, Sun Jul 23 16:46:06 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 947
749 @$self{qw(child_w child_h)} 948 $w = 10 if $self->{scroll_x};
750} 949 $h = 10 if $self->{scroll_y};
751 950
951 ($w, $h)
952}
953
752sub size_allocate { 954sub invoke_size_allocate {
753 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
754 956
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 957 my $child = $self->child;
756# $w = $self->{w}; 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
757 $self->child->configure (0, 0, $cw, $ch); 962 $self->child->configure (0, 0, $w, $h);
758 $self->update; 963 $self->update;
964
965 1
759} 966}
760 967
761sub set_offset { 968sub set_offset {
762 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
763 970
… …
796} 1003}
797 1004
798sub _render { 1005sub _render {
799 my ($self) = @_; 1006 my ($self) = @_;
800 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
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802 1012
803 $self->SUPER::_render; 1013 $self->SUPER::_render;
804} 1014}
805 1015
… …
808package CFClient::UI::ScrolledWindow; 1018package CFClient::UI::ScrolledWindow;
809 1019
810our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFClient::UI::HBox::;
811 1021
812sub new { 1022sub new {
813 my $class = shift; 1023 my ($class, %arg) = @_;
1024
1025 my $child = delete $arg{child};
814 1026
815 my $self; 1027 my $self;
816 1028
817 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFClient::UI::Slider
818 vertical => 1, 1030 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 1031 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 1032 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 1033 $self->{vp}->set_offset (0, $_[1]);
822 }, 1034 },
823 ; 1035 ;
824 1036
825 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
827 slider => $slider, 1040 slider => $slider,
828 @_, 1041 %arg,
829 ); 1042 );
830 1043
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
1045 $self->add ($child) if $child;
834 1046
835 $self 1047 $self
836} 1048}
837 1049
838#TODO# update range on size_allocate depending on child 1050#TODO# update range on size_allocate depending on child
839# 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}
840 1089
841############################################################################# 1090#############################################################################
842 1091
843package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
844 1093
… …
860 1109
861 if ($self->{bg}) { 1110 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
863 1112
864 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
866 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
867 1116
868 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
869 glVertex 0 , 0; 1118 glVertex 0 , 0;
870 glVertex 0 , $h; 1119 glVertex 0 , $h;
871 glVertex $w, $h; 1120 glVertex $w, $h;
… …
884 1133
885our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFClient::UI::Bin::;
886 1135
887use CFClient::OpenGL; 1136use CFClient::OpenGL;
888 1137
889my @tex = 1138my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1;
1141
1142my @border =
890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891 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);
892 1145
893sub new { 1146sub new {
894 my $class = shift; 1147 my ($class, %arg) = @_;
895
896 # TODO: user_x, user_y, overwrite moveto?
897 1148
898 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1152 border => 0.6,
902 toplevel => 1,
903 can_events => 1, 1153 can_events => 1,
904 @_ 1154 min_w => 64,
1155 min_h => 32,
1156 %arg,
905 ); 1157 );
906 1158
907 $self->{title} &&= new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
908 align => 0, 1160 align => 0,
909 valign => 1, 1161 valign => 1,
910 text => $self->{title}, 1162 text => $self->{title},
911 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 }
912 1174
913 $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};
914} 1184}
915 1185
916sub border { 1186sub border {
917 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
918} 1188}
919 1189
920sub size_request { 1190sub size_request {
921 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};
922 1198
923 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
924 1200
925 ( 1201 (
926 $w + $self->border * 2, 1202 $w + $self->border * 2,
927 $h + $self->border * 2, 1203 $h + $self->border * 2,
928 ) 1204 )
929} 1205}
930 1206
931sub size_allocate { 1207sub invoke_size_allocate {
932 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
933 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
934 $h -= List::Util::max 0, $self->border * 2; 1218 $h -= List::Util::max 0, $border * 2;
935 $w -= List::Util::max 0, $self->border * 2; 1219 $w -= List::Util::max 0, $border * 2;
936 1220
937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
938 if $self->{title};
939
940 $self->child->configure ($self->border, $self->border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
941}
942 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
943sub button_down { 1237sub invoke_button_down {
944 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
945 1239
946 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
947 my $border = $self->border; 1241 my $border = $self->border;
948 1242
… …
961 my ($ev, $x, $y) = @_; 1255 my ($ev, $x, $y) = @_;
962 1256
963 my $dx = $ev->{x} - $ox; 1257 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
965 1259
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1262
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969 $self->check_size; 1264 $self->realloc;
970 }; 1265 };
971 1266
972 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
974 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
976 $self->{motion} = sub { 1271 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
978 1273
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
980 1275
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982 $self->update; 1277 # HACK: the next line is required to enforce placement
1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
983 }; 1279 };
1280 } else {
1281 return 0;
1282 }
1283
984 } 1284 1
985} 1285}
986 1286
987sub button_up { 1287sub invoke_button_up {
988 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
989 1289
990 delete $self->{motion}; 1290 ! ! delete $self->{motion}
991} 1291}
992 1292
993sub mouse_motion { 1293sub invoke_mouse_motion {
994 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
995 1295
996 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297
1298 ! ! $self->{motion}
997} 1299}
998 1300
999sub _draw { 1301sub _draw {
1000 my ($self) = @_; 1302 my ($self) = @_;
1001 1303
1304 my $child = $self->{children}[0];
1305
1002 my ($w, $h ) = ($self->{w}, $self->{h}); 1306 my ($w, $h ) = ($self->{w}, $self->{h});
1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1307 my ($cw, $ch) = ($child->{w}, $child->{h});
1004 1308
1005 glEnable GL_TEXTURE_2D; 1309 glEnable GL_TEXTURE_2D;
1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007 1311
1008 my $border = $self->border; 1312 my $border = $self->border;
1009 1313
1010 glColor @{ $self->{border_bg} }; 1314 glColor @{ $self->{border_bg} };
1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1315 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1316 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1317 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1318 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015 1319
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1320 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017 my $bg = $tex[0]; 1321 glColor @{ $self->{bg} };
1018 1322
1019 # TODO: repeat texture not scale 1323 # TODO: repeat texture not scale
1324 # solve this better(?)
1020 my $rep_x = $cw / $bg->{w}; 1325 $bg->{s} = $cw / $bg->{w};
1021 my $rep_y = $ch / $bg->{h}; 1326 $bg->{t} = $ch / $bg->{h};
1022
1023 glColor @{ $self->{bg} };
1024
1025 $bg->{s} = $rep_x;
1026 $bg->{t} = $rep_y;
1027 $bg->{wrap_mode} = 1;
1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1327 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 } 1328 }
1030 1329
1031 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1032 1331
1033 $self->{title}->draw if $self->{title};
1034
1035 $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};
1036} 1343}
1037 1344
1038############################################################################# 1345#############################################################################
1039 1346
1040package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1048sub new { 1355sub new {
1049 my $class = shift; 1356 my $class = shift;
1050 1357
1051 $class->SUPER::new ( 1358 $class->SUPER::new (
1052 col_expand => [], 1359 col_expand => [],
1053 @_ 1360 @_,
1054 ) 1361 )
1055}
1056
1057sub add {
1058 my ($self, $x, $y, $child) = @_;
1059
1060 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child;
1062
1063 $child->check_size;
1064} 1362}
1065 1363
1066sub children { 1364sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068} 1366}
1069 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
1070# 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?
1071sub clear { 1389sub clear {
1072 my ($self) = @_; 1390 my ($self) = @_;
1073 1391
1074 my @children = $self->children; 1392 my @children = $self->children;
1075 delete $self->{children}; 1393 delete $self->{children};
… …
1077 for (@children) { 1395 for (@children) {
1078 delete $_->{parent}; 1396 delete $_->{parent};
1079 $_->hide; 1397 $_->hide;
1080 } 1398 }
1081 1399
1082 $self->update; 1400 $self->realloc;
1083} 1401}
1084 1402
1085sub get_wh { 1403sub get_wh {
1086 my ($self) = @_; 1404 my ($self) = @_;
1087 1405
… …
1113 (sum @$ws), 1431 (sum @$ws),
1114 (sum @$hs), 1432 (sum @$hs),
1115 ) 1433 )
1116} 1434}
1117 1435
1118sub size_allocate { 1436sub invoke_size_allocate {
1119 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1120 1438
1121 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1122 1440
1123 my $req_w = sum @$ws; 1441 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1442 my $req_h = (sum @$hs) || 1;
1125 1443
1126 # TODO: nicer code && do row_expand 1444 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1445 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1446 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1447 my $col_expand = (sum @col_expand) || 1;
… …
1155 } 1473 }
1156 1474
1157 $y += $row_h; 1475 $y += $row_h;
1158 } 1476 }
1159 1477
1478 1
1160} 1479}
1161 1480
1162sub find_widget { 1481sub find_widget {
1163 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1164 1483
… …
1183 } 1502 }
1184} 1503}
1185 1504
1186############################################################################# 1505#############################################################################
1187 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
1188package CFClient::UI::HBox; 1567package CFClient::UI::HBox;
1189 1568
1190# TODO: wrap into common Box base class
1191
1192our @ISA = CFClient::UI::Container::; 1569our @ISA = CFClient::UI::Box::;
1193 1570
1194sub size_request { 1571sub new {
1195 my ($self) = @_; 1572 my $class = shift;
1196 1573
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1574 $class->SUPER::new (
1198 1575 vertical => 0,
1199 ( 1576 @_,
1200 (List::Util::sum map $_->[0], @alloc),
1201 (List::Util::max map $_->[1], @alloc),
1202 ) 1577 )
1203} 1578}
1204 1579
1205sub size_allocate {
1206 my ($self, $w, $h) = @_;
1207
1208 ($h, $w) = ($w, $h);
1209
1210 my $children = $self->{children};
1211
1212 my @h = map $_->{req_w}, @$children;
1213
1214 my $req_h = List::Util::sum @h;
1215
1216 if ($req_h > $h) {
1217 # ah well, not enough space
1218 $_ *= $h / $req_h for @h;
1219 } else {
1220 my $exp = List::Util::sum map $_->{expand}, @$children;
1221 $exp ||= 1;
1222
1223 for (0 .. $#$children) {
1224 my $child = $children->[$_];
1225
1226 my $alloc_h = $h[$_];
1227 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228 $h[$_] = $alloc_h;
1229 }
1230 }
1231
1232 CFClient::UI::harmonize \@h;
1233
1234 my $y = 0;
1235 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_];
1238 $child->configure ($y, 0, $h, $w);
1239
1240 $y += $h;
1241 }
1242
1243 1
1244}
1245
1246############################################################################# 1580#############################################################################
1247 1581
1248package CFClient::UI::VBox; 1582package CFClient::UI::VBox;
1249 1583
1250# TODO: wrap into common Box base class
1251
1252our @ISA = CFClient::UI::Container::; 1584our @ISA = CFClient::UI::Box::;
1253 1585
1254sub size_request { 1586sub new {
1255 my ($self) = @_; 1587 my $class = shift;
1256 1588
1257 my @alloc = map [$_->size_request], @{$self->{children}}; 1589 $class->SUPER::new (
1258 1590 vertical => 1,
1259 ( 1591 @_,
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1592 )
1263}
1264
1265sub size_allocate {
1266 my ($self, $w, $h) = @_;
1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270 my $children = $self->{children};
1271
1272 my @h = map $_->{req_h}, @$children;
1273
1274 my $req_h = List::Util::sum @h;
1275
1276 if ($req_h > $h) {
1277 # ah well, not enough space
1278 $_ *= $h / $req_h for @h;
1279 } else {
1280 my $exp = List::Util::sum map $_->{expand}, @$children;
1281 $exp ||= 1;
1282
1283 for (0 .. $#$children) {
1284 my $child = $children->[$_];
1285
1286 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287 }
1288 }
1289
1290 CFClient::UI::harmonize \@h;
1291
1292 my $y = 0;
1293 for (0 .. $#$children) {
1294 my $child = $children->[$_];
1295 my $h = $h[$_];
1296 $child->configure (0, $y, $w, $h);
1297
1298 $y += $h;
1299 }
1300
1301 1
1302} 1593}
1303 1594
1304############################################################################# 1595#############################################################################
1305 1596
1306package CFClient::UI::Label; 1597package CFClient::UI::Label;
… …
1323 ellipsise => 3, # end 1614 ellipsise => 3, # end
1324 layout => (new CFClient::Layout), 1615 layout => (new CFClient::Layout),
1325 fontsize => 1, 1616 fontsize => 1,
1326 align => -1, 1617 align => -1,
1327 valign => -1, 1618 valign => -1,
1328 padding => 2, 1619 padding_x => 2,
1620 padding_y => 2,
1329 can_events => 0, 1621 can_events => 0,
1330 %arg 1622 %arg
1331 ); 1623 );
1332 1624
1333 if (exists $self->{template}) { 1625 if (exists $self->{template}) {
… …
1343 } 1635 }
1344 1636
1345 $self 1637 $self
1346} 1638}
1347 1639
1348sub escape($) {
1349 local $_ = $_[0];
1350
1351 s/&/&amp;/g;
1352 s/>/&gt;/g;
1353 s/</&lt;/g;
1354
1355 $_
1356}
1357
1358sub update { 1640sub update {
1359 my ($self) = @_; 1641 my ($self) = @_;
1360 1642
1361 delete $self->{texture}; 1643 delete $self->{texture};
1362 $self->SUPER::update; 1644 $self->SUPER::update;
1363} 1645}
1364 1646
1647sub realloc {
1648 my ($self) = @_;
1649
1650 delete $self->{ox};
1651 $self->SUPER::realloc;
1652}
1653
1365sub set_text { 1654sub set_text {
1366 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1367 1656
1368 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1369 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1370 1659
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1373 1661
1662 delete $self->{size_req};
1663 $self->realloc;
1374 $self->update; 1664 $self->update;
1375 $self->check_size;
1376} 1665}
1377 1666
1378sub set_markup { 1667sub set_markup {
1379 my ($self, $markup) = @_; 1668 my ($self, $markup) = @_;
1380 1669
1381 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1382 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1383 1672
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385 1674
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1388 1676
1677 delete $self->{size_req};
1678 $self->realloc;
1389 $self->update; 1679 $self->update;
1390 $self->check_size;
1391} 1680}
1392 1681
1393sub size_request { 1682sub size_request {
1394 my ($self) = @_; 1683 my ($self) = @_;
1395 1684
1685 $self->{size_req} ||= do {
1396 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1397 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1691
1402 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1403 1693
1404 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1405 $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);
1406 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1407 1698
1408 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1409 1700
1410 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1411 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1703 }
1704
1705 [$w, $h]
1412 } 1706 };
1413 1707
1414 ( 1708 @{ $self->{size_req} }
1415 $w + $self->{padding} * 2,
1416 $h + $self->{padding} * 2,
1417 )
1418} 1709}
1419 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1420sub size_allocate { 1715sub invoke_size_allocate {
1421 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1422 1717
1718 delete $self->{ox};
1719
1423 delete $self->{texture}; 1720 delete $self->{texture}
1721 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1722
1723 1
1424} 1724}
1425 1725
1426sub set_fontsize { 1726sub set_fontsize {
1427 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1428 1728
1429 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1430 delete $self->{texture}; 1731 delete $self->{texture};
1431 1732
1432 $self->update; 1733 $self->realloc;
1433 $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;
1434} 1743}
1435 1744
1436sub _draw { 1745sub _draw {
1437 my ($self) = @_; 1746 my ($self) = @_;
1438 1747
1439 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1440 1749
1441 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1442 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1443 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1444 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448 1757
1449 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1758 [$self->{layout}->size]
1450
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1453 : ($self->{w} - $tex->{w}) * 0.5);
1454
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1460 }; 1759 };
1461 1760
1462 glEnable GL_TEXTURE_2D; 1761 unless (exists $self->{ox}) {
1463 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);
1464 1765
1465 if ($tex->{format} == GL_ALPHA) { 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1466 glColor @{$self->{fg}}; 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1768 : ($self->{h} - $size->[1]) * 0.5);
1468 } else {
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 } 1769 };
1471 1770
1472 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});
1473} 1775}
1474 1776
1475############################################################################# 1777#############################################################################
1476 1778
1477package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1491 can_hover => 1, 1793 can_hover => 1,
1492 can_focus => 1, 1794 can_focus => 1,
1493 valign => 0, 1795 valign => 0,
1494 can_events => 1, 1796 can_events => 1,
1495 #text => ... 1797 #text => ...
1798 #hidden => "*",
1496 @_ 1799 @_
1497 ) 1800 )
1498} 1801}
1499 1802
1500sub _set_text { 1803sub _set_text {
… …
1502 1805
1503 delete $self->{cur_h}; 1806 delete $self->{cur_h};
1504 1807
1505 return if $self->{text} eq $text; 1808 return if $self->{text} eq $text;
1506 1809
1507 delete $self->{texture};
1508
1509 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1510 $self->{text} = $text; 1811 $self->{text} = $text;
1511 1812
1512 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1815 delete $self->{size_req};
1514 1816
1515 $self->emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1818
1819 $self->realloc;
1820 $self->update;
1516} 1821}
1517 1822
1518sub set_text { 1823sub set_text {
1519 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1520 1825
1521 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1522 $self->_set_text ($text); 1827 $self->_set_text ($text);
1523 $self->update;
1524 $self->check_size;
1525} 1828}
1526 1829
1527sub get_text { 1830sub get_text {
1528 $_[0]{text} 1831 $_[0]{text}
1529} 1832}
… …
1534 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1535 1838
1536 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1537} 1840}
1538 1841
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543}
1544
1545sub key_down { 1842sub invoke_key_down {
1546 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1547 1844
1548 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1549 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1550 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1565 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1864 $self->emit ('escape');
1568 } elsif ($uni) { 1865 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else {
1868 return 0;
1570 } 1869 }
1571 1870
1572 $self->_set_text ($text); 1871 $self->_set_text ($text);
1573 $self->update;
1574 $self->check_size;
1575}
1576 1872
1873 $self->realloc;
1874
1875 1
1876}
1877
1577sub focus_in { 1878sub invoke_focus_in {
1578 my ($self) = @_; 1879 my ($self) = @_;
1579 1880
1580 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1581 1882
1582 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1583} 1884}
1584 1885
1585sub button_down { 1886sub invoke_button_down {
1586 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1587 1888
1588 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1589 1890
1590 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1591 1892
1592 # byte-index to char-index 1893 # byte-index to char-index
1593 my $text = $self->{text}; 1894 my $text = $self->{text};
1594 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1595 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1596 1897
1597 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1598 $self->update; 1899 $self->update;
1900
1901 1
1599} 1902}
1600 1903
1601sub mouse_motion { 1904sub invoke_mouse_motion {
1602 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1603# 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
1604} 1909}
1605 1910
1606sub _draw { 1911sub _draw {
1607 my ($self) = @_; 1912 my ($self) = @_;
1608 1913
1609 local $self->{fg} = $self->{fg}; 1914 local $self->{fg} = $self->{fg};
1610 1915
1611 if ($FOCUS == $self) { 1916 if ($FOCUS == $self) {
1612 glColor @{$self->{active_bg}}; 1917 glColor_premultiply @{$self->{active_bg}};
1613 $self->{fg} = $self->{active_fg}; 1918 $self->{fg} = $self->{active_fg};
1614 } else { 1919 } else {
1615 glColor @{$self->{bg}}; 1920 glColor_premultiply @{$self->{bg}};
1616 } 1921 }
1617 1922
1618 glEnable GL_BLEND; 1923 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1924 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1620 glBegin GL_QUADS; 1925 glBegin GL_QUADS;
1621 glVertex 0 , 0; 1926 glVertex 0 , 0;
1622 glVertex 0 , $self->{h}; 1927 glVertex 0 , $self->{h};
1623 glVertex $self->{w}, $self->{h}; 1928 glVertex $self->{w}, $self->{h};
1624 glVertex $self->{w}, 0; 1929 glVertex $self->{w}, 0;
… …
1649 1954
1650our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1651 1956
1652use CFClient::OpenGL; 1957use CFClient::OpenGL;
1653 1958
1654sub key_down { 1959sub invoke_key_down {
1655 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1656 1961
1657 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1658 1963
1659 if ($sym == 13) { 1964 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1662 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1970 $self->emit (activate => $txt);
1665 $self->update; 1971 $self->update;
1666 1972
… …
1685 } else { 1991 } else {
1686 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1687 } 1993 }
1688 1994
1689 } else { 1995 } else {
1690 $self->SUPER::key_down ($ev); 1996 return $self->SUPER::invoke_key_down ($ev)
1997 }
1998
1691 } 1999 1
1692
1693} 2000}
1694 2001
1695############################################################################# 2002#############################################################################
1696 2003
1697package CFClient::UI::Button; 2004package CFClient::UI::Button;
… …
1706 2013
1707sub new { 2014sub new {
1708 my $class = shift; 2015 my $class = shift;
1709 2016
1710 $class->SUPER::new ( 2017 $class->SUPER::new (
1711 padding => 4, 2018 padding_x => 4,
2019 padding_y => 4,
1712 fg => [1, 1, 1], 2020 fg => [1, 1, 1],
1713 active_fg => [0, 0, 1], 2021 active_fg => [0, 0, 1],
1714 can_hover => 1, 2022 can_hover => 1,
1715 align => 0, 2023 align => 0,
1716 valign => 0, 2024 valign => 0,
1717 can_events => 1, 2025 can_events => 1,
1718 @_ 2026 @_
1719 ) 2027 )
1720} 2028}
1721 2029
1722sub button_up { 2030sub invoke_button_up {
1723 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1724 2032
2033 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 2035 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate"); 2036
1728 } 2037 1
1729} 2038}
1730 2039
1731sub _draw { 2040sub _draw {
1732 my ($self) = @_; 2041 my ($self) = @_;
1733 2042
1734 local $self->{fg} = $self->{fg}; 2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1735
1736 if ($GRAB == $self) {
1737 $self->{fg} = $self->{active_fg};
1738 }
1739 2044
1740 glEnable GL_TEXTURE_2D; 2045 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 glColor 0, 0, 0, 1; 2047 glColor 0, 0, 0, 1;
1743 2048
… …
1762 2067
1763sub new { 2068sub new {
1764 my $class = shift; 2069 my $class = shift;
1765 2070
1766 $class->SUPER::new ( 2071 $class->SUPER::new (
1767 padding => 2, 2072 padding_x => 2,
2073 padding_y => 2,
1768 fg => [1, 1, 1], 2074 fg => [1, 1, 1],
1769 active_fg => [1, 1, 0], 2075 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2], 2076 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5], 2077 active_bg => [1, 1, 1, 0.5],
1772 state => 0, 2078 state => 0,
… …
1776} 2082}
1777 2083
1778sub size_request { 2084sub size_request {
1779 my ($self) = @_; 2085 my ($self) = @_;
1780 2086
1781 ($self->{padding} * 2 + 6) x 2 2087 (6) x 2
1782} 2088}
1783 2089
2090sub toggle {
2091 my ($self) = @_;
2092
2093 $self->{state} = !$self->{state};
2094 $self->emit (changed => $self->{state});
2095 $self->update;
2096}
2097
1784sub button_down { 2098sub invoke_button_down {
1785 my ($self, $ev, $x, $y) = @_; 2099 my ($self, $ev, $x, $y) = @_;
1786 2100
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2101 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2102 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789 $self->{state} = !$self->{state}; 2103 $self->toggle;
1790 $self->emit (changed => $self->{state}); 2104 } else {
2105 return 0
2106 }
2107
1791 } 2108 1
1792} 2109}
1793 2110
1794sub _draw { 2111sub _draw {
1795 my ($self) = @_; 2112 my ($self) = @_;
1796 2113
1797 $self->SUPER::_draw; 2114 $self->SUPER::_draw;
1798 2115
1799 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2116 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800 2117
1801 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;
1802 2121
1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2122 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804 2123
1805 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2124 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806 2125
… …
1814package CFClient::UI::Image; 2133package CFClient::UI::Image;
1815 2134
1816our @ISA = CFClient::UI::Base::; 2135our @ISA = CFClient::UI::Base::;
1817 2136
1818use CFClient::OpenGL; 2137use CFClient::OpenGL;
1819use Carp qw/confess/;
1820 2138
1821our %loaded_images; 2139our %texture_cache;
1822 2140
1823sub new { 2141sub new {
1824 my $class = shift; 2142 my $class = shift;
1825 2143
1826 my $self = $class->SUPER::new (can_events => 0, @_); 2144 my $self = $class->SUPER::new (
2145 can_events => 0,
2146 @_,
2147 );
1827 2148
1828 $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";
1829 2151
1830 $loaded_images{$self->{image}} ||= 2152 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1831 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;
1832 2154
1833 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2155 Scalar::Util::weaken $texture_cache{$self->{path}};
1834 2156
1835 Scalar::Util::weaken $loaded_images{$self->{image}}; 2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1836
1837 $self->{aspect} = $tex->{w} / $tex->{h};
1838 2158
1839 $self 2159 $self
1840} 2160}
1841 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
1842sub size_request { 2177sub size_request {
1843 my ($self) = @_; 2178 my ($self) = @_;
1844 2179
1845 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
1846} 2181}
1847 2182
1848sub _draw { 2183sub _draw {
1849 my ($self) = @_; 2184 my ($self) = @_;
1850 2185
… …
1860 } 2195 }
1861 2196
1862 glEnable GL_TEXTURE_2D; 2197 glEnable GL_TEXTURE_2D;
1863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1864 2199
1865 $tex->draw_quad_alpha (0, 0, $w, $h); 2200 $tex->draw_quad (0, 0, $w, $h);
1866 2201
1867 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
1868} 2239}
1869 2240
1870############################################################################# 2241#############################################################################
1871 2242
1872package CFClient::UI::VGauge; 2243package CFClient::UI::VGauge;
… …
1959 my $ycut1 = max 0, min 1, $ycut; 2330 my $ycut1 = max 0, min 1, $ycut;
1960 my $ycut2 = max 0, min 1, $ycut - 1; 2331 my $ycut2 = max 0, min 1, $ycut - 1;
1961 2332
1962 my $h1 = $self->{h} * (1 - $ycut1); 2333 my $h1 = $self->{h} * (1 - $ycut1);
1963 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);
1964 2338
1965 glEnable GL_BLEND; 2339 glEnable GL_BLEND;
1966 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;
1967 glEnable GL_TEXTURE_2D; 2342 glEnable GL_TEXTURE_2D;
1968 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2343 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1969 2344
1970 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2345 glBindTexture GL_TEXTURE_2D, $t1->{name};
1971 glBegin GL_QUADS; 2346 glBegin GL_QUADS;
… …
1986 2361
1987 if ($t3) { 2362 if ($t3) {
1988 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2363 glBindTexture GL_TEXTURE_2D, $t3->{name};
1989 glBegin GL_QUADS; 2364 glBegin GL_QUADS;
1990 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2365 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1991 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2366 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1992 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2367 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1993 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2368 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1994 glEnd; 2369 glEnd;
1995 } 2370 }
1996 2371
1997 glDisable GL_BLEND; 2372 glDisable GL_BLEND;
… …
2070 my $self = $class->SUPER::new ( 2445 my $self = $class->SUPER::new (
2071 fg => [1, 1, 1], 2446 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2447 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2448 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2449 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10], 2450 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2451 min_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2452 min_h => $::WIDTH / 80,
2078 vertical => 0, 2453 vertical => 0,
2079 can_hover => 1, 2454 can_hover => 1,
2080 inner_pad => 0.02, 2455 inner_pad => 0.02,
2081 @_ 2456 @_
2082 ); 2457 );
… …
2088} 2463}
2089 2464
2090sub set_range { 2465sub set_range {
2091 my ($self, $range) = @_; 2466 my ($self, $range) = @_;
2092 2467
2093 $self->{range} = $range; 2468 ($range, $self->{range}) = ($self->{range}, $range);
2094 2469
2470 if ("@$range" ne "@{$self->{range}}") {
2095 $self->update; 2471 $self->update;
2472 $self->set_value ($self->{range}[0]);
2473 }
2096} 2474}
2097 2475
2098sub set_value { 2476sub set_value {
2099 my ($self, $value) = @_; 2477 my ($self, $value) = @_;
2100 2478
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2479 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102 2480
2103 $hi = $lo + 1 if $hi <= $lo; 2481 $hi = $lo + 1 if $hi <= $lo;
2104 2482
2483 $page = $hi - $lo if $page > $hi - $lo;
2484
2105 $value = $lo if $value < $lo; 2485 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi; 2486 $value = $hi - $page if $value > $hi - $page;
2107 2487
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2488 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit; 2489 if $unit;
2110
2111 $page = $hi - $lo if $page > $hi - $lo;
2112 2490
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2491 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2492
2115 if ($value != $old_value) { 2493 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2494 $self->emit (changed => $value);
… …
2119} 2497}
2120 2498
2121sub size_request { 2499sub size_request {
2122 my ($self) = @_; 2500 my ($self) = @_;
2123 2501
2124 my $w = $self->{req_w}; 2502 ($self->{req_w}, $self->{req_h})
2125 my $h = $self->{req_h};
2126
2127 $self->{vertical} ? ($h, $w) : ($w, $h)
2128} 2503}
2129 2504
2130sub button_down { 2505sub invoke_button_down {
2131 my ($self, $ev, $x, $y) = @_; 2506 my ($self, $ev, $x, $y) = @_;
2132 2507
2133 $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
2134 $self->mouse_motion ($ev, $x, $y); 2512 $self->invoke_mouse_motion ($ev, $x, $y)
2135} 2513}
2136 2514
2137sub mouse_motion { 2515sub invoke_mouse_motion {
2138 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
2139 2517
2140 if ($GRAB == $self) { 2518 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2519 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142 2520
2143 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2521 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144 2522
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2523 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146 2524
2147 $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
2148 } 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
2149} 2541}
2150 2542
2151sub update { 2543sub update {
2152 my ($self) = @_; 2544 my ($self) = @_;
2153 2545
2154 $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}) {
2155 $self->set_value ($self->{range}[0]); 2554 $self->set_value ($self->{range}[0]);
2156 2555
2157 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2556 my ($value, $lo, $hi, $page) = @{$self->{range}};
2557 my $range = ($hi - $page - $lo) || 1e-100;
2158 2558
2159 my $inner_w = 1 - 2 * $self->{inner_pad}; 2559 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160 2560
2161 $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;
2162 2563
2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2564 $value = ($value - $lo) / $range;
2164 $value = $self->{scale} * ($value - $lo); 2565 $value = $value * $self->{scale} + $self->{offset};
2165 2566
2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value; 2567 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $page; 2568 $self->{knob_w} = $knob_w;
2173 }); 2569 }
2174
2175 $self->SUPER::update;
2176}
2177
2178sub _draw {
2179 my ($self) = @_;
2180 2570
2181 $self->SUPER::_draw (); 2571 $self->SUPER::_draw ();
2182 2572
2183 glScale $self->{w}, $self->{h}; 2573 glScale $self->{w}, $self->{h};
2184 2574
… …
2245sub set_range { shift->{slider}->set_range (@_) } 2635sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) } 2636sub set_value { shift->{slider}->set_value (@_) }
2247 2637
2248############################################################################# 2638#############################################################################
2249 2639
2250package CFClient::UI::TextView; 2640package CFClient::UI::TextScroller;
2251 2641
2252our @ISA = CFClient::UI::HBox::; 2642our @ISA = CFClient::UI::HBox::;
2253 2643
2254use CFClient::OpenGL; 2644use CFClient::OpenGL;
2255 2645
2256sub new { 2646sub new {
2257 my $class = shift; 2647 my $class = shift;
2258 2648
2259 my $self = $class->SUPER::new ( 2649 my $self = $class->SUPER::new (
2260 fontsize => 1, 2650 fontsize => 1,
2261 can_events => 0, 2651 can_events => 1,
2652 indent => 0,
2262 #font => default_font 2653 #font => default_font
2263 @_, 2654 @_,
2264 2655
2265 layout => (new CFClient::Layout 1), 2656 layout => (new CFClient::Layout),
2266 par => [], 2657 par => [],
2267 height => 0, 2658 height => 0,
2268 children => [ 2659 children => [
2269 (new CFClient::UI::Empty expand => 1), 2660 (new CFClient::UI::Empty expand => 1),
2270 (new CFClient::UI::Slider vertical => 1), 2661 (new CFClient::UI::Slider vertical => 1),
… …
2281 2672
2282 $self->{fontsize} = $fontsize; 2673 $self->{fontsize} = $fontsize;
2283 $self->reflow; 2674 $self->reflow;
2284} 2675}
2285 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
2286sub size_allocate { 2686sub invoke_size_allocate {
2287 my ($self, $w, $h) = @_; 2687 my ($self, $w, $h) = @_;
2288 2688
2289 $self->SUPER::size_allocate ($w, $h); 2689 my ($empty, $slider, @other) = @{ $self->{children} };
2690 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2290 2691
2291 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2692 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $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});
2294 2696
2295 $self->reflow; 2697 $self->reflow;
2296}
2297 2698
2298sub text_height { 2699 local $self->{children} = [$empty, $slider];
2700 $self->SUPER::invoke_size_allocate ($w, $h)
2701}
2702
2703sub invoke_mouse_wheel {
2299 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) = @_;
2300 2715
2301 my $layout = $self->{layout}; 2716 my $layout = $self->{layout};
2302 2717
2718 $layout->set_font ($self->{font}) if $self->{font};
2719 $layout->set_foreground (@{$para->{fg}});
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2720 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $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});
2305 $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}}
2306 2729 );
2307 ($layout->size)[1] 2730
2731 $layout
2308} 2732}
2309 2733
2310sub reflow { 2734sub reflow {
2311 my ($self) = @_; 2735 my ($self) = @_;
2312 2736
2313 $self->{need_reflow}++; 2737 $self->{need_reflow}++;
2314 $self->update; 2738 $self->update;
2315} 2739}
2316 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
2317sub add_paragraph { 2759sub add_paragraph {
2318 my ($self, $color, $text, $indent) = @_; 2760 my ($self, $color, $para, $indent) = @_;
2319 2761
2320 #TODO: intelligently "reformat" paragraph 2762 my ($text, @w) = ref $para ? @$para : $para;
2321 2763
2322 for my $line (split /\n/, $text) { 2764 $para = {
2323 my $height = $self->text_height ($line); 2765 w => 1e10,
2324 $self->{height} += $height; 2766 wrapped => 1,
2325 push @{$self->{par}}, [$height, $color, $indent, $line]; 2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2326 } 2771 };
2327 2772
2328 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2773 $self->add (@w) if @w;
2329 $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;
2330} 2785}
2331 2786
2332sub update { 2787sub update {
2333 my ($self) = @_; 2788 my ($self) = @_;
2334 2789
… …
2336 2791
2337 return unless $self->{h} > 0; 2792 return unless $self->{h} > 0;
2338 2793
2339 delete $self->{texture}; 2794 delete $self->{texture};
2340 2795
2341 $ROOT->on_post_alloc ($self, sub { 2796 $ROOT->on_post_alloc ($self => sub {
2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798
2342 if (delete $self->{need_reflow}) { 2799 if (delete $self->{need_reflow}) {
2343 my $height = 0; 2800 my $height = 0;
2344 2801
2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2346 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 }
2347 2814
2348 $self->{height} = $height; 2815 $self->{height} = $height;
2349 2816
2350 $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]);
2351 $self->{children}[1]->update; 2818
2352
2353 delete $self->{texture}; 2819 delete $self->{texture};
2354 } 2820 }
2355 2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2824 }
2825
2356 $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 {
2357 glClearColor 0.5, 0.5, 0.5, 0; 2827 glClearColor 0, 0, 0, 0;
2358 glClear GL_COLOR_BUFFER_BIT; 2828 glClear GL_COLOR_BUFFER_BIT;
2359 2829
2360 my $top = int $self->{children}[1]{range}[0]; 2830 my $top = int $self->{children}[1]{range}[0];
2361 2831
2362 my $y0 = $top; 2832 my $y0 = $top;
2363 my $y1 = $top + $self->{h}; 2833 my $y1 = $top + $H;
2364 2834
2365 my $y = 0; 2835 my $y = 0;
2366 2836
2367 my $layout = $self->{layout};
2368
2369 $layout->set_font ($self->{font}) if $self->{font};
2370
2371 glEnable GL_BLEND;
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373
2374 for my $par (@{$self->{par}}) { 2837 for my $para (@{$self->{par}}) {
2375 my $h = $par->[0]; 2838 my $h = $para->{h};
2376 2839
2377 if ($y0 < $y + $h && $y < $y1) { 2840 if ($y0 < $y + $h && $y < $y1) {
2378 $layout->set_foreground (@{ $par->[1] });
2379 $layout->set_width ($self->{w} - $par->[2]);
2380 $layout->set_markup ($par->[3]);
2381 2841
2382 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2842 my $layout = $self->get_layout ($para);
2383 2843
2384 glRasterPos $par->[2], $y - $y0; 2844 $layout->render ($para->{indent}, $y - $y0);
2385 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 }
2386 } 2858 }
2387 2859
2388 $y += $h; 2860 $y += $h;
2389 } 2861 }
2390
2391 glDisable GL_BLEND;
2392 }; 2862 };
2393 }); 2863 });
2394} 2864}
2395 2865
2866sub reconfigure {
2867 my ($self) = @_;
2868
2869 $self->SUPER::reconfigure;
2870
2871 $_->{w} = 1e10 for @{ $self->{par} };
2872 $self->reflow;
2873}
2874
2396sub _draw { 2875sub _draw {
2397 my ($self) = @_; 2876 my ($self) = @_;
2398 2877
2399 glEnable GL_TEXTURE_2D; 2878 glEnable GL_TEXTURE_2D;
2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2401 glColor 1, 1, 1, 1; 2880 glColor 0, 0, 0, 1;
2402 $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});
2403 glDisable GL_TEXTURE_2D; 2882 glDisable GL_TEXTURE_2D;
2404 2883
2405 $self->{children}[1]->draw; 2884 $self->{children}[1]->draw;
2406
2407} 2885}
2408 2886
2409############################################################################# 2887#############################################################################
2410 2888
2411package CFClient::UI::Animator; 2889package CFClient::UI::Animator;
… …
2456 2934
2457sub new { 2935sub new {
2458 my $class = shift; 2936 my $class = shift;
2459 2937
2460 my $self = $class->SUPER::new ( 2938 my $self = $class->SUPER::new (
2461 state => 0, 2939 state => 0,
2462 connect_activate => \&toggle_flopper, 2940 on_activate => \&toggle_flopper,
2463 @_ 2941 @_
2464 ); 2942 );
2465 2943
2466 if ($self->{state}) {
2467 $self->{state} = 0;
2468 $self->toggle_flopper;
2469 }
2470
2471 $self 2944 $self
2472} 2945}
2473 2946
2474sub toggle_flopper { 2947sub toggle_flopper {
2475 my ($self) = @_; 2948 my ($self) = @_;
2476 2949
2477 # TODO: use animation 2950 $self->{other}->toggle_visibility;
2478 if ($self->{state} = !$self->{state}) {
2479 $CFClient::UI::ROOT->add ($self->{other});
2480 $self->{other}->move ($self->coord2global (0, $self->{h}));
2481 $self->emit ("open");
2482 } else {
2483 $CFClient::UI::ROOT->remove ($self->{other});
2484 $self->emit ("close");
2485 }
2486
2487 $self->emit (changed => $self->{state});
2488} 2951}
2489 2952
2490############################################################################# 2953#############################################################################
2491 2954
2492package CFClient::UI::Tooltip; 2955package CFClient::UI::Tooltip;
… …
2505} 2968}
2506 2969
2507sub set_tooltip_from { 2970sub set_tooltip_from {
2508 my ($self, $widget) = @_; 2971 my ($self, $widget) = @_;
2509 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
2510 $self->add (new CFClient::UI::Label 2985 $self->add (new CFClient::UI::Label
2511 markup => $widget->{tooltip}, 2986 markup => $tooltip,
2512 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2513 fontsize => 0.8, 2988 fontsize => 0.8,
2514 fg => [0, 0, 0, 1], 2989 fg => [0, 0, 0, 1],
2515 ellipsise => 0, 2990 ellipsise => 0,
2516 font => ($widget->{tooltip_font} || $::FONT_PROP), 2991 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2523 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2998 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2524 2999
2525 ($w + 4, $h + 4) 3000 ($w + 4, $h + 4)
2526} 3001}
2527 3002
2528sub size_allocate { 3003sub invoke_size_allocate {
2529 my ($self, $w, $h) = @_; 3004 my ($self, $w, $h) = @_;
2530 3005
2531 $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 });
2532} 3029}
2533 3030
2534sub _draw { 3031sub _draw {
2535 my ($self) = @_; 3032 my ($self) = @_;
2536 3033
… …
2553 glVertex $w, $h; 3050 glVertex $w, $h;
2554 glVertex $w, 0; 3051 glVertex $w, 0;
2555 glEnd; 3052 glEnd;
2556 3053
2557 glTranslate 2 - 0.375, 2 - 0.375; 3054 glTranslate 2 - 0.375, 2 - 0.375;
3055
2558 $self->SUPER::_draw; 3056 $self->SUPER::_draw;
2559} 3057}
2560 3058
2561############################################################################# 3059#############################################################################
2562 3060
… …
2568 3066
2569sub new { 3067sub new {
2570 my $class = shift; 3068 my $class = shift;
2571 3069
2572 my $self = $class->SUPER::new ( 3070 my $self = $class->SUPER::new (
2573 aspect => 1, 3071 aspect => 1,
3072 can_events => 0,
2574 @_, 3073 @_,
2575 ); 3074 );
2576 3075
2577 if ($self->{anim} && $self->{animspeed}) { 3076 if ($self->{anim} && $self->{animspeed}) {
2578 Scalar::Util::weaken (my $widget = $self); 3077 Scalar::Util::weaken (my $widget = $self);
… …
2604} 3103}
2605 3104
2606sub _draw { 3105sub _draw {
2607 my ($self) = @_; 3106 my ($self) = @_;
2608 3107
2609 return unless $::CONN;#d# manage and cache textures differently 3108 return unless $::CONN;
2610 3109
2611 my $face; 3110 my $face;
2612 3111
2613 if ($self->{frame}) { 3112 if ($self->{frame}) {
2614 my $anim = $::CONN->{anim}[$self->{anim}]; 3113 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2620 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3119 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2621 3120
2622 if ($tex) { 3121 if ($tex) {
2623 glEnable GL_TEXTURE_2D; 3122 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 3124 glColor 0, 0, 0, 1;
2626 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3125 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2627 glDisable GL_TEXTURE_2D; 3126 glDisable GL_TEXTURE_2D;
2628 } 3127 }
2629} 3128}
2630 3129
2631sub DESTROY { 3130sub destroy {
2632 my ($self) = @_; 3131 my ($self) = @_;
2633 3132
2634 $self->{timer}->cancel 3133 $self->{timer}->cancel
2635 if $self->{timer}; 3134 if $self->{timer};
2636 3135
2637 $self->SUPER::DESTROY; 3136 $self->SUPER::destroy;
2638} 3137}
2639 3138
2640############################################################################# 3139#############################################################################
2641 3140
2642package CFClient::UI::InventoryItem; 3141package CFClient::UI::Buttonbar;
2643 3142
2644our @ISA = CFClient::UI::HBox::; 3143our @ISA = CFClient::UI::HBox::;
2645 3144
2646sub _item_to_desc { 3145# TODO: should actualyl wrap buttons and other goodies.
2647 my ($item) = @_;
2648
2649 my $desc =
2650 $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} × $item->{name_pl}";
2653
2654 $item->{flags} & Crossfire::Protocol::F_OPEN
2655 and $desc .= " (open)";
2656 $item->{flags} & Crossfire::Protocol::F_APPLIED
2657 and $desc .= " (applied)";
2658 $item->{flags} & Crossfire::Protocol::F_UNPAID
2659 and $desc .= " (unpaid)";
2660 $item->{flags} & Crossfire::Protocol::F_MAGIC
2661 and $desc .= " (magic)";
2662 $item->{flags} & Crossfire::Protocol::F_CURSED
2663 and $desc .= " (cursed)";
2664 $item->{flags} & Crossfire::Protocol::F_DAMNED
2665 and $desc .= " (damned)";
2666 $item->{flags} & Crossfire::Protocol::F_LOCKED
2667 and $desc .= " *";
2668
2669 $desc
2670}
2671
2672sub new {
2673 my $class = shift;
2674
2675 my %args = @_;
2676
2677 my $item = delete $args{item};
2678
2679 my $desc = _item_to_desc ($item);
2680
2681 my $self = $class->SUPER::new (
2682 can_hover => 1,
2683 can_events => 1,
2684 tooltip => ((CFClient::UI::Label::escape $desc)
2685 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2686 connect_button_down => sub {
2687 my ($self, $ev, $x, $y) = @_;
2688
2689 # todo: maybe put examine on 1? but should just be a tooltip :(
2690 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2691 my $targ = $::CONN->{player}{tag};
2692
2693 if ($item->{container} == $::CONN->{player}{tag}) {
2694 $targ = $main::OPENCONT;
2695 }
2696
2697 $::CONN->send ("move $targ $item->{tag} 0");
2698 } elsif ($ev->{button} == 1) {
2699 $::CONN->send ("examine $item->{tag}");
2700 } elsif ($ev->{button} == 2) {
2701 $::CONN->send ("apply $item->{tag}");
2702 } elsif ($ev->{button} == 3) {
2703 my @menu_items = (
2704 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2705 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2706 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2707 (
2708 $item->{flags} & Crossfire::Protocol::F_LOCKED
2709 ? (
2710 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2711 )
2712 : (
2713 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2714 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2715 )
2716 ),
2717 );
2718
2719 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2720 }
2721
2722 1
2723 },
2724 %args
2725 );
2726
2727
2728 $self->add (new CFClient::UI::Face
2729 can_events => 0,
2730 face => $item->{face},
2731 anim => $item->{anim},
2732 animspeed => $item->{animspeed},
2733 );
2734
2735 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2736
2737 $self->{item} = $item;
2738
2739 $self->update_item;
2740
2741 $self
2742}
2743
2744sub update_item {
2745 my ($self) = @_;
2746
2747 my $desc = _item_to_desc ($self->{item});
2748
2749 $self->{name_lbl}->set_text ($desc);
2750}
2751
2752#############################################################################
2753
2754package CFClient::UI::Inventory;
2755
2756our @ISA = CFClient::UI::ScrolledWindow::;
2757
2758sub new {
2759 my $class = shift;
2760
2761 my $self = $class->SUPER::new (
2762 scrolled => (new CFClient::UI::Table),
2763 @_,
2764 );
2765
2766 $self
2767}
2768
2769sub set_items {
2770 my ($self, $items) = @_;
2771
2772 $self->{scrolled}->clear;
2773 return unless $items;
2774
2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2779
2780 $self->{real_items} = \@items;
2781
2782 for my $item (@items) {
2783 $item->{item} = $item;
2784 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2785 $item->update_item ();
2786 }
2787
2788 my $i = 0;
2789 for (@items) {
2790 $self->{scrolled}->add (0, $i, $_);
2791 my $nrof = $_->{item}->{nrof} || 1;
2792 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2793 }
2794
2795# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2796}
2797
2798sub size_request {
2799 my ($self) = @_;
2800 ($self->{req_w}, $self->{req_h});
2801}
2802 3146
2803############################################################################# 3147#############################################################################
2804 3148
2805package CFClient::UI::Menu; 3149package CFClient::UI::Menu;
2806 3150
… …
2818 ); 3162 );
2819 3163
2820 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3164 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2821 3165
2822 for my $item (@{ $self->{items} }) { 3166 for my $item (@{ $self->{items} }) {
2823 my ($widget, $cb) = @$item; 3167 my ($widget, $cb, $tooltip) = @$item;
2824 3168
2825 # handle various types of items, only text for now 3169 # handle various types of items, only text for now
2826 if (!ref $widget) { 3170 if (!ref $widget) {
3171 if ($widget =~ /\t/) {
3172 my ($left, $right) = split /\t/, $widget, 2;
3173
3174 $widget = new CFClient::UI::HBox
3175 can_hover => 1,
3176 can_events => 1,
3177 tooltip => $tooltip,
3178 children => [
3179 (new CFClient::UI::Label markup => $left, expand => 1),
3180 (new CFClient::UI::Label markup => $right, align => +1),
3181 ],
3182 ;
3183
3184 } else {
2827 $widget = new CFClient::UI::Label 3185 $widget = new CFClient::UI::Label
2828 can_hover => 1, 3186 can_hover => 1,
2829 can_events => 1, 3187 can_events => 1,
2830 text => $widget; 3188 markup => $widget,
3189 tooltip => $tooltip;
3190 }
2831 } 3191 }
2832 3192
2833 $self->{item}{$widget} = $item; 3193 $self->{item}{$widget} = $item;
2834 3194
2835 $self->{vbox}->add ($widget); 3195 $self->{vbox}->add ($widget);
… …
2847 # maybe save $GRAB? must be careful about events... 3207 # maybe save $GRAB? must be careful about events...
2848 $GRAB = $self; 3208 $GRAB = $self;
2849 $self->{button} = $ev->{button}; 3209 $self->{button} = $ev->{button};
2850 3210
2851 $self->show; 3211 $self->show;
2852 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3212 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2853} 3213}
2854 3214
2855sub mouse_motion { 3215sub invoke_mouse_motion {
2856 my ($self, $ev, $x, $y) = @_; 3216 my ($self, $ev, $x, $y) = @_;
2857 3217
2858 # TODO: should use vbox->find_widget or so 3218 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3219 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER}; 3220 $self->{hover} = $self->{item}{$HOVER};
2861}
2862 3221
3222 0
3223}
3224
2863sub button_up { 3225sub invoke_button_up {
2864 my ($self, $ev, $x, $y) = @_; 3226 my ($self, $ev, $x, $y) = @_;
2865 3227
2866 if ($ev->{button} == $self->{button}) { 3228 if ($ev->{button} == $self->{button}) {
2867 undef $GRAB; 3229 undef $GRAB;
2868 $self->hide; 3230 $self->hide;
2869 3231
2870 $self->emit ("popdown"); 3232 $self->emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover}; 3233 $self->{hover}[1]->() if $self->{hover};
3234 } else {
3235 return 0
3236 }
3237
2872 } 3238 1
2873} 3239}
2874 3240
2875############################################################################# 3241#############################################################################
2876 3242
2877package CFClient::UI::Statusbox; 3243package CFClient::UI::Multiplexer;
2878 3244
2879our @ISA = CFClient::UI::VBox::; 3245our @ISA = CFClient::UI::Container::;
2880 3246
2881sub new { 3247sub new {
2882 my $class = shift; 3248 my $class = shift;
2883 3249
2884 $class->SUPER::new ( 3250 my $self = $class->SUPER::new (
3251 @_,
3252 );
3253
3254 $self->{current} = $self->{children}[0]
3255 if @{ $self->{children} };
3256
3257 $self
3258}
3259
3260sub add {
3261 my ($self, @widgets) = @_;
3262
3263 $self->SUPER::add (@widgets);
3264
3265 $self->{current} = $self->{children}[0]
3266 if @{ $self->{children} };
3267}
3268
3269sub get_current_page {
3270 my ($self) = @_;
3271
3272 $self->{current}
3273}
3274
3275sub set_current_page {
3276 my ($self, $page_or_widget) = @_;
3277
3278 my $widget = ref $page_or_widget
3279 ? $page_or_widget
3280 : $self->{children}[$page_or_widget];
3281
3282 $self->{current} = $widget;
3283 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3284
3285 $self->emit (page_changed => $self->{current});
3286
3287 $self->realloc;
3288}
3289
3290sub visible_children {
3291 $_[0]{current}
3292}
3293
3294sub size_request {
3295 my ($self) = @_;
3296
3297 $self->{current}->size_request
3298}
3299
3300sub invoke_size_allocate {
3301 my ($self, $w, $h) = @_;
3302
3303 $self->{current}->configure (0, 0, $w, $h);
3304
3305 1
3306}
3307
3308sub _draw {
3309 my ($self) = @_;
3310
3311 $self->{current}->draw;
3312}
3313
3314#############################################################################
3315
3316package CFClient::UI::Notebook;
3317
3318our @ISA = CFClient::UI::VBox::;
3319
3320sub new {
3321 my $class = shift;
3322
3323 my $self = $class->SUPER::new (
3324 buttonbar => (new CFClient::UI::Buttonbar),
3325 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3326 # filter => # will be put between multiplexer and $self
3327 @_,
3328 );
3329
3330 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3331 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3332
3333 $self
3334}
3335
3336sub add {
3337 my ($self, $title, $widget, $tooltip) = @_;
3338
3339 Scalar::Util::weaken $self;
3340
3341 $self->{buttonbar}->add (new CFClient::UI::Button
3342 markup => $title,
3343 tooltip => $tooltip,
3344 on_activate => sub { $self->set_current_page ($widget) },
3345 );
3346
3347 $self->{multiplexer}->add ($widget);
3348}
3349
3350sub get_current_page {
3351 my ($self) = @_;
3352
3353 $self->{multiplexer}->get_current_page
3354}
3355
3356sub set_current_page {
3357 my ($self, $page) = @_;
3358
3359 $self->{multiplexer}->set_current_page ($page);
3360 $self->emit (page_changed => $self->{multiplexer}{current});
3361}
3362
3363#############################################################################
3364
3365package CFClient::UI::Combobox;
3366
3367use utf8;
3368
3369our @ISA = CFClient::UI::Button::;
3370
3371sub new {
3372 my $class = shift;
3373
3374 my $self = $class->SUPER::new (
3375 options => [], # [value, title, longdesc], ...
3376 value => undef,
3377 @_,
3378 );
3379
3380 $self->_set_value ($self->{value});
3381
3382 $self
3383}
3384
3385sub invoke_button_down {
3386 my ($self, $ev) = @_;
3387
3388 my @menu_items;
3389
3390 for (@{ $self->{options} }) {
3391 my ($value, $title, $tooltip) = @$_;
3392
3393 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3394 }
3395
3396 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3397}
3398
3399sub _set_value {
3400 my ($self, $value) = @_;
3401
3402 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3403 or return;
3404
3405 $self->{value} = $item->[0];
3406 $self->set_markup ("$item->[1] ⇓");
3407 $self->set_tooltip ($item->[2]);
3408}
3409
3410sub set_value {
3411 my ($self, $value) = @_;
3412
3413 return unless $self->{value} ne $value;
3414
3415 $self->_set_value ($value);
3416 $self->emit (changed => $value);
3417}
3418
3419#############################################################################
3420
3421package CFClient::UI::Statusbox;
3422
3423our @ISA = CFClient::UI::VBox::;
3424
3425sub new {
3426 my $class = shift;
3427
3428 my $self = $class->SUPER::new (
2885 fontsize => 0.8, 3429 fontsize => 0.8,
2886 @_, 3430 @_,
2887 ) 3431 );
3432
3433 Scalar::Util::weaken (my $this = $self);
3434
3435 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3436
3437 $self
2888} 3438}
2889 3439
2890sub reorder { 3440sub reorder {
2891 my ($self) = @_; 3441 my ($self) = @_;
2892 my $NOW = time; 3442 my $NOW = Time::HiRes::time;
3443
3444 # freeze display when hovering over any label
3445 return if $CFClient::UI::TOOLTIP->{owner}
3446 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3447 values %{ $self->{item} };
2893 3448
2894 while (my ($k, $v) = each %{ $self->{item} }) { 3449 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3450 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 } 3451 }
2897 3452
… …
2900 my @items = sort { 3455 my @items = sort {
2901 $a->{pri} <=> $b->{pri} 3456 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id} 3457 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} }; 3458 } values %{ $self->{item} };
2904 3459
3460 $self->{timer}->interval (1);
3461
2905 my $count = 10 + 1; 3462 my $count = 10 + 1;
2906 for my $item (@items) { 3463 for my $item (@items) {
2907 last unless --$count; 3464 last unless --$count;
2908 3465
2909 push @widgets, $item->{label} ||= do { 3466 my $label = $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all) 3467 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1 3468 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}" 3469 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text}; 3470 : $item->{text};
2914 3471
… …
2922 tooltip => $item->{tooltip}, 3479 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP, 3480 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67, 3481 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize}, 3482 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44, 3483 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg}, 3484 fg => [@{ $item->{fg} }],
2928 can_events => 1, 3485 can_events => 1,
2929 can_hover => 1 3486 can_hover => 1
2930 }; 3487 };
3488
3489 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3490 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3491 $label->update;
3492 $label->set_max_size (undef, $label->{req_h} * $diff)
3493 if $diff < 1;
3494 $self->{timer}->interval (1/30);
3495 } else {
3496 $label->{fg}[3] = $item->{fg}[3] || 1;
3497 }
3498
3499 push @widgets, $label;
2931 } 3500 }
2932 3501
2933 $self->clear; 3502 $self->clear;
2934 $self->SUPER::add (reverse @widgets); 3503 $self->SUPER::add (reverse @widgets);
2935} 3504}
… …
2938 my ($self, $text, %arg) = @_; 3507 my ($self, $text, %arg) = @_;
2939 3508
2940 $text =~ s/^\s+//; 3509 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//; 3510 $text =~ s/\s+$//;
2942 3511
3512 return unless $text;
3513
2943 my $timeout = time + ((delete $arg{timeout}) || 60); 3514 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2944 3515
2945 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3516 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2946 3517
2947 if (my $item = $self->{item}{$group}) { 3518 if (my $item = $self->{item}{$group}) {
2948 if ($item->{text} eq $text) { 3519 if ($item->{text} eq $text) {
2949 $item->{count}++; 3520 $item->{count}++;
2950 } else { 3521 } else {
2951 $item->{count} = 1; 3522 $item->{count} = 1;
2952 $item->{text} = $item->{tooltip} = $text; 3523 $item->{text} = $item->{tooltip} = $text;
2953 } 3524 }
2954 $item->{id} = ++$self->{id}; 3525 $item->{id} += 0.2;#d#
2955 $item->{timeout} = $timeout; 3526 $item->{timeout} = $timeout;
2956 delete $item->{label}; 3527 delete $item->{label};
2957 } else { 3528 } else {
2958 $self->{item}{$group} = { 3529 $self->{item}{$group} = {
2959 id => ++$self->{id}, 3530 id => ++$self->{id},
… …
2965 count => 1, 3536 count => 1,
2966 %arg, 3537 %arg,
2967 }; 3538 };
2968 } 3539 }
2969 3540
3541 $ROOT->on_refresh (reorder => sub {
2970 $self->reorder; 3542 $self->reorder;
3543 });
2971} 3544}
2972 3545
2973sub reconfigure { 3546sub reconfigure {
2974 my ($self) = @_; 3547 my ($self) = @_;
2975 3548
… …
2978 3551
2979 $self->reorder; 3552 $self->reorder;
2980 $self->SUPER::reconfigure; 3553 $self->SUPER::reconfigure;
2981} 3554}
2982 3555
3556sub destroy {
3557 my ($self) = @_;
3558
3559 $self->{timer}->cancel;
3560
3561 $self->SUPER::destroy;
3562}
3563
2983############################################################################# 3564#############################################################################
2984 3565
2985package CFClient::UI::Root; 3566package CFClient::UI::Inventory;
2986 3567
2987our @ISA = CFClient::UI::Container::; 3568our @ISA = CFClient::UI::Table::;
2988
2989use CFClient::OpenGL;
2990 3569
2991sub new { 3570sub new {
2992 my $class = shift; 3571 my $class = shift;
2993 3572
2994 $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
3574 col_expand => [0, 1, 0],
3575 items => [],
3576 @_,
3577 );
3578
3579 $self->set_sort_order (undef);
3580
3581 $self
3582}
3583
3584sub update_items {
3585 my ($self) = @_;
3586
3587 $self->clear;
3588
3589 my @item = $self->{sort}->(@{ $self->{items} });
3590
3591 my @adds;
3592 my $row = 0;
3593 for my $item ($self->{sort}->(@{ $self->{items} })) {
3594 CFClient::Item::update_widgets $item;
3595
3596 push @adds, 0, $row, $item->{face_widget};
3597 push @adds, 1, $row, $item->{desc_widget};
3598 push @adds, 2, $row, $item->{weight_widget};
3599
3600 $row++;
3601 }
3602
3603 $self->add (@adds);
3604}
3605
3606sub set_sort_order {
3607 my ($self, $order) = @_;
3608
3609 $self->{sort} = $order ||= sub {
3610 sort {
3611 $a->{type} <=> $b->{type}
3612 or $a->{name} cmp $b->{name}
3613 } @_
3614 };
3615
3616 $self->update_items;
3617}
3618
3619sub set_items {
3620 my ($self, $items) = @_;
3621
3622 $self->{items} = [$items ? values %$items : ()];
3623 $self->update_items;
3624}
3625
3626#############################################################################
3627
3628package CFClient::UI::SpellList;
3629
3630our @ISA = CFClient::UI::Table::;
3631
3632sub new {
3633 my $class = shift;
3634
3635 my $self = $class->SUPER::new (
3636 binding => [],
3637 commands => [],
2995 @_, 3638 @_,
2996 ) 3639 )
2997} 3640}
2998 3641
2999sub configure { 3642my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3000 my ($self, $x, $y, $w, $h) = @_;
3001 3643
3002 $self->{w} = $w; 3644my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3003 $self->{h} = $h; 3645 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3004} 3646my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3648my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3649 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3650my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3652my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3005 3654
3006sub check_size { 3655sub rebuild_spell_list {
3656 my ($self) = @_;
3657
3658 $CFClient::UI::ROOT->on_refresh ($self => sub {
3659 $self->clear;
3660
3661 return unless $::CONN;
3662
3663 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3664 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3665 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3666 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3667 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3668
3669 my $row = 0;
3670
3671 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3672 my $spell = $self->{spell}{$_};
3673
3674 $row++;
3675
3676 my $spell_cb = sub {
3677 my ($widget, $ev) = @_;
3678
3679 if ($ev->{button} == 1) {
3680 $::CONN->user_send ("cast $spell->{name}");
3681 } elsif ($ev->{button} == 2) {
3682 $::CONN->user_send ("invoke $spell->{name}");
3683 } elsif ($ev->{button} == 3) {
3684 (new CFClient::UI::Menu
3685 items => [
3686 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3687 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3688 ],
3689 )->popup ($ev);
3690 } else {
3691 return 0;
3692 }
3693
3694 1
3695 };
3696
3697 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3698
3699 #TODO: add path info to tooltip
3700 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3701
3702 $self->add (0, $row, new CFClient::UI::Face
3703 face => $spell->{face},
3704 can_hover => 1,
3705 can_events => 1,
3706 tooltip => $tooltip,
3707 on_button_down => $spell_cb,
3708 );
3709
3710 $self->add (1, $row, new CFClient::UI::Label
3711 expand => 1,
3712 text => $spell->{name},
3713 can_hover => 1,
3714 can_events => 1,
3715 tooltip => $tooltip,
3716 on_button_down => $spell_cb,
3717 );
3718
3719 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3720 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3721 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3722 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3723 }
3724 });
3725}
3726
3727sub add_spell {
3007 my ($self) = @_; 3728 my ($self, $spell) = @_;
3008 3729
3009 $self->size_allocate ($self->{w}, $self->{h}) 3730 $self->{spell}->{$spell->{name}} = $spell;
3010 if $self->{w}; 3731 $self->rebuild_spell_list;
3732}
3733
3734sub remove_spell {
3735 my ($self, $spell) = @_;
3736
3737 delete $self->{spell}->{$spell->{name}};
3738 $self->rebuild_spell_list;
3739}
3740
3741sub clear_spells {
3742 my ($self) = @_;
3743
3744 $self->{spell} = {};
3745 $self->rebuild_spell_list;
3746}
3747
3748#############################################################################
3749
3750package CFClient::UI::Root;
3751
3752our @ISA = CFClient::UI::Container::;
3753
3754use List::Util qw(min max);
3755
3756use CFClient::OpenGL;
3757
3758sub new {
3759 my $class = shift;
3760
3761 my $self = $class->SUPER::new (
3762 visible => 1,
3763 @_,
3764 );
3765
3766 Scalar::Util::weaken ($self->{root} = $self);
3767
3768 $self
3011} 3769}
3012 3770
3013sub size_request { 3771sub size_request {
3014 my ($self) = @_; 3772 my ($self) = @_;
3015 3773
3016 ($self->{w}, $self->{h}) 3774 ($self->{w}, $self->{h})
3017} 3775}
3018 3776
3777sub _to_pixel {
3778 my ($coord, $size, $max) = @_;
3779
3780 $coord =
3781 $coord eq "center" ? ($max - $size) * 0.5
3782 : $coord eq "max" ? $max
3783 : $coord;
3784
3785 $coord = 0 if $coord < 0;
3786 $coord = $max - $size if $coord > $max - $size;
3787
3788 int $coord + 0.5
3789}
3790
3019sub size_allocate { 3791sub invoke_size_allocate {
3020 my ($self, $w, $h) = @_; 3792 my ($self, $w, $h) = @_;
3021
3022 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3023 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3024
3025 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3026 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3027 3793
3028 for my $child ($self->children) { 3794 for my $child ($self->children) {
3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3795 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030 3796
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3797 $X = $child->{force_x} if exists $child->{force_x};
3032 if exists $child->{req_x}; 3798 $Y = $child->{force_y} if exists $child->{force_y};
3033 3799
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3800 $X = _to_pixel $X, $W, $self->{w};
3035 if exists $child->{req_y}; 3801 $Y = _to_pixel $Y, $H, $self->{h};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 3802
3040 $child->configure ($X, $Y, $W, $H); 3803 $child->configure ($X, $Y, $W, $H);
3041 } 3804 }
3805
3806 1
3042} 3807}
3043 3808
3044sub coord2local { 3809sub coord2local {
3045 my ($self, $x, $y) = @_; 3810 my ($self, $x, $y) = @_;
3046 3811
… …
3054} 3819}
3055 3820
3056sub update { 3821sub update {
3057 my ($self) = @_; 3822 my ($self) = @_;
3058 3823
3059 $self->check_size;
3060 $::WANT_REFRESH++; 3824 $::WANT_REFRESH++;
3061} 3825}
3062 3826
3063sub add { 3827sub add {
3064 my ($self, @children) = @_; 3828 my ($self, @children) = @_;
3065 3829
3066 for my $child (@children) {
3067 $child->{toplevel} = 1; 3830 $_->{is_toplevel} = 1
3068 3831 for @children;
3069 # integerise window positions
3070 $child->{x} = int $child->{x};
3071 $child->{y} = int $child->{y};
3072 }
3073 3832
3074 $self->SUPER::add (@children); 3833 $self->SUPER::add (@children);
3834}
3835
3836sub remove {
3837 my ($self, @children) = @_;
3838
3839 $self->SUPER::remove (@children);
3840
3841 delete $self->{is_toplevel}
3842 for @children;
3075 3843
3076 while (@children) { 3844 while (@children) {
3077 my $w = pop @children; 3845 my $w = pop @children;
3078 push @children, $w->children; 3846 push @children, $w->children;
3079 $w->{visible} = 1; 3847 $w->set_invisible;
3080 }
3081}
3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 delete $w->{visible};
3092 } 3848 }
3093} 3849}
3094 3850
3095sub on_refresh { 3851sub on_refresh {
3096 my ($self, $id, $cb) = @_; 3852 my ($self, $id, $cb) = @_;
… …
3110 while ($self->{refresh_hook}) { 3866 while ($self->{refresh_hook}) {
3111 $_->() 3867 $_->()
3112 for values %{delete $self->{refresh_hook}}; 3868 for values %{delete $self->{refresh_hook}};
3113 } 3869 }
3114 3870
3115 if ($self->{check_size}) { 3871 if ($self->{realloc}) {
3116 my @queue = ([], []); 3872 my %queue;
3873 my @queue;
3874 my $widget;
3117 3875
3118 for (;;) { 3876 outer:
3119 if ($self->{check_size}) { 3877 while () {
3120 # heuristic: check containers last 3878 if (my $realloc = delete $self->{realloc}) {
3121 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3879 for $widget (values %$realloc) {
3122 for values %{delete $self->{check_size}} 3880 $widget->{visible} or next; # do not resize invisible widgets
3881
3882 $queue{$widget+0}++ and next; # duplicates are common
3883
3884 push @{ $queue[$widget->{visible}] }, $widget;
3885 }
3123 } 3886 }
3124 3887
3125 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3888 while () {
3889 @queue or last outer;
3126 3890
3127 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3891 $widget = pop @{ $queue[-1] || [] }
3128 ? @$widget{qw(user_w user_h)} 3892 and last;
3129 : $widget->size_request;
3130
3131 if (delete $widget->{force_alloc}
3132 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3133 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3134 3893
3894 pop @queue;
3895 }
3896
3897 delete $queue{$widget+0};
3898
3899 my ($w, $h) = $widget->size_request;
3900
3901 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3902 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3903
3904 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3905 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3906
3907 $w = $widget->{force_w} if exists $widget->{force_w};
3908 $h = $widget->{force_h} if exists $widget->{force_h};
3909
3910 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3911 || delete $widget->{force_realloc}) {
3135 $widget->{req_w} = $w; 3912 $widget->{req_w} = $w;
3136 $widget->{req_h} = $h; 3913 $widget->{req_h} = $h;
3137 3914
3138 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3915 $self->{size_alloc}{$widget+0} = $widget;
3139 3916
3140 $widget->{parent}->check_size
3141 if $widget->{parent}; 3917 if (my $parent = $widget->{parent}) {
3918 $self->{realloc}{$parent+0} = $parent
3919 unless $queue{$parent+0};
3920
3921 $parent->{force_size_alloc} = 1;
3922 $self->{size_alloc}{$parent+0} = $parent;
3923 }
3142 } 3924 }
3925
3926 delete $self->{realloc}{$widget+0};
3143 } 3927 }
3144 } 3928 }
3145 3929
3146 while ($self->{size_alloc}) { 3930 while (my $size_alloc = delete $self->{size_alloc}) {
3147 for (values %{delete $self->{size_alloc}}) { 3931 my @queue = sort { $b->{visible} <=> $a->{visible} }
3148 my ($widget, $w, $h) = @$_; 3932 values %$size_alloc;
3933
3934 while () {
3935 my $widget = pop @queue || last;
3936
3937 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3149 3938
3150 $w = 0 if $w < 0; 3939 $w = 0 if $w < 0;
3151 $h = 0 if $h < 0; 3940 $h = 0 if $h < 0;
3152 3941
3942 $w = max $widget->{min_w}, $w;
3943 $h = max $widget->{min_h}, $h;
3944
3945 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3946 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3947
3948 $w = int $w + 0.5;
3949 $h = int $h + 0.5;
3950
3951 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3952 $widget->{old_w} = $widget->{w};
3953 $widget->{old_h} = $widget->{h};
3954
3153 $widget->{w} = $w; 3955 $widget->{w} = $w;
3154 $widget->{h} = $h; 3956 $widget->{h} = $h;
3155 $widget->size_allocate ($w, $h); 3957
3156 $widget->emit (size_allocate => $w, $h); 3958 $widget->emit (size_allocate => $w, $h);
3959 }
3157 } 3960 }
3158 } 3961 }
3159 3962
3160 while ($self->{post_alloc_hook}) { 3963 while ($self->{post_alloc_hook}) {
3161 $_->() 3964 $_->()
3162 for values %{delete $self->{post_alloc_hook}}; 3965 for values %{delete $self->{post_alloc_hook}};
3163 } 3966 }
3967
3164 3968
3165 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3969 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3166 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3970 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3167 glClear GL_COLOR_BUFFER_BIT; 3971 glClear GL_COLOR_BUFFER_BIT;
3168 3972
… …
3170 glLoadIdentity; 3974 glLoadIdentity;
3171 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3975 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3172 glMatrixMode GL_MODELVIEW; 3976 glMatrixMode GL_MODELVIEW;
3173 glLoadIdentity; 3977 glLoadIdentity;
3174 3978
3979 {
3980 package CFClient::UI::Base;
3981
3982 ($draw_x, $draw_y, $draw_w, $draw_h) =
3983 (0, 0, $self->{w}, $self->{h});
3984 }
3985
3175 $self->_draw; 3986 $self->_draw;
3176} 3987}
3177 3988
3178############################################################################# 3989#############################################################################
3179 3990

Diff Legend

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