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

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

Diff Legend

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