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

Diff Legend

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