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.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.338 by root, Mon Jul 24 08:23:28 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;
… …
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, 0], 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
… …
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);
2134 2509
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136 2511
2137 $self->mouse_motion ($ev, $x, $y); 2512 $self->invoke_mouse_motion ($ev, $x, $y)
2138} 2513}
2139 2514
2140sub mouse_motion { 2515sub invoke_mouse_motion {
2141 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
2142 2517
2143 if ($GRAB == $self) { 2518 if ($GRAB == $self) {
2144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2519 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2145 2520
2146 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2521 my (undef, $lo, $hi, $page) = @{$self->{range}};
2147 2522
2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2523 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2149 2524
2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2525 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2526 } else {
2527 return 0;
2528 }
2529
2151 } 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
2152} 2541}
2153 2542
2154sub update { 2543sub update {
2155 my ($self) = @_; 2544 my ($self) = @_;
2156 2545
2157 $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}) {
2158 $self->set_value ($self->{range}[0]); 2554 $self->set_value ($self->{range}[0]);
2159 2555
2160 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2556 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100; 2557 my $range = ($hi - $page - $lo) || 1e-100;
2162 2558
… …
2168 $value = ($value - $lo) / $range; 2564 $value = ($value - $lo) / $range;
2169 $value = $value * $self->{scale} + $self->{offset}; 2565 $value = $value * $self->{scale} + $self->{offset};
2170 2566
2171 $self->{knob_x} = $value - $knob_w * 0.5; 2567 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $knob_w; 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_size { 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 );
2730
2307 $layout->size 2731 $layout
2308} 2732}
2309 2733
2310sub reflow { 2734sub reflow {
2311 my ($self) = @_; 2735 my ($self) = @_;
2312 2736
… …
2321 $self->{children}[1]->set_value ($offset); 2745 $self->{children}[1]->set_value ($offset);
2322} 2746}
2323 2747
2324sub clear { 2748sub clear {
2325 my ($self) = @_; 2749 my ($self) = @_;
2750
2751 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other;
2326 2753
2327 $self->{par} = []; 2754 $self->{par} = [];
2328 $self->{height} = 0; 2755 $self->{height} = 0;
2329 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2330} 2757}
2331 2758
2332sub add_paragraph { 2759sub add_paragraph {
2333 my ($self, $color, $text, $indent) = @_; 2760 my $self = shift;
2334 2761
2335 for my $line (split /\n/, $text) { 2762 for my $para (@_) {
2336 my ($w, $h) = $self->text_size ($line); 2763 $para = {
2337 $self->{height} += $h; 2764 fg => [1, 1, 1, 1],
2338 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2765 indent => 0,
2339 } 2766 markup => "",
2767 widget => [],
2768 ref $para ? %$para : (markup => $para),
2769 w => 1e10,
2770 wrapped => 1,
2771 };
2340 2772
2341 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2773 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para;
2775 }
2776
2777 $self->{need_reflow}++;
2778 $self->update;
2779}
2780
2781sub scroll_to_bottom {
2782 my ($self) = @_;
2783
2784 $self->{scroll_to_bottom} = 1;
2785 $self->update;
2342} 2786}
2343 2787
2344sub update { 2788sub update {
2345 my ($self) = @_; 2789 my ($self) = @_;
2346 2790
… …
2348 2792
2349 return unless $self->{h} > 0; 2793 return unless $self->{h} > 0;
2350 2794
2351 delete $self->{texture}; 2795 delete $self->{texture};
2352 2796
2353 $ROOT->on_post_alloc ($self, sub { 2797 $ROOT->on_post_alloc ($self => sub {
2354 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2798 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2355 2799
2356 if (delete $self->{need_reflow}) { 2800 if (delete $self->{need_reflow}) {
2357 my $height = 0; 2801 my $height = 0;
2358 2802
2359 my $layout = $self->{layout};
2360
2361 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2362
2363 for (@{$self->{par}}) { 2803 for my $para (@{$self->{par}}) {
2364 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2804 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2365 $layout->set_width ($W - $_->[3]); 2805 my $layout = $self->get_layout ($para);
2366 $layout->set_markup ($_->[4]);
2367 my ($w, $h) = $layout->size; 2806 my ($w, $h) = $layout->size;
2368 $_->[0] = $w + $_->[3]; 2807
2369 $_->[1] = $h; 2808 $para->{w} = $w + $para->{indent};
2809 $para->{h} = $h;
2810 $para->{wrapped} = $layout->has_wrapped;
2370 } 2811 }
2371 2812
2372 $height += $_->[1]; 2813 $height += $para->{h};
2373 } 2814 }
2374 2815
2375 $self->{height} = $height; 2816 $self->{height} = $height;
2376 2817
2377 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2818 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2378 2819
2379 delete $self->{texture}; 2820 delete $self->{texture};
2380 } 2821 }
2381 2822
2823 if (delete $self->{scroll_to_bottom}) {
2824 $self->{children}[1]->set_value (1e10);
2825 }
2826
2382 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2827 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2383 glClearColor 0.5, 0.5, 0.5, 0; 2828 glClearColor 0, 0, 0, 0;
2384 glClear GL_COLOR_BUFFER_BIT; 2829 glClear GL_COLOR_BUFFER_BIT;
2385 2830
2386 my $top = int $self->{children}[1]{range}[0]; 2831 my $top = int $self->{children}[1]{range}[0];
2387 2832
2388 my $y0 = $top; 2833 my $y0 = $top;
2389 my $y1 = $top + $H; 2834 my $y1 = $top + $H;
2390 2835
2391 my $y = 0; 2836 my $y = 0;
2392 2837
2393 my $layout = $self->{layout};
2394
2395 $layout->set_font ($self->{font}) if $self->{font};
2396
2397 glEnable GL_BLEND;
2398 #TODO# not correct in windows where rgba is forced off
2399 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2400
2401 for my $par (@{$self->{par}}) { 2838 for my $para (@{$self->{par}}) {
2402 my $h = $par->[1]; 2839 my $h = $para->{h};
2403 2840
2404 if ($y0 < $y + $h && $y < $y1) { 2841 if ($y0 < $y + $h && $y < $y1) {
2405 $layout->set_foreground (@{ $par->[2] });
2406 $layout->set_width ($W - $par->[3]);
2407 $layout->set_markup ($par->[4]);
2408 2842
2409 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2843 my $layout = $self->get_layout ($para);
2410 2844
2411 glRasterPos $par->[3], $y - $y0; 2845 $layout->render ($para->{indent}, $y - $y0);
2412 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2846
2847 if (my @w = @{ $para->{widget} }) {
2848 my @s = $layout->get_shapes;
2849
2850 for (@w) {
2851 my ($dx, $dy) = splice @s, 0, 2, ();
2852
2853 $_->{x} = $dx + $para->{indent};
2854 $_->{y} = $dy + $y - $y0;
2855
2856 $_->draw;
2857 }
2858 }
2413 } 2859 }
2414 2860
2415 $y += $h; 2861 $y += $h;
2416 } 2862 }
2417
2418 glDisable GL_BLEND;
2419 }; 2863 };
2420 }); 2864 });
2421} 2865}
2422 2866
2867sub reconfigure {
2868 my ($self) = @_;
2869
2870 $self->SUPER::reconfigure;
2871
2872 $_->{w} = 1e10 for @{ $self->{par} };
2873 $self->reflow;
2874}
2875
2423sub _draw { 2876sub _draw {
2424 my ($self) = @_; 2877 my ($self) = @_;
2425 2878
2426 glEnable GL_TEXTURE_2D; 2879 glEnable GL_TEXTURE_2D;
2427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2880 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2428 glColor 1, 1, 1, 1; 2881 glColor 0, 0, 0, 1;
2429 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2882 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2430 glDisable GL_TEXTURE_2D; 2883 glDisable GL_TEXTURE_2D;
2431 2884
2432 $self->{children}[1]->draw; 2885 $self->{children}[1]->draw;
2433
2434} 2886}
2435 2887
2436############################################################################# 2888#############################################################################
2437 2889
2438package CFClient::UI::Animator; 2890package CFClient::UI::Animator;
… …
2483 2935
2484sub new { 2936sub new {
2485 my $class = shift; 2937 my $class = shift;
2486 2938
2487 my $self = $class->SUPER::new ( 2939 my $self = $class->SUPER::new (
2488 state => 0, 2940 state => 0,
2489 connect_activate => \&toggle_flopper, 2941 on_activate => \&toggle_flopper,
2490 @_ 2942 @_
2491 ); 2943 );
2492 2944
2493 if ($self->{state}) {
2494 $self->{state} = 0;
2495 $self->toggle_flopper;
2496 }
2497
2498 $self 2945 $self
2499} 2946}
2500 2947
2501sub toggle_flopper { 2948sub toggle_flopper {
2502 my ($self) = @_; 2949 my ($self) = @_;
2503 2950
2504 # TODO: use animation 2951 $self->{other}->toggle_visibility;
2505 if ($self->{state} = !$self->{state}) {
2506 $CFClient::UI::ROOT->add ($self->{other});
2507 $self->{other}->move ($self->coord2global (0, $self->{h}));
2508 $self->emit ("open");
2509 } else {
2510 $CFClient::UI::ROOT->remove ($self->{other});
2511 $self->emit ("close");
2512 }
2513
2514 $self->emit (changed => $self->{state});
2515} 2952}
2516 2953
2517############################################################################# 2954#############################################################################
2518 2955
2519package CFClient::UI::Tooltip; 2956package CFClient::UI::Tooltip;
… …
2532} 2969}
2533 2970
2534sub set_tooltip_from { 2971sub set_tooltip_from {
2535 my ($self, $widget) = @_; 2972 my ($self, $widget) = @_;
2536 2973
2974 my $tooltip = $widget->{tooltip};
2975
2976 if ($ENV{CFPLUS_DEBUG} & 2) {
2977 $tooltip .= "\n\n" . (ref $widget) . "\n"
2978 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2979 . "req $widget->{req_w} $widget->{req_h}\n"
2980 . "visible $widget->{visible}";
2981 }
2982
2983 $tooltip =~ s/^\n+//;
2984 $tooltip =~ s/\n+$//;
2985
2537 $self->add (new CFClient::UI::Label 2986 $self->add (new CFClient::UI::Label
2538 markup => $widget->{tooltip}, 2987 markup => $tooltip,
2539 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2988 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2540 fontsize => 0.8, 2989 fontsize => 0.8,
2541 fg => [0, 0, 0, 1], 2990 fg => [0, 0, 0, 1],
2542 ellipsise => 0, 2991 ellipsise => 0,
2543 font => ($widget->{tooltip_font} || $::FONT_PROP), 2992 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2550 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2999 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2551 3000
2552 ($w + 4, $h + 4) 3001 ($w + 4, $h + 4)
2553} 3002}
2554 3003
2555sub size_allocate { 3004sub invoke_size_allocate {
2556 my ($self, $w, $h) = @_; 3005 my ($self, $w, $h) = @_;
2557 3006
2558 $self->SUPER::size_allocate ($w - 4, $h - 4); 3007 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3008}
3009
3010sub invoke_visibility_change {
3011 my ($self, $visible) = @_;
3012
3013 return unless $visible;
3014
3015 $self->{root}->on_post_alloc ("move_$self" => sub {
3016 my $widget = $self->{owner}
3017 or return;
3018
3019 if ($widget->{visible}) {
3020 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3021
3022 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3023 if $x + $self->{w} > $self->{root}{w};
3024
3025 $self->move_abs ($x, $y);
3026 } else {
3027 $self->hide;
3028 }
3029 });
2559} 3030}
2560 3031
2561sub _draw { 3032sub _draw {
2562 my ($self) = @_; 3033 my ($self) = @_;
2563 3034
… …
2580 glVertex $w, $h; 3051 glVertex $w, $h;
2581 glVertex $w, 0; 3052 glVertex $w, 0;
2582 glEnd; 3053 glEnd;
2583 3054
2584 glTranslate 2 - 0.375, 2 - 0.375; 3055 glTranslate 2 - 0.375, 2 - 0.375;
3056
2585 $self->SUPER::_draw; 3057 $self->SUPER::_draw;
2586} 3058}
2587 3059
2588############################################################################# 3060#############################################################################
2589 3061
2590package CFClient::UI::Face; 3062package CFClient::UI::Face;
2591 3063
2592our @ISA = CFClient::UI::Base::; 3064our @ISA = CFClient::UI::DrawBG::;
2593 3065
2594use CFClient::OpenGL; 3066use CFClient::OpenGL;
2595 3067
2596sub new { 3068sub new {
2597 my $class = shift; 3069 my $class = shift;
2598 3070
2599 my $self = $class->SUPER::new ( 3071 my $self = $class->SUPER::new (
2600 aspect => 1, 3072 aspect => 1,
3073 can_events => 0,
2601 @_, 3074 @_,
2602 ); 3075 );
2603 3076
2604 if ($self->{anim} && $self->{animspeed}) { 3077 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self); 3078 Scalar::Util::weaken (my $widget = $self);
… …
2633sub _draw { 3106sub _draw {
2634 my ($self) = @_; 3107 my ($self) = @_;
2635 3108
2636 return unless $::CONN; 3109 return unless $::CONN;
2637 3110
3111 $self->SUPER::_draw;
3112
2638 my $face; 3113 my $face;
2639 3114
2640 if ($self->{frame}) { 3115 if ($self->{frame}) {
2641 my $anim = $::CONN->{anim}[$self->{anim}]; 3116 my $anim = $::CONN->{anim}[$self->{anim}];
2642 3117
… …
2647 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3122 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2648 3123
2649 if ($tex) { 3124 if ($tex) {
2650 glEnable GL_TEXTURE_2D; 3125 glEnable GL_TEXTURE_2D;
2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3126 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2652 glColor 1, 1, 1, 1; 3127 glColor 0, 0, 0, 1;
2653 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3128 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2654 glDisable GL_TEXTURE_2D; 3129 glDisable GL_TEXTURE_2D;
2655 } 3130 }
2656} 3131}
2657 3132
2658sub DESTROY { 3133sub destroy {
2659 my ($self) = @_; 3134 my ($self) = @_;
2660 3135
2661 $self->{timer}->cancel 3136 $self->{timer}->cancel
2662 if $self->{timer}; 3137 if $self->{timer};
2663 3138
2664 $self->SUPER::DESTROY; 3139 $self->SUPER::destroy;
2665} 3140}
2666 3141
2667############################################################################# 3142#############################################################################
2668 3143
2669package CFClient::UI::InventoryItem; 3144package CFClient::UI::Buttonbar;
2670 3145
2671our @ISA = CFClient::UI::HBox::; 3146our @ISA = CFClient::UI::HBox::;
2672 3147
2673sub _item_to_desc { 3148# TODO: should actualyl wrap buttons and other goodies.
2674 my ($item) = @_;
2675
2676 my $desc =
2677 $item->{nrof} < 2
2678 ? $item->{name}
2679 : "$item->{nrof} × $item->{name_pl}";
2680
2681 $item->{flags} & Crossfire::Protocol::F_OPEN
2682 and $desc .= " (open)";
2683 $item->{flags} & Crossfire::Protocol::F_APPLIED
2684 and $desc .= " (applied)";
2685 $item->{flags} & Crossfire::Protocol::F_UNPAID
2686 and $desc .= " (unpaid)";
2687 $item->{flags} & Crossfire::Protocol::F_MAGIC
2688 and $desc .= " (magic)";
2689 $item->{flags} & Crossfire::Protocol::F_CURSED
2690 and $desc .= " (cursed)";
2691 $item->{flags} & Crossfire::Protocol::F_DAMNED
2692 and $desc .= " (damned)";
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED
2694 and $desc .= " *";
2695
2696 $desc
2697}
2698
2699sub new {
2700 my $class = shift;
2701
2702 my %args = @_;
2703
2704 my $item = delete $args{item};
2705
2706 my $desc = _item_to_desc ($item);
2707
2708 my $self = $class->SUPER::new (
2709 can_hover => 1,
2710 can_events => 1,
2711 tooltip => ((CFClient::UI::Label::escape $desc)
2712 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2713 connect_button_down => sub {
2714 my ($self, $ev, $x, $y) = @_;
2715
2716 # todo: maybe put examine on 1? but should just be a tooltip :(
2717 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718 my $targ = $::CONN->{player}{tag};
2719
2720 if ($item->{container} == $::CONN->{player}{tag}) {
2721 $targ = $main::OPENCONT;
2722 }
2723
2724 $::CONN->send ("move $targ $item->{tag} 0");
2725 } elsif ($ev->{button} == 1) {
2726 $::CONN->send ("examine $item->{tag}");
2727 } elsif ($ev->{button} == 2) {
2728 $::CONN->send ("apply $item->{tag}");
2729 } elsif ($ev->{button} == 3) {
2730 my @menu_items = (
2731 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2732 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2733 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734 (
2735 $item->{flags} & Crossfire::Protocol::F_LOCKED
2736 ? (
2737 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738 )
2739 : (
2740 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2741 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742 )
2743 ),
2744 );
2745
2746 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2747 }
2748
2749 1
2750 },
2751 %args
2752 );
2753
2754
2755 $self->add (new CFClient::UI::Face
2756 can_events => 0,
2757 face => $item->{face},
2758 anim => $item->{anim},
2759 animspeed => $item->{animspeed},
2760 );
2761
2762 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2763
2764 $self->{item} = $item;
2765
2766 $self->update_item;
2767
2768 $self
2769}
2770
2771sub update_item {
2772 my ($self) = @_;
2773
2774 my $desc = _item_to_desc ($self->{item});
2775
2776 $self->{name_lbl}->set_text ($desc);
2777}
2778
2779#############################################################################
2780
2781package CFClient::UI::Inventory;
2782
2783our @ISA = CFClient::UI::ScrolledWindow::;
2784
2785sub new {
2786 my $class = shift;
2787
2788 my $self = $class->SUPER::new (
2789 scrolled => (new CFClient::UI::Table),
2790 @_,
2791 );
2792
2793 $self
2794}
2795
2796sub set_items {
2797 my ($self, $items) = @_;
2798
2799 $self->{scrolled}->clear;
2800 return unless $items;
2801
2802 my @items = sort {
2803 ($a->{type} <=> $b->{type})
2804 or ($a->{name} cmp $b->{name})
2805 } @$items;
2806
2807 $self->{real_items} = \@items;
2808
2809 for my $item (@items) {
2810 $item->{item} = $item;
2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812 $item->update_item ();
2813 }
2814
2815 my $i = 0;
2816 for (@items) {
2817 $self->{scrolled}->add (0, $i, $_);
2818 my $nrof = $_->{item}->{nrof} || 1;
2819 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820 }
2821
2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2823}
2824
2825sub size_request {
2826 my ($self) = @_;
2827 ($self->{req_w}, $self->{req_h});
2828}
2829 3149
2830############################################################################# 3150#############################################################################
2831 3151
2832package CFClient::UI::Menu; 3152package CFClient::UI::Menu;
2833 3153
… …
2845 ); 3165 );
2846 3166
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3167 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2848 3168
2849 for my $item (@{ $self->{items} }) { 3169 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3170 my ($widget, $cb, $tooltip) = @$item;
2851 3171
2852 # handle various types of items, only text for now 3172 # handle various types of items, only text for now
2853 if (!ref $widget) { 3173 if (!ref $widget) {
3174 if ($widget =~ /\t/) {
3175 my ($left, $right) = split /\t/, $widget, 2;
3176
3177 $widget = new CFClient::UI::HBox
3178 can_hover => 1,
3179 can_events => 1,
3180 tooltip => $tooltip,
3181 children => [
3182 (new CFClient::UI::Label markup => $left, expand => 1),
3183 (new CFClient::UI::Label markup => $right, align => +1),
3184 ],
3185 ;
3186
3187 } else {
2854 $widget = new CFClient::UI::Label 3188 $widget = new CFClient::UI::Label
2855 can_hover => 1, 3189 can_hover => 1,
2856 can_events => 1, 3190 can_events => 1,
2857 text => $widget; 3191 markup => $widget,
3192 tooltip => $tooltip;
3193 }
2858 } 3194 }
2859 3195
2860 $self->{item}{$widget} = $item; 3196 $self->{item}{$widget} = $item;
2861 3197
2862 $self->{vbox}->add ($widget); 3198 $self->{vbox}->add ($widget);
… …
2874 # maybe save $GRAB? must be careful about events... 3210 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3211 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3212 $self->{button} = $ev->{button};
2877 3213
2878 $self->show; 3214 $self->show;
2879 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3215 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880} 3216}
2881 3217
2882sub mouse_motion { 3218sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3219 my ($self, $ev, $x, $y) = @_;
2884 3220
2885 # TODO: should use vbox->find_widget or so 3221 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3222 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3223 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3224
3225 0
3226}
3227
2890sub button_up { 3228sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3229 my ($self, $ev, $x, $y) = @_;
2892 3230
2893 if ($ev->{button} == $self->{button}) { 3231 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3232 undef $GRAB;
2895 $self->hide; 3233 $self->hide;
2896 3234
2897 $self->emit ("popdown"); 3235 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3236 $self->{hover}[1]->() if $self->{hover};
3237 } else {
3238 return 0
3239 }
3240
2899 } 3241 1
2900} 3242}
2901 3243
2902############################################################################# 3244#############################################################################
2903 3245
2904package CFClient::UI::Statusbox; 3246package CFClient::UI::Multiplexer;
2905 3247
2906our @ISA = CFClient::UI::VBox::; 3248our @ISA = CFClient::UI::Container::;
2907 3249
2908sub new { 3250sub new {
2909 my $class = shift; 3251 my $class = shift;
2910 3252
2911 $class->SUPER::new ( 3253 my $self = $class->SUPER::new (
3254 @_,
3255 );
3256
3257 $self->{current} = $self->{children}[0]
3258 if @{ $self->{children} };
3259
3260 $self
3261}
3262
3263sub add {
3264 my ($self, @widgets) = @_;
3265
3266 $self->SUPER::add (@widgets);
3267
3268 $self->{current} = $self->{children}[0]
3269 if @{ $self->{children} };
3270}
3271
3272sub get_current_page {
3273 my ($self) = @_;
3274
3275 $self->{current}
3276}
3277
3278sub set_current_page {
3279 my ($self, $page_or_widget) = @_;
3280
3281 my $widget = ref $page_or_widget
3282 ? $page_or_widget
3283 : $self->{children}[$page_or_widget];
3284
3285 $self->{current} = $widget;
3286 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3287
3288 $self->emit (page_changed => $self->{current});
3289
3290 $self->realloc;
3291}
3292
3293sub visible_children {
3294 $_[0]{current}
3295}
3296
3297sub size_request {
3298 my ($self) = @_;
3299
3300 $self->{current}->size_request
3301}
3302
3303sub invoke_size_allocate {
3304 my ($self, $w, $h) = @_;
3305
3306 $self->{current}->configure (0, 0, $w, $h);
3307
3308 1
3309}
3310
3311sub _draw {
3312 my ($self) = @_;
3313
3314 $self->{current}->draw;
3315}
3316
3317#############################################################################
3318
3319package CFClient::UI::Notebook;
3320
3321our @ISA = CFClient::UI::VBox::;
3322
3323sub new {
3324 my $class = shift;
3325
3326 my $self = $class->SUPER::new (
3327 buttonbar => (new CFClient::UI::Buttonbar),
3328 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3329 # filter => # will be put between multiplexer and $self
3330 @_,
3331 );
3332
3333 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3334 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3335
3336 $self
3337}
3338
3339sub add {
3340 my ($self, $title, $widget, $tooltip) = @_;
3341
3342 Scalar::Util::weaken $self;
3343
3344 $self->{buttonbar}->add (new CFClient::UI::Button
3345 markup => $title,
3346 tooltip => $tooltip,
3347 on_activate => sub { $self->set_current_page ($widget) },
3348 );
3349
3350 $self->{multiplexer}->add ($widget);
3351}
3352
3353sub get_current_page {
3354 my ($self) = @_;
3355
3356 $self->{multiplexer}->get_current_page
3357}
3358
3359sub set_current_page {
3360 my ($self, $page) = @_;
3361
3362 $self->{multiplexer}->set_current_page ($page);
3363 $self->emit (page_changed => $self->{multiplexer}{current});
3364}
3365
3366#############################################################################
3367
3368package CFClient::UI::Selector;
3369
3370use utf8;
3371
3372our @ISA = CFClient::UI::Button::;
3373
3374sub new {
3375 my $class = shift;
3376
3377 my $self = $class->SUPER::new (
3378 options => [], # [value, title, longdesc], ...
3379 value => undef,
3380 @_,
3381 );
3382
3383 $self->_set_value ($self->{value});
3384
3385 $self
3386}
3387
3388sub invoke_button_down {
3389 my ($self, $ev) = @_;
3390
3391 my @menu_items;
3392
3393 for (@{ $self->{options} }) {
3394 my ($value, $title, $tooltip) = @$_;
3395
3396 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397 }
3398
3399 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400}
3401
3402sub _set_value {
3403 my ($self, $value) = @_;
3404
3405 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3406 or return;
3407
3408 $self->{value} = $item->[0];
3409 $self->set_markup ("$item->[1] ⇓");
3410 $self->set_tooltip ($item->[2]);
3411}
3412
3413sub set_value {
3414 my ($self, $value) = @_;
3415
3416 return unless $self->{value} ne $value;
3417
3418 $self->_set_value ($value);
3419 $self->emit (changed => $value);
3420}
3421
3422#############################################################################
3423
3424package CFClient::UI::Statusbox;
3425
3426our @ISA = CFClient::UI::VBox::;
3427
3428sub new {
3429 my $class = shift;
3430
3431 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3432 fontsize => 0.8,
2913 @_, 3433 @_,
2914 ) 3434 );
3435
3436 Scalar::Util::weaken (my $this = $self);
3437
3438 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3439
3440 $self
2915} 3441}
2916 3442
2917sub reorder { 3443sub reorder {
2918 my ($self) = @_; 3444 my ($self) = @_;
2919 my $NOW = time; 3445 my $NOW = Time::HiRes::time;
3446
3447 # freeze display when hovering over any label
3448 return if $CFClient::UI::TOOLTIP->{owner}
3449 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3450 values %{ $self->{item} };
2920 3451
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3452 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3453 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3454 }
2924 3455
… …
2927 my @items = sort { 3458 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3459 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3460 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3461 } values %{ $self->{item} };
2931 3462
3463 $self->{timer}->interval (1);
3464
2932 my $count = 10 + 1; 3465 my $count = 10 + 1;
2933 for my $item (@items) { 3466 for my $item (@items) {
2934 last unless --$count; 3467 last unless --$count;
2935 3468
2936 push @widgets, $item->{label} ||= do { 3469 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3470 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3471 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3472 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3473 : $item->{text};
2941 3474
… …
2949 tooltip => $item->{tooltip}, 3482 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3483 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3484 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3485 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3486 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3487 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3488 can_events => 1,
2956 can_hover => 1 3489 can_hover => 1
2957 }; 3490 };
3491
3492 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3493 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3494 $label->update;
3495 $label->set_max_size (undef, $label->{req_h} * $diff)
3496 if $diff < 1;
3497 $self->{timer}->interval (1/30);
3498 } else {
3499 $label->{fg}[3] = $item->{fg}[3] || 1;
3500 }
3501
3502 push @widgets, $label;
2958 } 3503 }
2959 3504
2960 $self->clear; 3505 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3506 $self->SUPER::add (reverse @widgets);
2962} 3507}
… …
2965 my ($self, $text, %arg) = @_; 3510 my ($self, $text, %arg) = @_;
2966 3511
2967 $text =~ s/^\s+//; 3512 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3513 $text =~ s/\s+$//;
2969 3514
3515 return unless $text;
3516
2970 my $timeout = time + ((delete $arg{timeout}) || 60); 3517 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2971 3518
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3519 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973 3520
2974 if (my $item = $self->{item}{$group}) { 3521 if (my $item = $self->{item}{$group}) {
2975 if ($item->{text} eq $text) { 3522 if ($item->{text} eq $text) {
2976 $item->{count}++; 3523 $item->{count}++;
2977 } else { 3524 } else {
2978 $item->{count} = 1; 3525 $item->{count} = 1;
2979 $item->{text} = $item->{tooltip} = $text; 3526 $item->{text} = $item->{tooltip} = $text;
2980 } 3527 }
2981 $item->{id} = ++$self->{id}; 3528 $item->{id} += 0.2;#d#
2982 $item->{timeout} = $timeout; 3529 $item->{timeout} = $timeout;
2983 delete $item->{label}; 3530 delete $item->{label};
2984 } else { 3531 } else {
2985 $self->{item}{$group} = { 3532 $self->{item}{$group} = {
2986 id => ++$self->{id}, 3533 id => ++$self->{id},
… …
2992 count => 1, 3539 count => 1,
2993 %arg, 3540 %arg,
2994 }; 3541 };
2995 } 3542 }
2996 3543
3544 $ROOT->on_refresh (reorder => sub {
2997 $self->reorder; 3545 $self->reorder;
3546 });
2998} 3547}
2999 3548
3000sub reconfigure { 3549sub reconfigure {
3001 my ($self) = @_; 3550 my ($self) = @_;
3002 3551
… …
3005 3554
3006 $self->reorder; 3555 $self->reorder;
3007 $self->SUPER::reconfigure; 3556 $self->SUPER::reconfigure;
3008} 3557}
3009 3558
3559sub destroy {
3560 my ($self) = @_;
3561
3562 $self->{timer}->cancel;
3563
3564 $self->SUPER::destroy;
3565}
3566
3010############################################################################# 3567#############################################################################
3011 3568
3012package CFClient::UI::Root; 3569package CFClient::UI::Inventory;
3013 3570
3014our @ISA = CFClient::UI::Container::; 3571our @ISA = CFClient::UI::Table::;
3015
3016use CFClient::OpenGL;
3017 3572
3018sub new { 3573sub new {
3019 my $class = shift; 3574 my $class = shift;
3020 3575
3021 $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
3577 col_expand => [0, 1, 0],
3578 items => [],
3579 @_,
3580 );
3581
3582 $self->set_sort_order (undef);
3583
3584 $self
3585}
3586
3587sub update_items {
3588 my ($self) = @_;
3589
3590 $self->clear;
3591
3592 my @item = $self->{sort}->(@{ $self->{items} });
3593
3594 my @adds;
3595 my $row = 0;
3596 for my $item ($self->{sort}->(@{ $self->{items} })) {
3597 CFClient::Item::update_widgets $item;
3598
3599 push @adds, 0, $row, $item->{face_widget};
3600 push @adds, 1, $row, $item->{desc_widget};
3601 push @adds, 2, $row, $item->{weight_widget};
3602
3603 $row++;
3604 }
3605
3606 $self->add (@adds);
3607}
3608
3609sub set_sort_order {
3610 my ($self, $order) = @_;
3611
3612 $self->{sort} = $order ||= sub {
3613 sort {
3614 $a->{type} <=> $b->{type}
3615 or $a->{name} cmp $b->{name}
3616 } @_
3617 };
3618
3619 $self->update_items;
3620}
3621
3622sub set_items {
3623 my ($self, $items) = @_;
3624
3625 $self->{items} = [$items ? values %$items : ()];
3626 $self->update_items;
3627}
3628
3629#############################################################################
3630
3631package CFClient::UI::SpellList;
3632
3633our @ISA = CFClient::UI::Table::;
3634
3635sub new {
3636 my $class = shift;
3637
3638 my $self = $class->SUPER::new (
3639 binding => [],
3640 commands => [],
3022 @_, 3641 @_,
3023 ) 3642 )
3024} 3643}
3025 3644
3026sub configure { 3645my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3027 my ($self, $x, $y, $w, $h) = @_;
3028 3646
3029 $self->{w} = $w; 3647my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3030 $self->{h} = $h; 3648 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3031} 3649my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3650 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3651my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3652 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3653my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3654 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3655my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3032 3657
3033sub check_size { 3658sub rebuild_spell_list {
3659 my ($self) = @_;
3660
3661 $CFClient::UI::ROOT->on_refresh ($self => sub {
3662 $self->clear;
3663
3664 return unless $::CONN;
3665
3666 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3667 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3668 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3669 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3670 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3671
3672 my $row = 0;
3673
3674 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3675 my $spell = $self->{spell}{$_};
3676
3677 $row++;
3678
3679 my $spell_cb = sub {
3680 my ($widget, $ev) = @_;
3681
3682 if ($ev->{button} == 1) {
3683 $::CONN->user_send ("cast $spell->{name}");
3684 } elsif ($ev->{button} == 2) {
3685 $::CONN->user_send ("invoke $spell->{name}");
3686 } elsif ($ev->{button} == 3) {
3687 (new CFClient::UI::Menu
3688 items => [
3689 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3690 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3691 ],
3692 )->popup ($ev);
3693 } else {
3694 return 0;
3695 }
3696
3697 1
3698 };
3699
3700 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3701
3702 #TODO: add path info to tooltip
3703 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3704
3705 $self->add (0, $row, new CFClient::UI::Face
3706 face => $spell->{face},
3707 can_hover => 1,
3708 can_events => 1,
3709 tooltip => $tooltip,
3710 on_button_down => $spell_cb,
3711 );
3712
3713 $self->add (1, $row, new CFClient::UI::Label
3714 expand => 1,
3715 text => $spell->{name},
3716 can_hover => 1,
3717 can_events => 1,
3718 tooltip => $tooltip,
3719 on_button_down => $spell_cb,
3720 );
3721
3722 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3723 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3724 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3725 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3726 }
3727 });
3728}
3729
3730sub add_spell {
3034 my ($self) = @_; 3731 my ($self, $spell) = @_;
3035 3732
3036 $self->size_allocate ($self->{w}, $self->{h}) 3733 $self->{spell}->{$spell->{name}} = $spell;
3037 if $self->{w}; 3734 $self->rebuild_spell_list;
3735}
3736
3737sub remove_spell {
3738 my ($self, $spell) = @_;
3739
3740 delete $self->{spell}->{$spell->{name}};
3741 $self->rebuild_spell_list;
3742}
3743
3744sub clear_spells {
3745 my ($self) = @_;
3746
3747 $self->{spell} = {};
3748 $self->rebuild_spell_list;
3749}
3750
3751#############################################################################
3752
3753package CFClient::UI::Root;
3754
3755our @ISA = CFClient::UI::Container::;
3756
3757use List::Util qw(min max);
3758
3759use CFClient::OpenGL;
3760
3761sub new {
3762 my $class = shift;
3763
3764 my $self = $class->SUPER::new (
3765 visible => 1,
3766 @_,
3767 );
3768
3769 Scalar::Util::weaken ($self->{root} = $self);
3770
3771 $self
3038} 3772}
3039 3773
3040sub size_request { 3774sub size_request {
3041 my ($self) = @_; 3775 my ($self) = @_;
3042 3776
3043 ($self->{w}, $self->{h}) 3777 ($self->{w}, $self->{h})
3044} 3778}
3045 3779
3780sub _to_pixel {
3781 my ($coord, $size, $max) = @_;
3782
3783 $coord =
3784 $coord eq "center" ? ($max - $size) * 0.5
3785 : $coord eq "max" ? $max
3786 : $coord;
3787
3788 $coord = 0 if $coord < 0;
3789 $coord = $max - $size if $coord > $max - $size;
3790
3791 int $coord + 0.5
3792}
3793
3046sub size_allocate { 3794sub invoke_size_allocate {
3047 my ($self, $w, $h) = @_; 3795 my ($self, $w, $h) = @_;
3048
3049 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054 3796
3055 for my $child ($self->children) { 3797 for my $child ($self->children) {
3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3798 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057 3799
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3800 $X = $child->{force_x} if exists $child->{force_x};
3059 if exists $child->{req_x}; 3801 $Y = $child->{force_y} if exists $child->{force_y};
3060 3802
3061 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3803 $X = _to_pixel $X, $W, $self->{w};
3062 if exists $child->{req_y}; 3804 $Y = _to_pixel $Y, $H, $self->{h};
3063
3064 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3065 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066 3805
3067 $child->configure ($X, $Y, $W, $H); 3806 $child->configure ($X, $Y, $W, $H);
3068 } 3807 }
3808
3809 1
3069} 3810}
3070 3811
3071sub coord2local { 3812sub coord2local {
3072 my ($self, $x, $y) = @_; 3813 my ($self, $x, $y) = @_;
3073 3814
… …
3081} 3822}
3082 3823
3083sub update { 3824sub update {
3084 my ($self) = @_; 3825 my ($self) = @_;
3085 3826
3086 $self->check_size;
3087 $::WANT_REFRESH++; 3827 $::WANT_REFRESH++;
3088} 3828}
3089 3829
3090sub add { 3830sub add {
3091 my ($self, @children) = @_; 3831 my ($self, @children) = @_;
3092 3832
3093 for my $child (@children) {
3094 $child->{toplevel} = 1; 3833 $_->{is_toplevel} = 1
3095 3834 for @children;
3096 # integerise window positions
3097 $child->{x} = int $child->{x};
3098 $child->{y} = int $child->{y};
3099 }
3100 3835
3101 $self->SUPER::add (@children); 3836 $self->SUPER::add (@children);
3837}
3838
3839sub remove {
3840 my ($self, @children) = @_;
3841
3842 $self->SUPER::remove (@children);
3843
3844 delete $self->{is_toplevel}
3845 for @children;
3102 3846
3103 while (@children) { 3847 while (@children) {
3104 my $w = pop @children; 3848 my $w = pop @children;
3105 push @children, $w->children; 3849 push @children, $w->children;
3106 $w->{visible} = 1; 3850 $w->set_invisible;
3107 }
3108}
3109
3110sub remove {
3111 my ($self, @children) = @_;
3112
3113 $self->SUPER::remove (@children);
3114
3115 while (@children) {
3116 my $w = pop @children;
3117 push @children, $w->children;
3118 delete $w->{visible};
3119 } 3851 }
3120} 3852}
3121 3853
3122sub on_refresh { 3854sub on_refresh {
3123 my ($self, $id, $cb) = @_; 3855 my ($self, $id, $cb) = @_;
… …
3137 while ($self->{refresh_hook}) { 3869 while ($self->{refresh_hook}) {
3138 $_->() 3870 $_->()
3139 for values %{delete $self->{refresh_hook}}; 3871 for values %{delete $self->{refresh_hook}};
3140 } 3872 }
3141 3873
3142 if ($self->{check_size}) { 3874 if ($self->{realloc}) {
3143 my @queue = ([], []); 3875 my %queue;
3876 my @queue;
3877 my $widget;
3144 3878
3145 for (;;) { 3879 outer:
3146 if ($self->{check_size}) { 3880 while () {
3147 # heuristic: check containers last 3881 if (my $realloc = delete $self->{realloc}) {
3148 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3882 for $widget (values %$realloc) {
3149 for values %{delete $self->{check_size}} 3883 $widget->{visible} or next; # do not resize invisible widgets
3884
3885 $queue{$widget+0}++ and next; # duplicates are common
3886
3887 push @{ $queue[$widget->{visible}] }, $widget;
3888 }
3150 } 3889 }
3151 3890
3152 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3891 while () {
3892 @queue or last outer;
3153 3893
3154 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3894 $widget = pop @{ $queue[-1] || [] }
3155 ? @$widget{qw(user_w user_h)} 3895 and last;
3156 : $widget->size_request;
3157
3158 if (delete $widget->{force_alloc}
3159 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3160 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3161 3896
3897 pop @queue;
3898 }
3899
3900 delete $queue{$widget+0};
3901
3902 my ($w, $h) = $widget->size_request;
3903
3904 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3905 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3906
3907 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3908 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3909
3910 $w = $widget->{force_w} if exists $widget->{force_w};
3911 $h = $widget->{force_h} if exists $widget->{force_h};
3912
3913 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3914 || delete $widget->{force_realloc}) {
3162 $widget->{req_w} = $w; 3915 $widget->{req_w} = $w;
3163 $widget->{req_h} = $h; 3916 $widget->{req_h} = $h;
3164 3917
3165 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3918 $self->{size_alloc}{$widget+0} = $widget;
3166 3919
3167 $widget->{parent}->check_size
3168 if $widget->{parent}; 3920 if (my $parent = $widget->{parent}) {
3921 $self->{realloc}{$parent+0} = $parent
3922 unless $queue{$parent+0};
3923
3924 $parent->{force_size_alloc} = 1;
3925 $self->{size_alloc}{$parent+0} = $parent;
3926 }
3169 } 3927 }
3928
3929 delete $self->{realloc}{$widget+0};
3170 } 3930 }
3171 } 3931 }
3172 3932
3173 while ($self->{size_alloc}) { 3933 while (my $size_alloc = delete $self->{size_alloc}) {
3174 for (values %{delete $self->{size_alloc}}) { 3934 my @queue = sort { $b->{visible} <=> $a->{visible} }
3175 my ($widget, $w, $h) = @$_; 3935 values %$size_alloc;
3936
3937 while () {
3938 my $widget = pop @queue || last;
3939
3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 3941
3177 $w = 0 if $w < 0; 3942 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0; 3943 $h = 0 if $h < 0;
3179 3944
3945 $w = max $widget->{min_w}, $w;
3946 $h = max $widget->{min_h}, $h;
3947
3948# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3949# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3950
3951 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3952 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3953
3954 $w = int $w + 0.5;
3955 $h = int $h + 0.5;
3956
3957 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3958 $widget->{old_w} = $widget->{w};
3959 $widget->{old_h} = $widget->{h};
3960
3180 $widget->{w} = $w; 3961 $widget->{w} = $w;
3181 $widget->{h} = $h; 3962 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h); 3963
3183 $widget->emit (size_allocate => $w, $h); 3964 $widget->emit (size_allocate => $w, $h);
3965 }
3184 } 3966 }
3185 } 3967 }
3186 3968
3187 while ($self->{post_alloc_hook}) { 3969 while ($self->{post_alloc_hook}) {
3188 $_->() 3970 $_->()
3189 for values %{delete $self->{post_alloc_hook}}; 3971 for values %{delete $self->{post_alloc_hook}};
3190 } 3972 }
3973
3191 3974
3192 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3975 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3976 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194 glClear GL_COLOR_BUFFER_BIT; 3977 glClear GL_COLOR_BUFFER_BIT;
3195 3978
… …
3197 glLoadIdentity; 3980 glLoadIdentity;
3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3981 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199 glMatrixMode GL_MODELVIEW; 3982 glMatrixMode GL_MODELVIEW;
3200 glLoadIdentity; 3983 glLoadIdentity;
3201 3984
3985 {
3986 package CFClient::UI::Base;
3987
3988 ($draw_x, $draw_y, $draw_w, $draw_h) =
3989 (0, 0, $self->{w}, $self->{h});
3990 }
3991
3202 $self->_draw; 3992 $self->_draw;
3203} 3993}
3204 3994
3205############################################################################# 3995#############################################################################
3206 3996

Diff Legend

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