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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

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