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

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

Diff Legend

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