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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.435 by root, Wed Aug 22 21:40:43 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
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->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
25 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
26 32
27 my $tip = $widget->{tooltip}; 33 return if $ENV{CFPLUS_DEBUG} & 8;
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip;
30
31 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 36 $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 } 37 }
43 38
44 return; 39 return;
45 } 40 }
46 } 41 }
47 } 42 }
48 43
49 $TOOLTIP->hide; 44 $TOOLTIP->hide;
45 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 46 delete $TOOLTIP->{owner};
47});
48
49sub get_layout {
50 my $layout;
51
52 for (grep { $_->{name} } values %WIDGET) {
53 my $win = $layout->{$_->{name}} = { };
54
55 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
56 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
57 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
58 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
59
60 $win->{show} = $_->{visible} && $_->{is_toplevel};
61 }
62
63 $layout
64}
65
66sub set_layout {
67 my ($layout) = @_;
68
69 $LAYOUT = $layout;
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
81}
82
83sub check_hover {
84 my ($widget) = @_;
85
86 if ($widget != $HOVER) {
87 my $hover = $HOVER; $HOVER = $widget;
88
89 $hover->update if $hover && $hover->{can_hover};
90 $HOVER->update if $HOVER && $HOVER->{can_hover};
91
92 $TOOLTIP_WATCHER->start;
93 }
62} 94}
63 95
64sub feed_sdl_button_down_event { 96sub feed_sdl_button_down_event {
65 my ($ev) = @_; 97 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 98 my ($x, $y) = ($ev->{x}, $ev->{y});
67 99
68 if (!$BUTTON_STATE) { 100 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
101
102 unless ($GRAB) {
69 my $widget = $ROOT->find_widget ($x, $y); 103 my $widget = $ROOT->find_widget ($x, $y);
70 104
71 $GRAB = $widget; 105 $GRAB = $widget;
72 $GRAB->update if $GRAB; 106 $GRAB->update if $GRAB;
73 107
74 check_tooltip; 108 $TOOLTIP_WATCHER->cb->();
75 } 109 }
76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 110
79 if ($GRAB) { 111 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if ($ev->{button} == 4 || $ev->{button} == 5) {
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); 113 # mousewheel
114 my $delta = $ev->{button} * 2 - 9;
115 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
116
117 $ev->{dx} = $shift ? $delta : 0;
118 $ev->{dy} = $shift ? 0 : $delta;
119
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
82 } 124 }
83} 125}
84 126
85sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
86 my ($ev) = @_; 128 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y});
88 129
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
90 131
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 133
93 if ($GRAB) { 134 $GRAB->emit (button_up => $ev)
94 ($x, $y) = $GRAB->coord2local ($x, $y); 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 136
98 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 139 $grab->update if $grab;
101 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
102 141
103 check_tooltip; 142 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->();
104 } 144 }
105} 145}
106 146
107sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
108 my ($ev) = @_; 148 my ($ev) = @_;
109 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
110 150
111 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
112 152
113 if ($widget != $HOVER) { 153 check_hover $widget;
114 my $hover = $HOVER; $HOVER = $widget;
115 154
116 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
117 $HOVER->update if $HOVER && $HOVER->{can_hover};
118
119 check_tooltip;
120 }
121
122 if ($HOVER) { 156 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} 157}
127 158
128# convert position array to integers 159# convert position array to integers
129sub harmonize { 160sub harmonize {
130 my ($vals) = @_; 161 my ($vals) = @_;
… …
136 $rem += $_ - $i; 167 $rem += $_ - $i;
137 $_ = $i; 168 $_ = $i;
138 } 169 }
139} 170}
140 171
172sub full_refresh {
173 # make a copy, otherwise for complains about freed values.
174 my @widgets = values %WIDGET;
175
176 $_->update
177 for @widgets;
178}
179
180sub reconfigure_widgets {
181 # make a copy, otherwise C<for> complains about freed values.
182 my @widgets = values %WIDGET;
183
184 $_->reconfigure
185 for @widgets;
186}
187
141# call when resolution changes etc. 188# call when resolution changes etc.
142sub rescale_widgets { 189sub rescale_widgets {
143 my ($sx, $sy) = @_; 190 my ($sx, $sy) = @_;
144 191
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 192 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 193 if ($widget->{is_toplevel}) {
194 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
195 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
196
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 197 $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}; 198 $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}; 199 $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}; 200 $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}; 201 $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}; 202 $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}; 203
204 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
205 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
206
158 } 207 }
159
160 $widget->reconfigure;
161 } 208 }
209
210 reconfigure_widgets;
162} 211}
163 212
164############################################################################# 213#############################################################################
165 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
166package CFClient::UI::Base; 223package CFPlus::UI::Base;
167 224
168use strict; 225use strict;
169 226
170use CFClient::OpenGL; 227use CFPlus::OpenGL;
171 228
172sub new { 229sub new {
173 my $class = shift; 230 my $class = shift;
174 231
175 my $self = bless { 232 my $self = bless {
176 x => 0, 233 x => "center",
177 y => 0, 234 y => "center",
178 z => 0, 235 z => 0,
236 w => undef,
237 h => undef,
179 can_events => 1, 238 can_events => 1,
180 @_ 239 @_
181 }, $class; 240 }, $class;
182 241
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
243
183 for (keys %$self) { 244 for (keys %$self) {
184 if (/^connect_(.*)$/) { 245 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
186 } 247 }
187 } 248 }
188 249
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
255
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258
259 $self->show if $layout->{show};
260 }
190 261
191 $self 262 $self
192} 263}
193 264
194sub destroy { 265sub destroy {
195 my ($self) = @_; 266 my ($self) = @_;
196 267
197 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
198 %$self = (); 270 %$self = ();
199} 271}
200 272
273sub TO_JSON {
274 { __w_ => $_[0]{s_id} }
275}
276
201sub show { 277sub show {
202 my ($self) = @_; 278 my ($self) = @_;
203 279
204 return if $self->{parent}; 280 return if $self->{parent};
205 281
206 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
207} 283}
208 284
209sub hide { 285sub set_visible {
210 my ($self) = @_; 286 my ($self) = @_;
287
288 return if $self->{visible};
289
290 $self->{root} = $self->{parent}{root};
291 $self->{visible} = $self->{parent}{visible} + 1;
292
293 $self->emit (visibility_change => 1);
294
295 $self->realloc if !exists $self->{req_w};
296
297 $_->set_visible for $self->children;
298}
299
300sub set_invisible {
301 my ($self) = @_;
302
303 return unless $self->{visible};
304
305 $_->set_invisible for $self->children;
306
307 delete $self->{visible};
308 delete $self->{root};
211 309
212 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
214 312
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
314 if $TOOLTIP->{owner} == $self;
315
316 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0);
318}
319
320sub set_visibility {
321 my ($self, $visible) = @_;
322
323 return if $self->{visible} == $visible;
324
325 $visible ? $self->show
326 : $self->hide;
327}
328
329sub toggle_visibility {
330 my ($self) = @_;
331
332 $self->{visible}
333 ? $self->hide
334 : $self->show;
335}
336
337sub hide {
338 my ($self) = @_;
339
340 $self->set_invisible;
341
215 $self->{parent}->remove ($self) 342 $self->{parent}->remove ($self)
216 if $self->{parent}; 343 if $self->{parent};
217} 344}
218 345
219sub move { 346sub move_abs {
220 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
221 348
222 $self->{x} = int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
223 $self->{y} = int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
224 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
225 352
226 $self->update; 353 $self->update;
227} 354}
228 355
229sub set_size { 356sub set_size {
230 my ($self, $w, $h) = @_; 357 my ($self, $w, $h) = @_;
231 358
232 $self->{user_w} = $w; 359 $self->{force_w} = $w;
233 $self->{user_h} = $h; 360 $self->{force_h} = $h;
234 361
235 $self->check_size; 362 $self->realloc;
236} 363}
237 364
238sub size_request { 365sub size_request {
239 require Carp; 366 require Carp;
240 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
241} 368}
242 369
370sub baseline_shift {
371 0
372}
373
243sub configure { 374sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
245 376
246 if ($self->{aspect}) { 377 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h);
379
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
249 382
250 # use alignment to adjust x, y 383 # use alignment to adjust x, y
251 384
252 $x += int +($w - $w2) * 0.5; 385 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 386 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 387 }
257 388
258 if ($self->{x} != $x || $self->{y} != $y) { 389 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 390 $self->{x} = $x;
260 $self->{y} = $y; 391 $self->{y} = $y;
261 $self->update; 392 $self->update;
262 } 393 }
263 394
264 if ($self->{w} != $w || $self->{h} != $h) { 395 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 396 return unless $self->{visible};
266 }
267}
268 397
269sub size_allocate { 398 $self->{alloc_w} = $w;
270 # nothing to be done 399 $self->{alloc_h} = $h;
271}
272 400
273sub reconfigure { 401 $self->{root}{size_alloc}{$self+0} = $self;
274 my ($self) = @_; 402 }
275
276 $self->check_size (1);
277 $self->update;
278} 403}
279 404
280sub children { 405sub children {
406 # nop
407}
408
409sub visible_children {
410 $_[0]->children
281} 411}
282 412
283sub set_max_size { 413sub set_max_size {
284 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
285 415
286 delete $self->{max_w}; $self->{max_w} = $w if $w; 416 $self->{max_w} = int $w if defined $w;
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 417 $self->{max_h} = int $h if defined $h;
418
419 $self->realloc;
288} 420}
289 421
290sub set_tooltip { 422sub set_tooltip {
291 my ($self, $tooltip) = @_; 423 my ($self, $tooltip) = @_;
292 424
425 $tooltip =~ s/^\s+//;
426 $tooltip =~ s/\s+$//;
427
428 return if $self->{tooltip} eq $tooltip;
429
293 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
294 431
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip; 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
298 } 435 }
299} 436}
300 437
301# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
302sub coord2local { 439sub coord2local {
303 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
304 441
442 Carp::confess unless $self->{parent};#d#
443
305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
306} 445}
307 446
308# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
309sub coord2global { 448sub coord2global {
310 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
311 450
451 Carp::confess unless $self->{parent};#d#
452
312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
313} 454}
314 455
315sub focus_in { 456sub invoke_focus_in {
316 my ($self) = @_; 457 my ($self) = @_;
317 458
318 return if $FOCUS == $self; 459 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
320 461
321 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
322 463
323 $self->emit (focus_in => $focus); 464 $self->update;
324 465
325 $focus->update if $focus; 466 0
326 $FOCUS->update;
327} 467}
328 468
329sub focus_out { 469sub invoke_focus_out {
330 my ($self) = @_; 470 my ($self) = @_;
331 471
332 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
333 473
334 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
335 475
336 $self->emit (focus_out => $focus); 476 $self->update;
337 477
338 $focus->update if $focus; #? 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
339} 479 unless $FOCUS;
340 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
341sub mouse_motion { } 491sub invoke_mouse_motion { 0 }
342sub button_up { } 492sub invoke_button_up { 0 }
343sub key_down { } 493sub invoke_key_down { 0 }
344sub key_up { } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
345 496
346sub button_down { 497sub invoke_button_down {
347 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
348 499
349 $self->focus_in; 500 $self->grab_focus;
350}
351 501
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 502 0
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 503}
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
356sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
357 504
358sub draw { 505sub connect {
506 my ($self, $signal, $cb) = @_;
507
508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
514}
515
516sub disconnect_all {
359 my ($self) = @_; 517 my ($self, $signal) = @_;
360 518
361 return unless $self->{h} && $self->{w}; 519 delete $self->{signal_cb}{$signal};
362
363 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw;
366 glPopMatrix;
367
368 if ($self == $HOVER && $self->{can_hover}) {
369 my ($x, $y) = @$self{qw(x y)};
370
371 glColor 1, 0.8, 0.5, 0.2;
372 glEnable GL_BLEND;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
374 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;
389 glVertex $self->{w}, 0;
390 glVertex $self->{w}, $self->{h};
391 glVertex 0 , $self->{h};
392 glEnd;
393 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 }
396} 520}
397 521
398sub _draw { 522my %has_coords = (
399 my ($self) = @_; 523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
400 528
401 warn "no draw defined for $self\n"; 529sub emit {
402} 530 my ($self, $signal, @args) = @_;
403 531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args)
550}
551
404sub find_widget { 552#sub find_widget {
405 my ($self, $x, $y) = @_; 553# in .xs
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 554
416sub set_parent { 555sub set_parent {
417 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
418 557
419 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
420 559 $self->set_visible if $parent->{visible};
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424} 560}
425 561
426sub check_size { 562sub realloc {
427 my ($self, $forced) = @_; 563 my ($self) = @_;
428 564
429 $self->{force_alloc} = 1 if $forced; 565 if ($self->{visible}) {
430 $CFClient::UI::ROOT->{check_size}{$self} = $self; 566 return if $self->{root}{realloc}{$self+0};
567
568 $self->{root}{realloc}{$self+0} = $self;
569 $self->{root}->update;
570 } else {
571 delete $self->{req_w};
572 delete $self->{req_h};
573 }
431} 574}
432 575
433sub update { 576sub update {
434 my ($self) = @_; 577 my ($self) = @_;
435 578
436 $self->{parent}->update 579 $self->{parent}->update
437 if $self->{parent}; 580 if $self->{parent};
438} 581}
439 582
440sub connect { 583sub reconfigure {
441 my ($self, $signal, $cb) = @_; 584 my ($self) = @_;
442 585
443 push @{ $self->{signal_cb}{$signal} }, $cb; 586 $self->realloc;
587 $self->update;
444} 588}
445 589
446sub emit { 590# using global variables seems a bit hacky, but passing through all drawing
447 my ($self, $signal, @args) = @_; 591# functions seems pointless.
592our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
448 593
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 594#sub draw {
595#CFPlus.xs
596
597sub _draw {
598 my ($self) = @_;
599
600 warn "no draw defined for $self\n";
450} 601}
451 602
452sub DESTROY { 603sub DESTROY {
453 my ($self) = @_; 604 my ($self) = @_;
454 605
606 return if CFPlus::in_destruct;
607
608 local $@;
609 eval { $self->destroy };
610 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
611
455 delete $WIDGET{$self+0}; 612 delete $WIDGET{$self+0};
456 #$self->deactivate;
457} 613}
458 614
459############################################################################# 615#############################################################################
460 616
461package CFClient::UI::DrawBG; 617package CFPlus::UI::DrawBG;
462 618
463our @ISA = CFClient::UI::Base::; 619our @ISA = CFPlus::UI::Base::;
464 620
465use strict; 621use strict;
466use CFClient::OpenGL; 622use CFPlus::OpenGL;
467 623
468sub new { 624sub new {
469 my $class = shift; 625 my $class = shift;
470
471 # range [value, low, high, page]
472 626
473 $class->SUPER::new ( 627 $class->SUPER::new (
474 #bg => [0, 0, 0, 0.2], 628 #bg => [0, 0, 0, 0.2],
475 #active_bg => [1, 1, 1, 0.5], 629 #active_bg => [1, 1, 1, 0.5],
476 @_ 630 @_
… …
486 640
487 if ($color && (@$color < 4 || $color->[3])) { 641 if ($color && (@$color < 4 || $color->[3])) {
488 my ($w, $h) = @$self{qw(w h)}; 642 my ($w, $h) = @$self{qw(w h)};
489 643
490 glEnable GL_BLEND; 644 glEnable GL_BLEND;
491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 645 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492 glColor @$color; 646 glColor_premultiply @$color;
493
494 glBegin GL_QUADS;
495 glVertex 0 , 0;
496 glVertex 0 , $h;
497 glVertex $w, $h; 647 glRect 0, 0, $w, $h;
498 glVertex $w, 0;
499 glEnd;
500
501 glDisable GL_BLEND; 648 glDisable GL_BLEND;
502 } 649 }
503} 650}
504 651
505############################################################################# 652#############################################################################
506 653
507package CFClient::UI::Empty; 654package CFPlus::UI::Empty;
508 655
509our @ISA = CFClient::UI::Base::; 656our @ISA = CFPlus::UI::Base::;
510 657
511sub new { 658sub new {
512 my ($class, %arg) = @_; 659 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 660 $class->SUPER::new (can_events => 0, %arg);
514} 661}
515 662
516sub size_request { 663sub size_request {
517 (0, 0) 664 my ($self) = @_;
665
666 ($self->{w} + 0, $self->{h} + 0)
518} 667}
519 668
520sub draw { } 669sub draw { }
521 670
522############################################################################# 671#############################################################################
523 672
524package CFClient::UI::Container; 673package CFPlus::UI::Container;
525 674
526our @ISA = CFClient::UI::Base::; 675our @ISA = CFPlus::UI::Base::;
527 676
528sub new { 677sub new {
529 my ($class, %arg) = @_; 678 my ($class, %arg) = @_;
530 679
531 my $children = delete $arg{children} || []; 680 my $children = delete $arg{children};
532 681
533 my $self = $class->SUPER::new ( 682 my $self = $class->SUPER::new (
534 children => [], 683 children => [],
535 can_events => 0, 684 can_events => 0,
536 %arg, 685 %arg,
537 ); 686 );
687
538 $self->add ($_) for @$children; 688 $self->add (@$children)
689 if $children && @$children;
539 690
540 $self 691 $self
692}
693
694sub realloc {
695 my ($self) = @_;
696
697 $self->{force_realloc} = 1;
698 $self->{force_size_alloc} = 1;
699 $self->SUPER::realloc;
541} 700}
542 701
543sub add { 702sub add {
544 my ($self, @widgets) = @_; 703 my ($self, @widgets) = @_;
545 704
546 $_->set_parent ($self) 705 $_->set_parent ($self)
547 for @widgets; 706 for @widgets;
548 707
708 # TODO: only do this in widgets that need it, e.g. root, fixed
549 use sort 'stable'; 709 use sort 'stable';
550 710
551 $self->{children} = [ 711 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 712 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 713 @{$self->{children}}, @widgets
554 ]; 714 ];
555 715
556 $self->check_size (1); 716 $self->realloc;
557 $self->update; 717
718 $self->emit (c_add => \@widgets);
719
720 map $_+0, @widgets
558} 721}
559 722
560sub children { 723sub children {
561 @{ $_[0]{children} } 724 @{ $_[0]{children} }
562} 725}
563 726
564sub remove { 727sub remove {
565 my ($self, $child) = @_; 728 my ($self, @widgets) = @_;
566 729
730 $self->emit (c_remove => \@widgets);
731
732 for my $child (@widgets) {
567 delete $child->{parent}; 733 delete $child->{parent};
568 $child->hide; 734 $child->hide;
569
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 735 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
736 }
571 737
572 $self->check_size; 738 $self->realloc;
573 $self->update;
574} 739}
575 740
576sub clear { 741sub clear {
577 my ($self) = @_; 742 my ($self) = @_;
578 743
579 my $children = delete $self->{children}; 744 my $children = $self->{children};
580 $self->{children} = []; 745 $self->{children} = [];
581 746
582 for (@$children) { 747 for (@$children) {
583 delete $_->{parent}; 748 delete $_->{parent};
584 $_->hide; 749 $_->hide;
585 } 750 }
586 751
587 $self->check_size; 752 $self->realloc;
588 $self->update;
589} 753}
590 754
591sub find_widget { 755sub find_widget {
592 my ($self, $x, $y) = @_; 756 my ($self, $x, $y) = @_;
593 757
594 $x -= $self->{x}; 758 $x -= $self->{x};
595 $y -= $self->{y}; 759 $y -= $self->{y};
596 760
597 my $res; 761 my $res;
598 762
599 for (reverse @{ $self->{children} }) { 763 for (reverse $self->visible_children) {
600 $res = $_->find_widget ($x, $y) 764 $res = $_->find_widget ($x, $y)
601 and return $res; 765 and return $res;
602 } 766 }
603 767
604 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 768 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
605} 769}
606 770
607sub _draw { 771sub _draw {
608 my ($self) = @_; 772 my ($self) = @_;
609 773
610 $_->draw for @{$self->{children}}; 774 $_->draw for $self->visible_children;
611} 775}
612 776
613############################################################################# 777#############################################################################
614 778
615package CFClient::UI::Bin; 779package CFPlus::UI::Bin;
616 780
617our @ISA = CFClient::UI::Container::; 781our @ISA = CFPlus::UI::Container::;
618 782
619sub new { 783sub new {
620 my ($class, %arg) = @_; 784 my ($class, %arg) = @_;
621 785
622 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 786 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
623 787
624 $class->SUPER::new (children => [$child], %arg) 788 $class->SUPER::new (children => [$child], %arg)
625} 789}
626 790
627sub add { 791sub add {
628 my ($self, $child) = @_; 792 my ($self, $child) = @_;
629 793
630 $self->{children} = []; 794 $self->clear;
631
632 $self->SUPER::add ($child); 795 $self->SUPER::add ($child);
633} 796}
634 797
635sub remove { 798sub remove {
636 my ($self, $widget) = @_; 799 my ($self, $widget) = @_;
637 800
638 $self->SUPER::remove ($widget); 801 $self->SUPER::remove ($widget);
639 802
640 $self->{children} = [new CFClient::UI::Empty] 803 $self->{children} = [new CFPlus::UI::Empty]
641 unless @{$self->{children}}; 804 unless @{$self->{children}};
642} 805}
643 806
644sub child { $_[0]->{children}[0] } 807sub child { $_[0]->{children}[0] }
645 808
646sub size_request { 809sub size_request {
647 $_[0]{children}[0]->size_request 810 $_[0]{children}[0]->size_request
648} 811}
649 812
650sub size_allocate { 813sub invoke_size_allocate {
651 my ($self, $w, $h) = @_; 814 my ($self, $w, $h) = @_;
652 815
653 $self->{children}[0]->configure (0, 0, $w, $h); 816 $self->{children}[0]->configure (0, 0, $w, $h);
817
818 1
654} 819}
655 820
656############################################################################# 821#############################################################################
657 822
823# back-buffered drawing area
824
658package CFClient::UI::Window; 825package CFPlus::UI::Window;
659 826
660our @ISA = CFClient::UI::Bin::; 827our @ISA = CFPlus::UI::Bin::;
661 828
662use CFClient::OpenGL; 829use CFPlus::OpenGL;
663 830
664sub new { 831sub new {
665 my ($class, %arg) = @_; 832 my ($class, %arg) = @_;
666 833
667 my $self = $class->SUPER::new (%arg); 834 my $self = $class->SUPER::new (%arg);
… …
672 839
673 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 840 $ROOT->on_post_alloc ($self => sub { $self->render_child });
674 $self->SUPER::update; 841 $self->SUPER::update;
675} 842}
676 843
677sub size_allocate { 844sub invoke_size_allocate {
678 my ($self, $w, $h) = @_; 845 my ($self, $w, $h) = @_;
679 846
680 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 847 $self->update;
848
849 $self->SUPER::invoke_size_allocate ($w, $h)
682} 850}
683 851
684sub _render { 852sub _render {
853 my ($self) = @_;
854
685 $_[0]{children}[0]->draw; 855 $self->{children}[0]->draw;
686} 856}
687 857
688sub render_child { 858sub render_child {
689 my ($self) = @_; 859 my ($self) = @_;
690 860
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 861 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0; 862 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 863 glClear GL_COLOR_BUFFER_BIT;
694 864
865 {
866 package CFPlus::UI::Base;
867
868 local ($draw_x, $draw_y, $draw_w, $draw_h) =
869 (0, 0, $self->{w}, $self->{h});
870
695 $self->_render; 871 $self->_render;
872 }
696 }; 873 };
697} 874}
698 875
699sub _draw { 876sub _draw {
700 my ($self) = @_; 877 my ($self) = @_;
701
702 my ($w, $h) = ($self->w, $self->h);
703 878
704 my $tex = $self->{texture} 879 my $tex = $self->{texture}
705 or return; 880 or return;
706 881
707 glEnable GL_TEXTURE_2D; 882 glEnable GL_TEXTURE_2D;
708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 883 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
709 glColor 1, 1, 1, 1; 884 glColor 0, 0, 0, 1;
710 885
711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 886 $tex->draw_quad_alpha_premultiplied (0, 0);
712 887
713 glDisable GL_TEXTURE_2D; 888 glDisable GL_TEXTURE_2D;
714} 889}
715 890
716############################################################################# 891#############################################################################
717 892
718package CFClient::UI::ViewPort; 893package CFPlus::UI::ViewPort;
719 894
895use List::Util qw(min max);
896
720our @ISA = CFClient::UI::Window::; 897our @ISA = CFPlus::UI::Window::;
898
899sub new {
900 my $class = shift;
901
902 $class->SUPER::new (
903 scroll_x => 0,
904 scroll_y => 1,
905 @_,
906 )
907}
721 908
722sub size_request { 909sub size_request {
723 my ($self) = @_; 910 my ($self) = @_;
724 911
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 912 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 913
728 @$self{qw(child_w child_h)} 914 $w = 1 if $self->{scroll_x};
729} 915 $h = 1 if $self->{scroll_y};
730 916
917 ($w, $h)
918}
919
731sub size_allocate { 920sub invoke_size_allocate {
732 my ($self, $w, $h) = @_; 921 my ($self, $w, $h) = @_;
733 922
923 my $child = $self->child;
924
925 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
926 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
927
928 $self->child->configure (0, 0, $w, $h);
734 $self->update; 929 $self->update;
930
931 1
735} 932}
736 933
737sub set_offset { 934sub set_offset {
738 my ($self, $x, $y) = @_; 935 my ($self, $x, $y) = @_;
739 936
937 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
938 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
939
940 if ($x != $self->{view_x} or $y != $self->{view_y}) {
740 $self->{view_x} = int $x; 941 $self->{view_x} = $x;
741 $self->{view_y} = int $y; 942 $self->{view_y} = $y;
742 943
944 $self->emit (changed => $x, $y);
743 $self->update; 945 $self->update;
946 }
947}
948
949sub set_center {
950 my ($self, $x, $y) = @_;
951
952 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
953}
954
955sub make_visible {
956 my ($self, $x, $y, $border) = @_;
957
958 if ( $x < $self->{view_x} + $self->{w} * $border
959 || $x > $self->{view_x} + $self->{w} * (1 - $border)
960 || $y < $self->{view_y} + $self->{h} * $border
961 || $y > $self->{view_y} + $self->{h} * (1 - $border)
962 ) {
963 $self->set_center ($x, $y);
964 }
744} 965}
745 966
746# hmm, this does not work for topleft of $self... but we should not ask for that 967# hmm, this does not work for topleft of $self... but we should not ask for that
747sub coord2local { 968sub coord2local {
748 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
… …
763 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
764 985
765 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 986 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
766 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 987 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
767 ) { 988 ) {
768 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 989 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
769 } else { 990 } else {
770 $self->CFClient::UI::Base::find_widget ($x, $y) 991 $self->CFPlus::UI::Base::find_widget ($x, $y)
771 } 992 }
772} 993}
773 994
774sub _render { 995sub _render {
775 my ($self) = @_; 996 my ($self) = @_;
776 997
998 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
999 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1000
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1001 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 1002
779 $self->SUPER::_render; 1003 $self->SUPER::_render;
780} 1004}
781 1005
782############################################################################# 1006#############################################################################
783 1007
784package CFClient::UI::ScrolledWindow; 1008package CFPlus::UI::ScrolledWindow;
785 1009
786our @ISA = CFClient::UI::HBox::; 1010our @ISA = CFPlus::UI::Table::;
787 1011
788sub new { 1012sub new {
789 my $class = shift; 1013 my ($class, %arg) = @_;
1014
1015 my $child = delete $arg{child};
790 1016
791 my $self; 1017 my $self;
792 1018
793 my $slider = new CFClient::UI::Slider 1019 my $hslider = new CFPlus::UI::Slider
1020 c_col => 0,
1021 c_row => 1,
794 vertical => 1, 1022 vertical => 0,
795 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 1024 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 1025 $self->{hpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
798 }, 1027 },
799 ; 1028 ;
800 1029
1030 my $vslider = new CFPlus::UI::Slider
1031 c_col => 1,
1032 c_row => 0,
1033 vertical => 1,
1034 range => [0, 0, 1, 0.01], # HACK fix
1035 on_changed => sub {
1036 $self->{vpos} = $_[1];
1037 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1038 },
1039 ;
1040
801 $self = $class->SUPER::new ( 1041 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 1042 scroll_x => 0,
1043 scroll_y => 1,
1044 can_events => 1,
803 slider => $slider, 1045 hslider => $hslider,
804 @_, 1046 vslider => $vslider,
1047 col_expand => [1, 0],
1048 row_expand => [1, 0],
1049 %arg,
805 ); 1050 );
806 1051
807 $self->{vp}->add ($self->{scrolled}); 1052 $self->{vp} = new CFPlus::UI::ViewPort
1053 c_col => 0,
1054 c_row => 0,
1055 expand => 1,
1056 scroll_x => $self->{scroll_x},
1057 scroll_y => $self->{scroll_y},
1058 on_changed => sub {
1059 my ($vp, $x, $y) = @_;
1060
1061 $vp->{parent}{hslider}->set_value ($x);
1062 $vp->{parent}{vslider}->set_value ($y);
1063
1064 0
1065 },
1066 on_size_allocate => sub {
1067 my ($vp, $w, $h) = @_;
1068 $vp->{parent}->update_slider;
1069 0
1070 },
1071 ;
1072
808 $self->add ($self->{vp}); 1073 $self->SUPER::add ($self->{vp});
809 $self->add ($self->{slider}); 1074
1075 $self->add ($child) if $child;
810 1076
811 $self 1077 $self
812} 1078}
813 1079
814#TODO# update range on size_allocate depending on child 1080sub add {
815# update viewport offset on scroll 1081 my ($self, $widget) = @_;
1082
1083 $self->{vp}->add ($self->{child} = $widget);
1084}
1085
1086sub set_offset { shift->{vp}->set_offset (@_) }
1087sub set_center { shift->{vp}->set_center (@_) }
1088sub make_visible { shift->{vp}->make_visible (@_) }
1089
1090sub update_slider {
1091 my ($self) = @_;
1092
1093 my $child = ($self->{vp} or return)->child;
1094
1095 if ($self->{scroll_x}) {
1096 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1097 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1098
1099 my $visible = $w1 > $w2;
1100 if ($visible != $self->{hslider_visible}) {
1101 $self->{hslider_visible} = $visible;
1102 $visible ? $self->SUPER::add ($self->{hslider})
1103 : $self->SUPER::remove ($self->{hslider});
1104 }
1105 }
1106
1107 if ($self->{scroll_y}) {
1108 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1109 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1110
1111 my $visible = $h1 > $h2;
1112 if ($visible != $self->{vslider_visible}) {
1113 $self->{vslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{vslider})
1115 : $self->SUPER::remove ($self->{vslider});
1116 }
1117 }
1118}
1119
1120sub start_dragging {
1121 my ($self, $ev) = @_;
1122
1123 $self->grab_focus;
1124
1125 my $ox = $self->{vp}{view_x};
1126 my $oy = $self->{vp}{view_y};
1127
1128 $self->{motion} = sub {
1129 my ($ev, $x, $y) = @_;
1130
1131 $ox -= $ev->{xrel};
1132 $oy -= $ev->{yrel};
1133
1134 $self->{vp}->set_offset ($ox, $oy);
1135 };
1136}
1137
1138sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_;
1140
1141 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1142 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1143
1144 1
1145}
1146
1147sub invoke_button_down {
1148 my ($self, $ev, $x, $y) = @_;
1149
1150 if ($ev->{button} == 2) {
1151 $self->start_dragging ($ev);
1152 return 1;
1153 }
1154
1155 0
1156}
1157
1158sub invoke_button_up {
1159 my ($self, $ev, $x, $y) = @_;
1160
1161 if (delete $self->{motion}) {
1162 return 1;
1163 }
1164
1165 0
1166}
1167
1168sub invoke_mouse_motion {
1169 my ($self, $ev, $x, $y) = @_;
1170
1171 if ($self->{motion}) {
1172 $self->{motion}->($ev, $x, $y);
1173 return 1;
1174 }
1175
1176 0
1177}
1178
1179sub invoke_size_allocate {
1180 my ($self, $w, $h) = @_;
1181
1182 $self->update_slider;
1183 $self->SUPER::invoke_size_allocate ($w, $h)
1184}
816 1185
817############################################################################# 1186#############################################################################
818 1187
819package CFClient::UI::Frame; 1188package CFPlus::UI::Frame;
820 1189
821our @ISA = CFClient::UI::Bin::; 1190our @ISA = CFPlus::UI::Bin::;
822 1191
823use CFClient::OpenGL; 1192use CFPlus::OpenGL;
824 1193
825sub new { 1194sub new {
826 my $class = shift; 1195 my $class = shift;
827 1196
828 $class->SUPER::new ( 1197 $class->SUPER::new (
… …
836 1205
837 if ($self->{bg}) { 1206 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)}; 1207 my ($w, $h) = @$self{qw(w h)};
839 1208
840 glEnable GL_BLEND; 1209 glEnable GL_BLEND;
841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
842 glColor @{ $self->{bg} }; 1211 glColor_premultiply @{ $self->{bg} };
843
844 glBegin GL_QUADS;
845 glVertex 0 , 0;
846 glVertex 0 , $h;
847 glVertex $w, $h; 1212 glRect 0, 0, $w, $h;
848 glVertex $w, 0;
849 glEnd;
850
851 glDisable GL_BLEND; 1213 glDisable GL_BLEND;
852 } 1214 }
853 1215
854 $self->SUPER::_draw; 1216 $self->SUPER::_draw;
855} 1217}
856 1218
857############################################################################# 1219#############################################################################
858 1220
859package CFClient::UI::FancyFrame; 1221package CFPlus::UI::FancyFrame;
860 1222
861our @ISA = CFClient::UI::Bin::; 1223our @ISA = CFPlus::UI::Bin::;
862 1224
863use CFClient::OpenGL; 1225use CFPlus::OpenGL;
864
865my @tex =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868 1226
869sub new { 1227sub new {
870 my $class = shift; 1228 my ($class, %arg) = @_;
871 1229
872 # TODO: user_x, user_y, overwrite moveto? 1230 if ((exists $arg{label}) && !ref $arg{label}) {
1231 $arg{label} = new CFPlus::UI::Label
1232 align => 1,
1233 valign => 0,
1234 text => $arg{label},
1235 fontsize => ($arg{border} || 0.8) * 0.75;
1236 }
873 1237
874 my $self = $class->SUPER::new ( 1238 my $self = $class->SUPER::new (
1239 # label => "",
875 bg => [1, 1, 1, 1], 1240 fg => [0.6, 0.3, 0.1],
876 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1241 border => 0.8,
878 toplevel => 1, 1242 style => 'single',
879 can_events => 1, 1243 %arg,
880 @_
881 ); 1244 );
882 1245
883 $self->{title} &&= new CFClient::UI::Label
884 align => 0,
885 valign => 1,
886 text => $self->{title},
887 fontsize => $self->{border};
888
889 $self 1246 $self
1247}
1248
1249sub add {
1250 my ($self, @widgets) = @_;
1251
1252 $self->SUPER::add (@widgets);
1253 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
890} 1254}
891 1255
892sub border { 1256sub border {
893 int $_[0]{border} * $::FONTSIZE 1257 int $_[0]{border} * $::FONTSIZE
894} 1258}
895 1259
896sub size_request { 1260sub size_request {
897 my ($self) = @_; 1261 my ($self) = @_;
1262
1263 ($self->{label_w}, undef) = $self->{label}->size_request
1264 if $self->{label};
898 1265
899 my ($w, $h) = $self->SUPER::size_request; 1266 my ($w, $h) = $self->SUPER::size_request;
900 1267
901 ( 1268 (
902 $w + $self->border * 2, 1269 $w + $self->border * 2,
903 $h + $self->border * 2, 1270 $h + $self->border * 2,
904 ) 1271 )
905} 1272}
906 1273
907sub size_allocate { 1274sub invoke_size_allocate {
908 my ($self, $w, $h) = @_; 1275 my ($self, $w, $h) = @_;
909 1276
910 $h -= List::Util::max 0, $self->border * 2; 1277 my $border = $self->border;
1278
911 $w -= List::Util::max 0, $self->border * 2; 1279 $w -= List::Util::max 0, $border * 2;
1280 $h -= List::Util::max 0, $border * 2;
912 1281
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1282 if (my $label = $self->{label}) {
914 if $self->{title}; 1283 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1284 $label->{h} = List::Util::min $h, $border;
1285 $label->invoke_size_allocate ($label->{w}, $label->{h});
1286 }
915 1287
916 $self->child->configure ($self->border, $self->border, $w, $h); 1288 $self->child->configure ($border, $border, $w, $h);
917}
918 1289
1290 1
1291}
1292
1293sub _draw {
1294 my ($self) = @_;
1295
1296 my $child = $self->{children}[0];
1297
1298 my $border = $self->border;
1299 my ($w, $h) = ($self->{w}, $self->{h});
1300
1301 $child->draw;
1302
1303 glColor @{$self->{fg}};
1304 glBegin GL_LINE_STRIP;
1305 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1306 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1307 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1308 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1309 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1310 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1311 glEnd;
1312
1313 if ($self->{label}) {
1314 glTranslate $border * 2, 0;
1315 $self->{label}->_draw;
1316 }
1317}
1318
1319#############################################################################
1320
1321package CFPlus::UI::Toplevel;
1322
1323our @ISA = CFPlus::UI::Bin::;
1324
1325use CFPlus::OpenGL;
1326
1327my $bg =
1328 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1329 mipmap => 1, wrap => 1;
1330
1331my @border =
1332 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1333 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1334
1335my @icon =
1336 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1337 qw(x1_move.png x1_resize.png);
1338
1339sub new {
1340 my ($class, %arg) = @_;
1341
1342 my $self = $class->SUPER::new (
1343 bg => [1, 1, 1, 1],
1344 border_bg => [1, 1, 1, 1],
1345 border => 0.6,
1346 can_events => 1,
1347 min_w => 64,
1348 min_h => 32,
1349 %arg,
1350 );
1351
1352 $self->{title_widget} = new CFPlus::UI::Label
1353 align => 0,
1354 valign => 1,
1355 text => $self->{title},
1356 fontsize => $self->{border},
1357 if exists $self->{title};
1358
1359 if ($self->{has_close_button}) {
1360 $self->{close_button} =
1361 new CFPlus::UI::ImageButton
1362 path => 'x1_close.png',
1363 on_activate => sub { $self->emit ("delete") };
1364
1365 $self->CFPlus::UI::Container::add ($self->{close_button});
1366 }
1367
1368 $self
1369}
1370
1371sub add {
1372 my ($self, @widgets) = @_;
1373
1374 $self->SUPER::add (@widgets);
1375 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1376 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1377}
1378
1379sub border {
1380 int $_[0]{border} * $::FONTSIZE
1381}
1382
1383sub size_request {
1384 my ($self) = @_;
1385
1386 $self->{title_widget}->size_request
1387 if $self->{title_widget};
1388
1389 $self->{close_button}->size_request
1390 if $self->{close_button};
1391
1392 my ($w, $h) = $self->SUPER::size_request;
1393
1394 (
1395 $w + $self->border * 2,
1396 $h + $self->border * 2,
1397 )
1398}
1399
1400sub invoke_size_allocate {
1401 my ($self, $w, $h) = @_;
1402
1403 if ($self->{title_widget}) {
1404 $self->{title_widget}{w} = $w;
1405 $self->{title_widget}{h} = $h;
1406 $self->{title_widget}->invoke_size_allocate ($w, $h);
1407 }
1408
1409 my $border = $self->border;
1410
1411 $h -= List::Util::max 0, $border * 2;
1412 $w -= List::Util::max 0, $border * 2;
1413
1414 $self->child->configure ($border, $border, $w, $h);
1415
1416 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1417 if $self->{close_button};
1418
1419 1
1420}
1421
1422sub invoke_delete {
1423 my ($self) = @_;
1424
1425 $self->hide;
1426
1427 1
1428}
1429
919sub button_down { 1430sub invoke_button_down {
920 my ($self, $ev, $x, $y) = @_; 1431 my ($self, $ev, $x, $y) = @_;
921 1432
922 my ($w, $h) = @$self{qw(w h)}; 1433 my ($w, $h) = @$self{qw(w h)};
923 my $border = $self->border; 1434 my $border = $self->border;
924 1435
… …
937 my ($ev, $x, $y) = @_; 1448 my ($ev, $x, $y) = @_;
938 1449
939 my $dx = $ev->{x} - $ox; 1450 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1451 my $dy = $ev->{y} - $oy;
941 1452
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1453 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1454 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1455
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1456 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size; 1457 $self->realloc;
946 }; 1458 };
947 1459
948 } elsif ($lr ^ $td) { 1460 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1461 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1462 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1464 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1465 my ($ev, $x, $y) = @_;
954 1466
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1467 ($x, $y) = ($ev->{x}, $ev->{y});
956 1468
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1469 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update; 1470 # HACK: the next line is required to enforce placement
1471 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
959 }; 1472 };
1473 } else {
1474 return 0;
1475 }
1476
960 } 1477 1
961} 1478}
962 1479
963sub button_up { 1480sub invoke_button_up {
964 my ($self, $ev, $x, $y) = @_; 1481 my ($self, $ev, $x, $y) = @_;
965 1482
966 delete $self->{motion}; 1483 ! ! delete $self->{motion}
967} 1484}
968 1485
969sub mouse_motion { 1486sub invoke_mouse_motion {
970 my ($self, $ev, $x, $y) = @_; 1487 my ($self, $ev, $x, $y) = @_;
971 1488
972 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1489 $self->{motion}->($ev, $x, $y) if $self->{motion};
1490
1491 ! ! $self->{motion}
1492}
1493
1494sub invoke_visibility_change {
1495 my ($self, $visible) = @_;
1496
1497 delete $self->{motion} unless $visible;
1498
1499 0
973} 1500}
974 1501
975sub _draw { 1502sub _draw {
976 my ($self) = @_; 1503 my ($self) = @_;
977 1504
1505 my $child = $self->{children}[0];
1506
978 my ($w, $h ) = ($self->{w}, $self->{h}); 1507 my ($w, $h ) = ($self->{w}, $self->{h});
979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1508 my ($cw, $ch) = ($child->{w}, $child->{h});
980 1509
981 glEnable GL_TEXTURE_2D; 1510 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1512
984 my $border = $self->border; 1513 my $border = $self->border;
985 1514
986 glColor @{ $self->{border_bg} }; 1515 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1516 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1517 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1518 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1519 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1520
1521 # move
1522 my $w2 = ($w - $border) * .5;
1523 my $h2 = ($h - $border) * .5;
1524 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1525 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1526 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1527
1528 # resize
1529 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1530 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1531 unless $self->{has_close_button};
1532 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1533 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
991 1534
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1535 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1536 glColor @{ $self->{bg} };
994 1537
995 # TODO: repeat texture not scale 1538 # TODO: repeat texture not scale
1539 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1540 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1541 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1542 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1543 }
1006 1544
1007 glDisable GL_TEXTURE_2D; 1545 glDisable GL_TEXTURE_2D;
1008 1546
1009 $self->{title}->draw if $self->{title};
1010
1011 $self->child->draw; 1547 $child->draw;
1548
1549 if ($self->{title_widget}) {
1550 glTranslate 0, $border - $self->{h};
1551 $self->{title_widget}->_draw;
1552
1553 glTranslate 0, - ($border - $self->{h});
1554 }
1555
1556 $self->{close_button}->draw
1557 if $self->{close_button};
1012} 1558}
1013 1559
1014############################################################################# 1560#############################################################################
1015 1561
1016package CFClient::UI::Table; 1562package CFPlus::UI::Table;
1017 1563
1018our @ISA = CFClient::UI::Base::; 1564our @ISA = CFPlus::UI::Container::;
1019 1565
1020use List::Util qw(max sum); 1566use List::Util qw(max sum);
1021 1567
1022use CFClient::OpenGL; 1568use CFPlus::OpenGL;
1023 1569
1024sub new { 1570sub new {
1025 my $class = shift; 1571 my $class = shift;
1026 1572
1027 $class->SUPER::new ( 1573 $class->SUPER::new (
1028 col_expand => [], 1574 col_expand => [],
1575 row_expand => [],
1029 @_ 1576 @_,
1030 ) 1577 )
1031} 1578}
1032 1579
1033sub add { 1580sub add {
1034 my ($self, $x, $y, $child) = @_;
1035
1036 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child;
1038
1039 $child->check_size;
1040}
1041
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# TODO: move to container class maybe? send childs a signal on removal?
1047sub clear {
1048 my ($self) = @_; 1581 my ($self, @widgets) = @_;
1582
1583 for my $child (@widgets) {
1584 $child->{c_rowspan} ||= 1;
1585 $child->{c_colspan} ||= 1;
1586 }
1587
1588 $self->SUPER::add (@widgets);
1589}
1590
1591sub add_at {
1592 my $self = shift;
1593
1594 my @widgets;
1595
1596 while (@_) {
1597 my ($col, $row, $child) = splice @_, 0, 3, ();
1598
1599 $child->{c_row} = $row;
1600 $child->{c_col} = $col;
1601
1602 push @widgets, $child;
1603 }
1604
1605 $self->add (@widgets);
1606}
1607
1608sub get_wh {
1609 my ($self) = @_;
1610
1611 my (@w, @h);
1049 1612
1050 my @children = $self->children; 1613 my @children = $self->children;
1051 delete $self->{children}; 1614
1615 # first pass, columns
1616 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1617 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1618
1619 my $sw = sum @w[$c .. $c + $cs - 1];
1620
1621 if ($w > $sw) {
1622 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1623 }
1052 1624 }
1053 for (@children) {
1054 delete $_->{parent};
1055 $_->hide;
1056 }
1057 1625
1058 $self->update; 1626 # second pass, rows
1059} 1627 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1060
1061sub get_wh {
1062 my ($self) = @_;
1063
1064 my (@w, @h);
1065
1066 for my $y (0 .. $#{$self->{children}}) {
1067 my $row = $self->{children}[$y]
1068 or next;
1069
1070 for my $x (0 .. $#$row) {
1071 my $widget = $row->[$x]
1072 or next;
1073 my ($w, $h) = @$widget{qw(req_w req_h)}; 1628 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1074 1629
1075 $w[$x] = max $w[$x], $w; 1630 my $sh = sum @h[$r .. $r + $rs - 1];
1076 $h[$y] = max $h[$y], $h; 1631
1632 if ($h > $sh) {
1633 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1077 } 1634 }
1078 } 1635 }
1079 1636
1080 (\@w, \@h) 1637 (\@w, \@h)
1081} 1638}
… …
1089 (sum @$ws), 1646 (sum @$ws),
1090 (sum @$hs), 1647 (sum @$hs),
1091 ) 1648 )
1092} 1649}
1093 1650
1094sub size_allocate { 1651sub invoke_size_allocate {
1095 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1096 1653
1097 my ($ws, $hs) = $self->get_wh; 1654 my ($ws, $hs) = $self->get_wh;
1098 1655
1099 my $req_w = sum @$ws; 1656 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1657 my $req_h = (sum @$hs) || 1;
1101 1658
1102 # TODO: nicer code && do row_expand 1659 # now linearly scale the rows/columns to the allocated size
1103 my @col_expand = @{$self->{col_expand}}; 1660 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1661 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1662 my $col_expand = (sum @col_expand) || 1;
1106 1663
1107 # linearly scale sizes
1108 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1664 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1109 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1110 1665
1111 CFClient::UI::harmonize $ws; 1666 CFPlus::UI::harmonize $ws;
1667
1668 my @row_expand = @{$self->{row_expand}};
1669 @row_expand = (1) x @$ws unless @row_expand;
1670 my $row_expand = (sum @row_expand) || 1;
1671
1672 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1673
1112 CFClient::UI::harmonize $hs; 1674 CFPlus::UI::harmonize $hs;
1113 1675
1114 my $y; 1676 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1677 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1115 1678
1116 for my $r (0 .. $#{$self->{children}}) { 1679 for my $widget ($self->children) {
1117 my $row = $self->{children}[$r] 1680 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1118 or next;
1119 1681
1120 my $x = 0; 1682 $widget->configure (
1121 my $row_h = $hs->[$r]; 1683 $x[$c], $y[$r],
1684 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1122 1685 );
1123 for my $c (0 .. $#$row) { 1686 }
1124 my $col_w = $ws->[$c];
1125 1687
1126 if (my $widget = $row->[$c]) { 1688 1
1127 $widget->configure ($x, $y, $col_w, $row_h); 1689}
1128 }
1129 1690
1130 $x += $col_w; 1691#############################################################################
1692
1693package CFPlus::UI::Fixed;
1694
1695use List::Util qw(min max);
1696
1697our @ISA = CFPlus::UI::Container::;
1698
1699sub _scale($$$) {
1700 my ($rel, $val, $max) = @_;
1701
1702 $rel ? $val * $max : $val
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707
1708 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1709
1710 # determine overall size by querying abs widgets
1711 for my $child ($self->visible_children) {
1712 unless ($child->{c_rel}) {
1713 my $x = $child->{c_x};
1714 my $y = $child->{c_y};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1131 } 1718 }
1132
1133 $y += $row_h;
1134 } 1719 }
1135 1720
1136} 1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1137 1723
1138sub find_widget { 1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 if ($child->{c_rel}) {
1727 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1728 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1729
1730 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1731 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1732 }
1733 }
1734
1735 my $W = $x2 - $x1;
1736 my $H = $y2 - $y1;
1737
1738 ($W, $H)
1739}
1740
1741sub invoke_size_allocate {
1139 my ($self, $x, $y) = @_; 1742 my ($self, $W, $H) = @_;
1140 1743
1141 $x -= $self->{x}; 1744 for my $child ($self->visible_children) {
1142 $y -= $self->{y}; 1745 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1746 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1143 1747
1144 my $res; 1748 $x += $child->{c_halign} * $child->{req_w};
1749 $y += $child->{c_valign} * $child->{req_h};
1145 1750
1146 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1751 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1147 $res = $_->find_widget ($x, $y) 1752 }
1148 and return $res; 1753
1149 } 1754 1
1150
1151 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1152}
1153
1154sub _draw {
1155 my ($self) = @_;
1156
1157 for (grep $_, @{$self->{children}}) {
1158 $_->draw for grep $_, @$_;
1159 }
1160} 1755}
1161 1756
1162############################################################################# 1757#############################################################################
1163 1758
1164package CFClient::UI::HBox; 1759package CFPlus::UI::Box;
1165 1760
1166# TODO: wrap into common Box base class
1167
1168our @ISA = CFClient::UI::Container::; 1761our @ISA = CFPlus::UI::Container::;
1169 1762
1170sub size_request { 1763sub size_request {
1171 my ($self) = @_; 1764 my ($self) = @_;
1172 1765
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1766 my @children = $self->visible_children;
1174 1767
1768 $self->{vertical}
1769 ? (
1770 (List::Util::max map $_->{req_w}, @children),
1771 (List::Util::sum map $_->{req_h}, @children),
1772 )
1773 : (
1774 (List::Util::sum map $_->{req_w}, @children),
1775 (List::Util::max map $_->{req_h}, @children),
1776 )
1777}
1778
1779sub invoke_size_allocate {
1780 my ($self, $w, $h) = @_;
1781
1782 my $space = $self->{vertical} ? $h : $w;
1783 my @children = $self->visible_children;
1784
1785 my @req;
1786
1787 if ($self->{homogeneous}) {
1788 @req = ($space / (@children || 1)) x @children;
1789 } else {
1790 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1791 my $req = List::Util::sum @req;
1792
1793 if ($req > $space) {
1794 # ah well, not enough space
1795 $_ *= $space / $req for @req;
1796 } else {
1797 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1798
1799 $space = ($space - $req) / $expand; # remaining space to give away
1800
1801 $req[$_] += $space * $children[$_]{expand}
1802 for 0 .. $#children;
1803 }
1175 ( 1804 }
1176 (List::Util::sum map $_->[0], @alloc), 1805
1177 (List::Util::max map $_->[1], @alloc), 1806 CFPlus::UI::harmonize \@req;
1807
1808 my $pos = 0;
1809 for (0 .. $#children) {
1810 my $alloc = $req[$_];
1811 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1812
1813 $pos += $alloc;
1814 }
1815
1816 1
1817}
1818
1819#############################################################################
1820
1821package CFPlus::UI::HBox;
1822
1823our @ISA = CFPlus::UI::Box::;
1824
1825sub new {
1826 my $class = shift;
1827
1828 $class->SUPER::new (
1829 vertical => 0,
1830 @_,
1178 ) 1831 )
1179} 1832}
1180 1833
1181sub size_allocate {
1182 my ($self, $w, $h) = @_;
1183
1184 ($h, $w) = ($w, $h);
1185
1186 my $children = $self->{children};
1187
1188 my @h = map $_->{req_w}, @$children;
1189
1190 my $req_h = List::Util::sum @h;
1191
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } else {
1196 my $exp = List::Util::sum map $_->{expand}, @$children;
1197 $exp ||= 1;
1198
1199 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 }
1206 }
1207
1208 CFClient::UI::harmonize \@h;
1209
1210 my $y = 0;
1211 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_];
1214 $child->configure ($y, 0, $h, $w);
1215
1216 $y += $h;
1217 }
1218
1219 1
1220}
1221
1222############################################################################# 1834#############################################################################
1223 1835
1224package CFClient::UI::VBox; 1836package CFPlus::UI::VBox;
1225 1837
1226# TODO: wrap into common Box base class 1838our @ISA = CFPlus::UI::Box::;
1227 1839
1228our @ISA = CFClient::UI::Container::; 1840sub new {
1841 my $class = shift;
1229 1842
1230sub size_request { 1843 $class->SUPER::new (
1231 my ($self) = @_; 1844 vertical => 1,
1232 1845 @_,
1233 my @alloc = map [$_->size_request], @{$self->{children}};
1234
1235 (
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1846 )
1239} 1847}
1240 1848
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278}
1279
1280############################################################################# 1849#############################################################################
1281 1850
1282package CFClient::UI::Label; 1851package CFPlus::UI::Label;
1283 1852
1284our @ISA = CFClient::UI::DrawBG::; 1853our @ISA = CFPlus::UI::DrawBG::;
1285 1854
1286use CFClient::OpenGL; 1855use CFPlus::OpenGL;
1287 1856
1288sub new { 1857sub new {
1289 my ($class, %arg) = @_; 1858 my ($class, %arg) = @_;
1290 1859
1291 my $self = $class->SUPER::new ( 1860 my $self = $class->SUPER::new (
… …
1294 #active_bg => none 1863 #active_bg => none
1295 #font => default_font 1864 #font => default_font
1296 #text => initial text 1865 #text => initial text
1297 #markup => initial narkup 1866 #markup => initial narkup
1298 #max_w => maximum pixel width 1867 #max_w => maximum pixel width
1868 #style => 0, # render flags
1299 ellipsise => 3, # end 1869 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1870 layout => (new CFPlus::Layout),
1301 fontsize => 1, 1871 fontsize => 1,
1302 align => -1, 1872 align => -1,
1303 valign => -1, 1873 valign => -1,
1304 padding => 2, 1874 padding_x => 2,
1875 padding_y => 2,
1305 can_events => 0, 1876 can_events => 0,
1306 %arg 1877 %arg
1307 ); 1878 );
1308 1879
1309 if (exists $self->{template}) { 1880 if (exists $self->{template}) {
1310 my $layout = new CFClient::Layout; 1881 my $layout = new CFPlus::Layout;
1311 $layout->set_text (delete $self->{template}); 1882 $layout->set_text (delete $self->{template});
1312 $self->{template} = $layout; 1883 $self->{template} = $layout;
1313 } 1884 }
1314 1885
1315 if (exists $self->{markup}) { 1886 if (exists $self->{markup}) {
… …
1319 } 1890 }
1320 1891
1321 $self 1892 $self
1322} 1893}
1323 1894
1324sub escape($) {
1325 local $_ = $_[0];
1326
1327 s/&/&amp;/g;
1328 s/>/&gt;/g;
1329 s/</&lt;/g;
1330
1331 $_
1332}
1333
1334sub update { 1895sub update {
1335 my ($self) = @_; 1896 my ($self) = @_;
1336 1897
1337 delete $self->{texture}; 1898 delete $self->{texture};
1338 $self->SUPER::update; 1899 $self->SUPER::update;
1339} 1900}
1340 1901
1902sub realloc {
1903 my ($self) = @_;
1904
1905 delete $self->{ox};
1906 $self->SUPER::realloc;
1907}
1908
1909sub clear {
1910 my ($self) = @_;
1911
1912 $self->set_text ("");
1913}
1914
1341sub set_text { 1915sub set_text {
1342 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1343 1917
1344 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1345 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
1346 1920
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1921 $self->{layout}->set_text ($text);
1349 1922
1923 delete $self->{size_req};
1924 $self->realloc;
1350 $self->update; 1925 $self->update;
1351 $self->check_size;
1352} 1926}
1353 1927
1354sub set_markup { 1928sub set_markup {
1355 my ($self, $markup) = @_; 1929 my ($self, $markup) = @_;
1356 1930
1357 return if $self->{text} eq "M$markup"; 1931 return if $self->{text} eq "M$markup";
1358 $self->{text} = "M$markup"; 1932 $self->{text} = "M$markup";
1359 1933
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1934 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1935
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1363 $self->{layout}->set_markup ($markup); 1936 $self->{layout}->set_markup ($markup);
1364 1937
1938 delete $self->{size_req};
1939 $self->realloc;
1365 $self->update; 1940 $self->update;
1366 $self->check_size;
1367} 1941}
1368 1942
1369sub size_request { 1943sub size_request {
1370 my ($self) = @_; 1944 my ($self) = @_;
1371 1945
1946 $self->{size_req} ||= do {
1372 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1947 $self->{layout}->set_font ($self->{font}) if $self->{font};
1373 $self->{layout}->set_width ($self->{max_w} || -1); 1948 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1949 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1950 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1951 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1952
1378 my ($w, $h) = $self->{layout}->size; 1953 my ($w, $h) = $self->{layout}->size;
1379 1954
1380 if (exists $self->{template}) { 1955 if (exists $self->{template}) {
1381 $self->{template}->set_font ($self->{font}) if $self->{font}; 1956 $self->{template}->set_font ($self->{font}) if $self->{font};
1957 $self->{template}->set_width ($self->{max_w} || -1);
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1958 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383 1959
1384 my ($w2, $h2) = $self->{template}->size; 1960 my ($w2, $h2) = $self->{template}->size;
1385 1961
1386 $w = List::Util::max $w, $w2; 1962 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1963 $h = List::Util::max $h, $h2;
1964 }
1965
1966 [$w, $h]
1388 } 1967 };
1389 1968
1390 ( 1969 @{ $self->{size_req} }
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1970}
1395 1971
1972sub baseline_shift {
1973 $_[0]{layout}->descent
1974}
1975
1396sub size_allocate { 1976sub invoke_size_allocate {
1397 my ($self, $w, $h) = @_; 1977 my ($self, $w, $h) = @_;
1398 1978
1979 delete $self->{ox};
1980
1399 delete $self->{texture}; 1981 delete $self->{texture}
1982 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1983
1984 1
1400} 1985}
1401 1986
1402sub set_fontsize { 1987sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1988 my ($self, $fontsize) = @_;
1404 1989
1405 $self->{fontsize} = $fontsize; 1990 $self->{fontsize} = $fontsize;
1991 delete $self->{size_req};
1406 delete $self->{texture}; 1992 delete $self->{texture};
1407 1993
1408 $self->update; 1994 $self->realloc;
1409 $self->check_size; 1995}
1996
1997sub reconfigure {
1998 my ($self) = @_;
1999
2000 delete $self->{size_req};
2001 delete $self->{texture};
2002
2003 $self->SUPER::reconfigure;
1410} 2004}
1411 2005
1412sub _draw { 2006sub _draw {
1413 my ($self) = @_; 2007 my ($self) = @_;
1414 2008
1415 $self->SUPER::_draw; # draw background, if applicable 2009 $self->SUPER::_draw; # draw background, if applicable
1416 2010
1417 my $tex = $self->{texture} ||= do { 2011 my $size = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 2012 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2013 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 2014 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2015 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2016 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2017 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 2018
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2019 [$self->{layout}->size]
1426
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429 : ($self->{w} - $tex->{w}) * 0.5);
1430
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1436 }; 2020 };
1437 2021
1438 glEnable GL_TEXTURE_2D; 2022 unless (exists $self->{ox}) {
1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2023 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
2024 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2025 : ($self->{w} - $size->[0]) * 0.5);
1440 2026
1441 if ($tex->{format} == GL_ALPHA) { 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1442 glColor @{$self->{fg}}; 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2029 : ($self->{h} - $size->[1]) * 0.5);
1444 } else { 2030
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 2031 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1446 } 2032 };
1447 2033
1448 glDisable GL_TEXTURE_2D; 2034# unless ($self->{list}) {
2035# $self->{list} = CFPlus::OpenGL::glGenList;
2036# CFPlus::OpenGL::glNewList $self->{list};
2037# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2038# CFPlus::OpenGL::glEndList;
2039# }
2040#
2041# CFPlus::OpenGL::glCallList $self->{list};
2042
2043 $self->{layout}->draw;
1449} 2044}
2045
2046#sub destroy {
2047# my ($self) = @_;
2048#
2049# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2050#
2051# $self->SUPER::destroy;
2052#}
1450 2053
1451############################################################################# 2054#############################################################################
1452 2055
1453package CFClient::UI::EntryBase; 2056package CFPlus::UI::EntryBase;
1454 2057
1455our @ISA = CFClient::UI::Label::; 2058our @ISA = CFPlus::UI::Label::;
1456 2059
1457use CFClient::OpenGL; 2060use CFPlus::OpenGL;
1458 2061
1459sub new { 2062sub new {
1460 my $class = shift; 2063 my $class = shift;
1461 2064
1462 $class->SUPER::new ( 2065 $class->SUPER::new (
1463 fg => [1, 1, 1], 2066 fg => [1, 1, 1],
1464 bg => [0, 0, 0, 0.2], 2067 bg => [0, 0, 0, 0.2],
2068 outline => [0.6, 0.3, 0.1],
1465 active_bg => [1, 1, 1, 0.5], 2069 active_bg => [0, 0, 1, .2],
1466 active_fg => [0, 0, 0], 2070 active_fg => [1, 1, 1],
2071 active_outline => [1, 1, 0],
1467 can_hover => 1, 2072 can_hover => 1,
1468 can_focus => 1, 2073 can_focus => 1,
1469 valign => 0, 2074 valign => 0,
1470 can_events => 1, 2075 can_events => 1,
2076 ellipsise => 0,
2077 #text => ...
2078 #hidden => "*",
1471 @_ 2079 @_
1472 ) 2080 )
1473} 2081}
1474 2082
1475sub _set_text { 2083sub _set_text {
… …
1477 2085
1478 delete $self->{cur_h}; 2086 delete $self->{cur_h};
1479 2087
1480 return if $self->{text} eq $text; 2088 return if $self->{text} eq $text;
1481 2089
1482 delete $self->{texture};
1483
1484 $self->{last_activity} = $::NOW; 2090 $self->{last_activity} = $::NOW;
1485 $self->{text} = $text; 2091 $self->{text} = $text;
1486 2092
1487 $text =~ s/./*/g if $self->{hidden}; 2093 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 2094 $self->{layout}->set_text ("$text ");
2095 delete $self->{size_req};
1489 2096
1490 $self->emit (changed => $self->{text}); 2097 $self->emit (changed => $self->{text});
2098
2099 $self->realloc;
2100 $self->update;
1491} 2101}
1492 2102
1493sub set_text { 2103sub set_text {
1494 my ($self, $text) = @_; 2104 my ($self, $text) = @_;
1495 2105
1496 $self->{cursor} = length $text; 2106 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 2107 $self->_set_text ($text);
1498 $self->update;
1499 $self->check_size;
1500} 2108}
1501 2109
1502sub get_text { 2110sub get_text {
1503 $_[0]{text} 2111 $_[0]{text}
1504} 2112}
… …
1509 my ($w, $h) = $self->SUPER::size_request; 2117 my ($w, $h) = $self->SUPER::size_request;
1510 2118
1511 ($w + 1, $h) # add 1 for cursor 2119 ($w + 1, $h) # add 1 for cursor
1512} 2120}
1513 2121
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518}
1519
1520sub key_down { 2122sub invoke_key_down {
1521 my ($self, $ev) = @_; 2123 my ($self, $ev) = @_;
1522 2124
1523 my $mod = $ev->{mod}; 2125 my $mod = $ev->{mod};
1524 my $sym = $ev->{sym}; 2126 my $sym = $ev->{sym};
1525 my $uni = $ev->{unicode}; 2127 my $uni = $ev->{unicode};
1526 2128
1527 my $text = $self->get_text; 2129 my $text = $self->get_text;
2130
2131 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1528 2132
1529 if ($uni == 8) { 2133 if ($uni == 8) {
1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2134 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1531 } elsif ($uni == 127) { 2135 } elsif ($uni == 127) {
1532 substr $text, $self->{cursor}, 1, ""; 2136 substr $text, $self->{cursor}, 1, "";
1533 } elsif ($sym == CFClient::SDLK_LEFT) { 2137 } elsif ($sym == CFPlus::SDLK_LEFT) {
1534 --$self->{cursor} if $self->{cursor}; 2138 --$self->{cursor} if $self->{cursor};
1535 } elsif ($sym == CFClient::SDLK_RIGHT) { 2139 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1536 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2140 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1537 } elsif ($sym == CFClient::SDLK_HOME) { 2141 } elsif ($sym == CFPlus::SDLK_HOME) {
2142 # what a hack
2143 $self->{cursor} =
2144 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2145 ? length $1
2146 : 0;
2147 } elsif ($sym == CFPlus::SDLK_END) {
2148 # uh, again
2149 $self->{cursor} =
2150 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2151 ? $self->{cursor} + length $1
2152 : length $self->{text};
2153 } elsif ($uni == 21) { # ctrl-u
2154 $text = "";
1538 $self->{cursor} = 0; 2155 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 2156 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 2157 $self->emit ('escape');
1543 } elsif ($uni) { 2158 } elsif ($uni == 0x0d) {
2159 substr $text, $self->{cursor}++, 0, "\012";
2160 } elsif ($uni >= 0x20) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 2161 substr $text, $self->{cursor}++, 0, chr $uni;
2162 } else {
2163 return 0;
1545 } 2164 }
1546 2165
1547 $self->_set_text ($text); 2166 $self->_set_text ($text);
2167
2168 $self->realloc;
1548 $self->update; 2169 $self->update;
1549 $self->check_size;
1550}
1551 2170
2171 1
2172}
2173
1552sub focus_in { 2174sub invoke_focus_in {
1553 my ($self) = @_; 2175 my ($self) = @_;
1554 2176
1555 $self->{last_activity} = $::NOW; 2177 $self->{last_activity} = $::NOW;
1556 2178
1557 $self->SUPER::focus_in; 2179 $self->SUPER::invoke_focus_in
1558} 2180}
1559 2181
1560sub button_down { 2182sub invoke_button_down {
1561 my ($self, $ev, $x, $y) = @_; 2183 my ($self, $ev, $x, $y) = @_;
1562 2184
1563 $self->SUPER::button_down ($ev, $x, $y); 2185 $self->SUPER::invoke_button_down ($ev, $x, $y);
1564 2186
1565 my $idx = $self->{layout}->xy_to_index ($x, $y); 2187 my $idx = $self->{layout}->xy_to_index ($x, $y);
1566 2188
1567 # byte-index to char-index 2189 # byte-index to char-index
1568 my $text = $self->{text}; 2190 my $text = $self->{text};
1569 utf8::encode $text; 2191 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1570 $self->{cursor} = length substr $text, 0, $idx; 2192 $self->{cursor} = length $text;
1571 2193
1572 $self->_set_text ($self->{text}); 2194 $self->_set_text ($self->{text});
1573 $self->update; 2195 $self->update;
2196
2197 1
1574} 2198}
1575 2199
1576sub mouse_motion { 2200sub invoke_mouse_motion {
1577 my ($self, $ev, $x, $y) = @_; 2201 my ($self, $ev, $x, $y) = @_;
1578# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2202# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2203
2204 1
1579} 2205}
1580 2206
1581sub _draw { 2207sub _draw {
1582 my ($self) = @_; 2208 my ($self) = @_;
1583 2209
1584 local $self->{fg} = $self->{fg}; 2210 local $self->{fg} = $self->{fg};
1585 2211
1586 if ($FOCUS == $self) { 2212 if ($FOCUS == $self) {
1587 glColor @{$self->{active_bg}}; 2213 glColor_premultiply @{$self->{active_bg}};
1588 $self->{fg} = $self->{active_fg}; 2214 $self->{fg} = $self->{active_fg};
1589 } else { 2215 } else {
1590 glColor @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
1591 } 2217 }
1592 2218
1593 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1595 glBegin GL_QUADS;
1596 glVertex 0 , 0;
1597 glVertex 0 , $self->{h};
1598 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
1599 glVertex $self->{w}, 0;
1600 glEnd;
1601 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
1602 2223
1603 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
1604 2225
1605 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
1607 2228
1608 unless (exists $self->{cur_h}) { 2229 unless (exists $self->{cur_h}) {
1609 my $text = substr $self->{text}, 0, $self->{cursor}; 2230 my $text = substr $self->{text}, 0, $self->{cursor};
1610 utf8::encode $text; 2231 utf8::encode $text;
1611 2232
1612 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2233 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1613 } 2234 }
1614 2235
1615 glColor @{$self->{fg}}; 2236 glColor_premultiply @{$self->{active_fg}};
1616 glBegin GL_LINES; 2237 glBegin GL_LINES;
1617 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1618 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1619 glEnd; 2240 glEnd;
1620 }
1621}
1622 2241
2242 glLineWidth 3;
2243 glColor @{$self->{active_outline}};
2244 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2245 glLineWidth 1;
2246
2247 } else {
2248 glColor @{$self->{outline}};
2249 glTranslate .375, .375;
2250 glBegin GL_LINE_STRIP;
2251 glVertex 0, $self->{h} * .5;
2252 glVertex 0, $self->{h} - 3;
2253 glVertex $self->{w} - 1, $self->{h} - 3;
2254 glVertex $self->{w} - 1, $self->{h} * .5;
2255 glEnd;
2256 }
2257}
2258
2259#############################################################################
2260
1623package CFClient::UI::Entry; 2261package CFPlus::UI::Entry;
1624 2262
1625our @ISA = CFClient::UI::EntryBase::; 2263our @ISA = CFPlus::UI::EntryBase::;
1626 2264
1627use CFClient::OpenGL; 2265use CFPlus::OpenGL;
1628 2266
1629sub key_down { 2267sub invoke_key_down {
1630 my ($self, $ev) = @_; 2268 my ($self, $ev) = @_;
1631 2269
1632 my $sym = $ev->{sym}; 2270 my $sym = $ev->{sym};
1633 2271
1634 if ($sym == 13) { 2272 if ($ev->{uni} == 0x0d || $sym == 13) {
1635 unshift @{$self->{history}}, 2273 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 2274 my $txt = $self->get_text;
2275
1637 $self->{history_pointer} = -1; 2276 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 2277 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 2278 $self->emit (activate => $txt);
1640 $self->update; 2279 $self->update;
1641 2280
1642 } elsif ($sym == CFClient::SDLK_UP) { 2281 } elsif ($sym == CFPlus::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 2282 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 2283 $self->{history_saveback} = $self->get_text;
1645 } 2284 }
1646 if (@{$self->{history} || []} > 0) { 2285 if (@{$self->{history} || []} > 0) {
1647 $self->{history_pointer}++; 2286 $self->{history_pointer}++;
… …
1649 $self->{history_pointer} = @{$self->{history} || []} - 1; 2288 $self->{history_pointer} = @{$self->{history} || []} - 1;
1650 } 2289 }
1651 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2290 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1652 } 2291 }
1653 2292
1654 } elsif ($sym == CFClient::SDLK_DOWN) { 2293 } elsif ($sym == CFPlus::SDLK_DOWN) {
1655 $self->{history_pointer}--; 2294 $self->{history_pointer}--;
1656 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2295 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1657 2296
1658 if ($self->{history_pointer} >= 0) { 2297 if ($self->{history_pointer} >= 0) {
1659 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2298 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1660 } else { 2299 } else {
1661 $self->set_text ($self->{history_saveback}); 2300 $self->set_text ($self->{history_saveback});
1662 } 2301 }
1663 2302
1664 } else { 2303 } else {
1665 $self->SUPER::key_down ($ev); 2304 return $self->SUPER::invoke_key_down ($ev)
2305 }
2306
1666 } 2307 1
1667
1668} 2308}
1669 2309
1670############################################################################# 2310#############################################################################
1671 2311
2312package CFPlus::UI::TextEdit;
2313
2314our @ISA = CFPlus::UI::EntryBase::;
2315
2316use CFPlus::OpenGL;
2317
2318sub move_cursor_ver {
2319 my ($self, $dy) = @_;
2320
2321 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2322
2323 $y += $dy;
2324
2325 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2326 $self->{cursor} = $index;
2327 delete $self->{cur_h};
2328 $self->update;
2329 return;
2330 }
2331}
2332
2333sub invoke_key_down {
2334 my ($self, $ev) = @_;
2335
2336 my $sym = $ev->{sym};
2337
2338 if ($sym == CFPlus::SDLK_UP) {
2339 $self->move_cursor_ver (-1);
2340 } elsif ($sym == CFPlus::SDLK_DOWN) {
2341 $self->move_cursor_ver (+1);
2342 } else {
2343 return $self->SUPER::invoke_key_down ($ev)
2344 }
2345
2346 1
2347}
2348
2349#############################################################################
2350
1672package CFClient::UI::Button; 2351package CFPlus::UI::ButtonBin;
1673 2352
1674our @ISA = CFClient::UI::Label::; 2353our @ISA = CFPlus::UI::Bin::;
1675 2354
1676use CFClient::OpenGL; 2355use CFPlus::OpenGL;
1677 2356
1678my @tex = 2357my @tex =
1679 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1680 qw(b1_button_active.png); 2359 qw(b1_button_inactive.png b1_button_active.png);
1681 2360
1682sub new { 2361sub new {
1683 my $class = shift; 2362 my $class = shift;
1684 2363
1685 $class->SUPER::new ( 2364 $class->SUPER::new (
1686 padding => 4,
1687 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1],
1689 can_hover => 1, 2365 can_hover => 1,
1690 align => 0, 2366 align => 0,
1691 valign => 0, 2367 valign => 0,
1692 can_events => 1, 2368 can_events => 1,
1693 @_ 2369 @_
1694 ) 2370 )
1695} 2371}
1696 2372
1697sub button_up { 2373sub invoke_button_up {
1698 my ($self, $ev, $x, $y) = @_; 2374 my ($self, $ev, $x, $y) = @_;
1699 2375
2376 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 2377 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 2378 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate"); 2379
1703 } 2380 1
1704} 2381}
1705 2382
1706sub _draw { 2383sub _draw {
1707 my ($self) = @_; 2384 my ($self) = @_;
1708
1709 local $self->{fg} = $self->{fg};
1710
1711 if ($GRAB == $self) {
1712 $self->{fg} = $self->{active_fg};
1713 }
1714 2385
1715 glEnable GL_TEXTURE_2D; 2386 glEnable GL_TEXTURE_2D;
1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2387 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1717 glColor 0, 0, 0, 1; 2388 glColor 0, 0, 0, 1;
1718 2389
2390 my $tex = $tex[$GRAB == $self];
1719 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2391 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1720 2392
1721 glDisable GL_TEXTURE_2D; 2393 glDisable GL_TEXTURE_2D;
1722 2394
1723 $self->SUPER::_draw; 2395 $self->SUPER::_draw;
1724} 2396}
1725 2397
1726############################################################################# 2398#############################################################################
1727 2399
1728package CFClient::UI::CheckBox; 2400package CFPlus::UI::Button;
1729 2401
1730our @ISA = CFClient::UI::DrawBG::; 2402our @ISA = CFPlus::UI::Label::;
2403
2404use CFPlus::OpenGL;
1731 2405
1732my @tex = 2406my @tex =
1733 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2407 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1734 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2408 qw(b1_button_inactive.png b1_button_active.png);
1735
1736use CFClient::OpenGL;
1737 2409
1738sub new { 2410sub new {
1739 my $class = shift; 2411 my $class = shift;
1740 2412
1741 $class->SUPER::new ( 2413 $class->SUPER::new (
2414 padding_x => 4,
2415 padding_y => 4,
2416 fg => [1.0, 1.0, 1.0],
2417 active_fg => [0.8, 0.8, 0.8],
2418 can_hover => 1,
2419 align => 0,
2420 valign => 0,
2421 can_events => 1,
2422 @_
2423 )
2424}
2425
2426sub invoke_button_up {
2427 my ($self, $ev, $x, $y) = @_;
2428
2429 $self->emit ("activate")
2430 if $x >= 0 && $x < $self->{w}
2431 && $y >= 0 && $y < $self->{h};
2432
2433 1
2434}
2435
2436sub _draw {
2437 my ($self) = @_;
2438
2439 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2440
2441 glEnable GL_TEXTURE_2D;
2442 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2443 glColor 0, 0, 0, 1;
2444
2445 my $tex = $tex[$GRAB == $self];
2446 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2447
2448 glDisable GL_TEXTURE_2D;
2449
2450 $self->SUPER::_draw;
2451}
2452
2453#############################################################################
2454
2455package CFPlus::UI::CheckBox;
2456
2457our @ISA = CFPlus::UI::DrawBG::;
2458
2459my @tex =
2460 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2461 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2462
2463use CFPlus::OpenGL;
2464
2465sub new {
2466 my $class = shift;
2467
2468 $class->SUPER::new (
1742 padding => 2, 2469 padding_x => 2,
2470 padding_y => 2,
1743 fg => [1, 1, 1], 2471 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 2472 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 2473 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 2474 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 2475 state => 0,
… …
1751} 2479}
1752 2480
1753sub size_request { 2481sub size_request {
1754 my ($self) = @_; 2482 my ($self) = @_;
1755 2483
1756 ($self->{padding} * 2 + 6) x 2 2484 (6) x 2
1757} 2485}
1758 2486
2487sub toggle {
2488 my ($self) = @_;
2489
2490 $self->{state} = !$self->{state};
2491 $self->emit (changed => $self->{state});
2492 $self->update;
2493}
2494
1759sub button_down { 2495sub invoke_button_down {
1760 my ($self, $ev, $x, $y) = @_; 2496 my ($self, $ev, $x, $y) = @_;
1761 2497
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2498 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2499 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 2500 $self->toggle;
1765 $self->emit (changed => $self->{state}); 2501 } else {
2502 return 0
2503 }
2504
1766 } 2505 1
1767} 2506}
1768 2507
1769sub _draw { 2508sub _draw {
1770 my ($self) = @_; 2509 my ($self) = @_;
1771 2510
1772 $self->SUPER::_draw; 2511 $self->SUPER::_draw;
1773 2512
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2513 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 2514
1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2515 my ($w, $h) = @$self{qw(w h)};
2516
2517 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1777 2518
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2519 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 2520
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2521 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 2522
… …
1784 glDisable GL_TEXTURE_2D; 2525 glDisable GL_TEXTURE_2D;
1785} 2526}
1786 2527
1787############################################################################# 2528#############################################################################
1788 2529
1789package CFClient::UI::Image; 2530package CFPlus::UI::Image;
1790 2531
1791our @ISA = CFClient::UI::Base::; 2532our @ISA = CFPlus::UI::Base::;
1792 2533
1793use CFClient::OpenGL; 2534use CFPlus::OpenGL;
1794use Carp qw/confess/;
1795 2535
1796our %loaded_images; 2536our %texture_cache;
1797 2537
1798sub new { 2538sub new {
1799 my $class = shift; 2539 my $class = shift;
1800 2540
1801 my $self = $class->SUPER::new (can_events => 0, @_); 2541 my $self = $class->SUPER::new (
2542 can_events => 0,
2543 scale => 1,
2544 @_,
2545 );
1802 2546
1803 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2547 $self->{path} || $self->{tex}
2548 or Carp::croak "'path' or 'tex' attributes required";
1804 2549
1805 $loaded_images{$self->{image}} ||= 2550 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1806 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2551 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1807 2552
1808 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2553 CFPlus::weaken $texture_cache{$self->{path}};
1809 2554
1810 Scalar::Util::weaken $loaded_images{$self->{image}}; 2555 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1811
1812 $self->{aspect} = $tex->{w} / $tex->{h};
1813 2556
1814 $self 2557 $self
1815} 2558}
1816 2559
2560sub STORABLE_freeze {
2561 my ($self, $cloning) = @_;
2562
2563 $self->{path}
2564 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2565
2566 $self->{path}
2567}
2568
2569sub STORABLE_attach {
2570 my ($self, $cloning, $path) = @_;
2571
2572 $self->new (path => $path)
2573}
2574
1817sub size_request { 2575sub size_request {
1818 my ($self) = @_; 2576 my ($self) = @_;
1819 2577
1820 ($self->{tex}->{w}, $self->{tex}->{h}) 2578 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
1821} 2579}
1822 2580
1823sub _draw { 2581sub _draw {
1824 my ($self) = @_; 2582 my ($self) = @_;
1825 2583
… …
1842 glDisable GL_TEXTURE_2D; 2600 glDisable GL_TEXTURE_2D;
1843} 2601}
1844 2602
1845############################################################################# 2603#############################################################################
1846 2604
2605package CFPlus::UI::ImageButton;
2606
2607our @ISA = CFPlus::UI::Image::;
2608
2609use CFPlus::OpenGL;
2610
2611my %textures;
2612
2613sub new {
2614 my $class = shift;
2615
2616 my $self = $class->SUPER::new (
2617 padding_x => 4,
2618 padding_y => 4,
2619 fg => [1, 1, 1],
2620 active_fg => [0, 0, 1],
2621 can_hover => 1,
2622 align => 0,
2623 valign => 0,
2624 can_events => 1,
2625 @_
2626 );
2627}
2628
2629sub invoke_button_down {
2630 my ($self, $ev, $x, $y) = @_;
2631
2632 1
2633}
2634
2635sub invoke_button_up {
2636 my ($self, $ev, $x, $y) = @_;
2637
2638 $self->emit ("activate")
2639 if $x >= 0 && $x < $self->{w}
2640 && $y >= 0 && $y < $self->{h};
2641
2642 1
2643}
2644
2645#############################################################################
2646
1847package CFClient::UI::VGauge; 2647package CFPlus::UI::VGauge;
1848 2648
1849our @ISA = CFClient::UI::Base::; 2649our @ISA = CFPlus::UI::Base::;
1850 2650
1851use List::Util qw(min max); 2651use List::Util qw(min max);
1852 2652
1853use CFClient::OpenGL; 2653use CFPlus::OpenGL;
1854 2654
1855my %tex = ( 2655my %tex = (
1856 food => [ 2656 food => [
1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1858 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2658 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1859 ], 2659 ],
1860 grace => [ 2660 grace => [
1861 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2661 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1862 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2662 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1863 ], 2663 ],
1864 hp => [ 2664 hp => [
1865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2665 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1866 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2666 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1867 ], 2667 ],
1868 mana => [ 2668 mana => [
1869 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2669 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1870 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2670 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1871 ], 2671 ],
1872); 2672);
1873 2673
1874# eg. VGauge->new (gauge => 'food'), default gauge: food 2674# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1934 my $ycut1 = max 0, min 1, $ycut; 2734 my $ycut1 = max 0, min 1, $ycut;
1935 my $ycut2 = max 0, min 1, $ycut - 1; 2735 my $ycut2 = max 0, min 1, $ycut - 1;
1936 2736
1937 my $h1 = $self->{h} * (1 - $ycut1); 2737 my $h1 = $self->{h} * (1 - $ycut1);
1938 my $h2 = $self->{h} * (1 - $ycut2); 2738 my $h2 = $self->{h} * (1 - $ycut2);
2739 my $h3 = $self->{h};
2740
2741 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1939 2742
1940 glEnable GL_BLEND; 2743 glEnable GL_BLEND;
1941 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2744 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2745 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1942 glEnable GL_TEXTURE_2D; 2746 glEnable GL_TEXTURE_2D;
1943 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2747 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1944 2748
1945 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2749 glBindTexture GL_TEXTURE_2D, $t1->{name};
1946 glBegin GL_QUADS; 2750 glBegin GL_QUADS;
… …
1961 2765
1962 if ($t3) { 2766 if ($t3) {
1963 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2767 glBindTexture GL_TEXTURE_2D, $t3->{name};
1964 glBegin GL_QUADS; 2768 glBegin GL_QUADS;
1965 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2769 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1966 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2770 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1967 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2771 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1968 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2772 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1969 glEnd; 2773 glEnd;
1970 } 2774 }
1971 2775
1972 glDisable GL_BLEND; 2776 glDisable GL_BLEND;
1973 glDisable GL_TEXTURE_2D; 2777 glDisable GL_TEXTURE_2D;
1974} 2778}
1975 2779
1976############################################################################# 2780#############################################################################
1977 2781
2782package CFPlus::UI::Progress;
2783
2784our @ISA = CFPlus::UI::Label::;
2785
2786use CFPlus::OpenGL;
2787
2788sub new {
2789 my ($class, %arg) = @_;
2790
2791 my $self = $class->SUPER::new (
2792 fg => [1, 1, 1],
2793 bg => [0, 0, 1, 0.2],
2794 bar => [0.7, 0.5, 0.1, 0.8],
2795 outline => [0.4, 0.3, 0],
2796 fontsize => 0.9,
2797 valign => 0,
2798 align => 0,
2799 can_events => 1,
2800 ellipsise => 1,
2801 label => "%d%%",
2802 %arg,
2803 );
2804
2805 $self->set_value ($arg{value} || -1);
2806
2807 $self
2808}
2809
2810sub set_label {
2811 my ($self, $label) = @_;
2812
2813 return if $self->{label} eq $label;
2814 $self->{label} = $label;
2815
2816 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2817}
2818
2819sub set_value {
2820 my ($self, $value) = @_;
2821
2822 if ($self->{value} ne $value) {
2823 $self->{value} = $value;
2824
2825 if ($value < 0) {
2826 $self->set_text ("-");
2827 } else {
2828 $self->set_text (sprintf $self->{label}, $value * 100);
2829 }
2830
2831 $self->update;
2832 }
2833}
2834
2835sub _draw {
2836 my ($self) = @_;
2837
2838 glEnable GL_BLEND;
2839 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2840
2841 if ($self->{value} >= 0) {
2842 my $s = 3 + ($self->{w} - 6) * $self->{value};
2843
2844 glColor_premultiply @{$self->{bar}};
2845 glRect 2, 2, $s, $self->{h} - 2;
2846 glColor_premultiply @{$self->{bg}};
2847 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2848 }
2849
2850 glColor_premultiply @{$self->{outline}};
2851 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2852
2853 glDisable GL_BLEND;
2854
2855 {
2856 local $self->{bg}; # do not draw background
2857 $self->SUPER::_draw;
2858 }
2859}
2860
2861#############################################################################
2862
2863package CFPlus::UI::ExperienceProgress;
2864
2865our @ISA = CFPlus::UI::Progress::;
2866
2867sub new {
2868 my ($class, %arg) = @_;
2869
2870 my $self = $class->SUPER::new (
2871 tooltip => sub {
2872 my ($self) = @_;
2873
2874 sprintf "level %d\n%s points\n%s next level\n%s to go",
2875 $self->{lvl},
2876 ::formsep ($self->{exp}),
2877 ::formsep ($self->{nxt}),
2878 ::formsep ($self->{nxt} - $self->{exp}),
2879 },
2880 %arg
2881 );
2882
2883 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2884 if $::CONN;
2885
2886 $self
2887}
2888
2889sub DESTROY {
2890 my ($self) = @_;
2891
2892 delete $::CONN->{on_exp_update}{$self+0}
2893 if $::CONN;
2894
2895 $self->SUPER::DESTROY;
2896}
2897
2898sub set_value {
2899 my ($self, $lvl, $exp) = @_;
2900
2901<<<<<<< UI.pm
2902 $self->{lvl} = $lvl;
2903 $self->{exp} = $exp;
2904
2905=======
2906 $self->{lvl} = $exp;
2907 $self->{exp} = $exp;
2908
2909>>>>>>> 1.434
2910 my $v = -1;
2911
2912 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2913 my $l0 = $table->[$lvl - 1];
2914 my $l1 = $table->[$lvl];
2915
2916 $self->{nxt} = $l1;
2917
2918 $v = ($exp - $l0) / ($l1 - $l0);
2919 }
2920
2921 $self->SUPER::set_value ($v);
2922}
2923
2924#############################################################################
2925
1978package CFClient::UI::Gauge; 2926package CFPlus::UI::Gauge;
1979 2927
1980our @ISA = CFClient::UI::VBox::; 2928our @ISA = CFPlus::UI::VBox::;
1981 2929
1982sub new { 2930sub new {
1983 my ($class, %arg) = @_; 2931 my ($class, %arg) = @_;
1984 2932
1985 my $self = $class->SUPER::new ( 2933 my $self = $class->SUPER::new (
… …
1987 can_hover => 1, 2935 can_hover => 1,
1988 can_events => 1, 2936 can_events => 1,
1989 %arg, 2937 %arg,
1990 ); 2938 );
1991 2939
1992 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2940 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
1993 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2941 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1994 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2942 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1995 2943
1996 $self 2944 $self
1997} 2945}
1998 2946
1999sub set_fontsize { 2947sub set_fontsize {
… …
2020 $self->{value}->set_text ($val); 2968 $self->{value}->set_text ($val);
2021} 2969}
2022 2970
2023############################################################################# 2971#############################################################################
2024 2972
2025package CFClient::UI::Slider; 2973package CFPlus::UI::Slider;
2026 2974
2027use strict; 2975use strict;
2028 2976
2029use CFClient::OpenGL; 2977use CFPlus::OpenGL;
2030 2978
2031our @ISA = CFClient::UI::DrawBG::; 2979our @ISA = CFPlus::UI::DrawBG::;
2032 2980
2033my @tex = 2981my @tex =
2034 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2982 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2035 qw(s1_slider.png s1_slider_bg.png); 2983 qw(s1_slider.png s1_slider_bg.png);
2036 2984
2037sub new { 2985sub new {
2038 my $class = shift; 2986 my $class = shift;
2039 2987
… …
2045 my $self = $class->SUPER::new ( 2993 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2994 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2995 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2996 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2997 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2998 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2999 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 3000 min_h => $::WIDTH / 80,
2053 vertical => 0, 3001 vertical => 0,
2054 can_hover => 1, 3002 can_hover => 1,
2055 inner_pad => .05, 3003 inner_pad => 0.02,
2056 @_ 3004 @_
2057 ); 3005 );
2058 3006
2059 $self->set_value ($self->{range}[0]); 3007 $self->set_value ($self->{range}[0]);
2060 $self->update; 3008 $self->update;
2061 3009
2062 $self 3010 $self
2063} 3011}
2064 3012
3013sub set_range {
3014 my ($self, $range) = @_;
3015
3016 ($range, $self->{range}) = ($self->{range}, $range);
3017
3018 if ("@$range" ne "@{$self->{range}}") {
3019 $self->update;
3020 $self->set_value ($self->{range}[0]);
3021 }
3022}
3023
2065sub set_value { 3024sub set_value {
2066 my ($self, $value) = @_; 3025 my ($self, $value) = @_;
2067 3026
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3027 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 3028
2070 $hi = $lo + 1 if $hi <= $lo; 3029 $hi = $lo + 1 if $hi <= $lo;
2071 3030
3031 $page = $hi - $lo if $page > $hi - $lo;
3032
2072 $value = $lo if $value < $lo; 3033 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 3034 $value = $hi - $page if $value > $hi - $page;
2074 3035
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3036 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 3037 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079 3038
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3039 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 3040
2082 if ($value != $old_value) { 3041 if ($value != $old_value) {
2083 $self->emit (changed => $value); 3042 $self->emit (changed => $value);
… …
2086} 3045}
2087 3046
2088sub size_request { 3047sub size_request {
2089 my ($self) = @_; 3048 my ($self) = @_;
2090 3049
2091 my $w = $self->{req_w}; 3050 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 3051}
2096 3052
2097sub button_down { 3053sub invoke_button_down {
2098 my ($self, $ev, $x, $y) = @_; 3054 my ($self, $ev, $x, $y) = @_;
2099 3055
2100 $self->SUPER::button_down ($ev, $x, $y); 3056 $self->SUPER::invoke_button_down ($ev, $x, $y);
3057
3058 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
3059
2101 $self->mouse_motion ($ev, $x, $y); 3060 $self->invoke_mouse_motion ($ev, $x, $y);
2102}
2103 3061
3062 1
3063}
3064
2104sub mouse_motion { 3065sub invoke_mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 3066 my ($self, $ev, $x, $y) = @_;
2106 3067
2107 if ($GRAB == $self) { 3068 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3069 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 3070
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3071 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 3072
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 3073 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 3074
2114 $self->set_value ($x * ($hi - $lo) + $lo); 3075 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
3076 } else {
3077 return 0;
3078 }
3079
2115 } 3080 1
3081}
3082
3083sub invoke_mouse_wheel {
3084 my ($self, $ev) = @_;
3085
3086 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3087
3088 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3089
3090 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3091
3092 1
2116} 3093}
2117 3094
2118sub update { 3095sub update {
2119 my ($self) = @_; 3096 my ($self) = @_;
2120 3097
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 3098 delete $self->{knob_w};
3099 $self->SUPER::update;
3100}
3101
3102sub _draw {
3103 my ($self) = @_;
3104
3105 unless ($self->{knob_w}) {
2122 $self->set_value ($self->{range}[0]); 3106 $self->set_value ($self->{range}[0]);
2123 3107
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3108 my ($value, $lo, $hi, $page) = @{$self->{range}};
3109 my $range = ($hi - $page - $lo) || 1e-100;
2125 3110
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 3111 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 3112
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 3113 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
3114 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 3115
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 3116 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 3117 $value = $value * $self->{scale} + $self->{offset};
2132 3118
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 3119 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 3120 $self->{knob_w} = $knob_w;
2140 }); 3121 }
2141
2142 $self->SUPER::update;
2143}
2144
2145sub _draw {
2146 my ($self) = @_;
2147 3122
2148 $self->SUPER::_draw (); 3123 $self->SUPER::_draw ();
2149 3124
2150 glScale $self->{w}, $self->{h}; 3125 glScale $self->{w}, $self->{h};
2151 3126
… …
2171 glDisable GL_TEXTURE_2D; 3146 glDisable GL_TEXTURE_2D;
2172} 3147}
2173 3148
2174############################################################################# 3149#############################################################################
2175 3150
2176package CFClient::UI::TextView; 3151package CFPlus::UI::ValSlider;
2177 3152
2178our @ISA = CFClient::UI::HBox::; 3153our @ISA = CFPlus::UI::HBox::;
2179 3154
3155sub new {
3156 my ($class, %arg) = @_;
3157
3158 my $range = delete $arg{range};
3159
3160 my $self = $class->SUPER::new (
3161 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
3162 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
3163 to_value => sub { shift },
3164 from_value => sub { shift },
3165 %arg,
3166 );
3167
3168 $self->{slider}->connect (changed => sub {
3169 my ($self, $value) = @_;
3170 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
3171 $self->{parent}->emit (changed => $value);
3172 });
3173
3174# $self->{entry}->connect (changed => sub {
3175# my ($self, $value) = @_;
3176# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
3177# $self->{parent}->emit (changed => $value);
3178# });
3179
3180 $self->add ($self->{slider}, $self->{entry});
3181
3182 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
3183
3184 $self
3185}
3186
3187sub set_range { shift->{slider}->set_range (@_) }
3188sub set_value { shift->{slider}->set_value (@_) }
3189
3190#############################################################################
3191
3192package CFPlus::UI::TextScroller;
3193
3194our @ISA = CFPlus::UI::HBox::;
3195
2180use CFClient::OpenGL; 3196use CFPlus::OpenGL;
2181 3197
2182sub new { 3198sub new {
2183 my $class = shift; 3199 my $class = shift;
2184 3200
2185 my $self = $class->SUPER::new ( 3201 my $self = $class->SUPER::new (
2186 fontsize => 1, 3202 fontsize => 1,
2187 can_events => 0, 3203 can_events => 1,
3204 indent => 0,
2188 #font => default_font 3205 #font => default_font
2189 @_, 3206 @_,
2190 3207
2191 layout => (new CFClient::Layout 1), 3208 layout => (new CFPlus::Layout),
2192 par => [], 3209 par => [],
3210 max_par => 0,
2193 height => 0, 3211 height => 0,
2194 children => [ 3212 children => [
2195 (new CFClient::UI::Empty expand => 1), 3213 (new CFPlus::UI::Empty expand => 1),
2196 (new CFClient::UI::Slider vertical => 1), 3214 (new CFPlus::UI::Slider vertical => 1),
2197 ], 3215 ],
2198 ); 3216 );
2199 3217
2200 $self->{children}[1]->connect (changed => sub { $self->update }); 3218 $self->{children}[1]->connect (changed => sub { $self->update });
2201 3219
… …
2207 3225
2208 $self->{fontsize} = $fontsize; 3226 $self->{fontsize} = $fontsize;
2209 $self->reflow; 3227 $self->reflow;
2210} 3228}
2211 3229
2212sub text_height { 3230sub size_request {
3231 my ($self) = @_;
3232
3233 my ($empty, $slider) = $self->visible_children;
3234
3235 local $self->{children} = [$empty, $slider];
3236 $self->SUPER::size_request
3237}
3238
3239sub invoke_size_allocate {
3240 my ($self, $w, $h) = @_;
3241
3242 my ($empty, $slider, @other) = @{ $self->{children} };
3243 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3244
3245 $self->{layout}->set_font ($self->{font}) if $self->{font};
3246 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
3247 $self->{layout}->set_width ($empty->{w});
3248 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3249
3250 $self->reflow;
3251
3252 local $self->{children} = [$empty, $slider];
3253 $self->SUPER::invoke_size_allocate ($w, $h)
3254}
3255
3256sub invoke_mouse_wheel {
2213 my ($self, $text) = @_; 3257 my ($self, $ev) = @_;
3258
3259 return 0 unless $ev->{dy}; # only vertical movements
3260
3261 $self->{children}[1]->emit (mouse_wheel => $ev);
3262
3263 1
3264}
3265
3266sub get_layout {
3267 my ($self, $para) = @_;
2214 3268
2215 my $layout = $self->{layout}; 3269 my $layout = $self->{layout};
2216 3270
3271 $layout->set_font ($self->{font}) if $self->{font};
3272 $layout->set_foreground (@{$para->{fg}});
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3273 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w}); 3274 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3275 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2219 $layout->set_markup ($text); 3276 $layout->set_markup ($para->{markup});
3277
3278 $layout->set_shapes (
3279 map
3280 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3281 @{$para->{widget}}
2220 3282 );
2221 ($layout->size)[1] 3283
3284 $layout
2222} 3285}
2223 3286
2224sub reflow { 3287sub reflow {
2225 my ($self) = @_; 3288 my ($self) = @_;
2226 3289
2227 $self->{need_reflow}++; 3290 $self->{need_reflow}++;
2228 $self->update; 3291 $self->update;
2229} 3292}
2230 3293
2231sub size_allocate { 3294sub set_offset {
3295 my ($self, $offset) = @_;
3296
3297 # todo: base offset on lines or so, not on pixels
3298 $self->{children}[1]->set_value ($offset);
3299}
3300
3301sub current_paragraph {
3302 my ($self) = @_;
3303
3304 $self->{top_paragraph} - 1
3305}
3306
3307sub scroll_to {
2232 my ($self, $w, $h) = @_; 3308 my ($self, $para) = @_;
2233 3309
2234 $self->SUPER::size_allocate ($w, $h); 3310 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2235 3311
2236 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3312 $self->{scroll_to} = $para;
2237 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3313 $self->update;
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 3314}
2239 3315
2240 $self->reflow; 3316sub clear {
3317 my ($self) = @_;
3318
3319 my (undef, undef, @other) = @{ $self->{children} };
3320 $self->remove ($_) for @other;
3321
3322 $self->{par} = [];
3323 $self->{height} = 0;
3324 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2241} 3325}
2242 3326
2243sub add_paragraph { 3327sub add_paragraph {
2244 my ($self, $color, $text) = @_; 3328 my $self = shift;
2245 3329
2246 #TODO: intelligently "reformat" paragraph 3330 for my $para (@_) {
3331 $para = {
3332 fg => [1, 1, 1, 1],
3333 indent => 0,
3334 markup => "",
3335 widget => [],
3336 ref $para ? %$para : (markup => $para),
3337 w => 1e10,
3338 wrapped => 1,
3339 };
2247 3340
2248 my $height = $self->text_height ($text); 3341 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3342 push @{$self->{par}}, $para;
3343 }
2249 3344
3345 if (my $max = $self->{max_par}) {
3346 shift @{$self->{par}} while @{$self->{par}} > $max;
3347 }
3348
3349 $self->{need_reflow}++;
3350 $self->update;
3351}
3352
3353sub scroll_to_bottom {
3354 my ($self) = @_;
3355
3356 $self->{scroll_to} = $#{$self->{par}};
3357 $self->update;
3358}
3359
3360sub force_uptodate {
3361 my ($self) = @_;
3362
3363 if (delete $self->{need_reflow}) {
3364 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3365
3366 my $height = 0;
3367
3368 for my $para (@{$self->{par}}) {
3369 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3370 my $layout = $self->get_layout ($para);
3371 my ($w, $h) = $layout->size;
3372
3373 $para->{w} = $w + $para->{indent};
3374 $para->{h} = $h;
3375 $para->{wrapped} = $layout->has_wrapped;
3376 }
3377
3378 $para->{y} = $height;
3379 $height += $para->{h};
3380 }
3381
2250 $self->{height} += $height; 3382 $self->{height} = $height;
3383 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2251 3384
2252 push @{$self->{par}}, [$height, $color, $text]; 3385 delete $self->{texture};
3386 }
2253 3387
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3388 if (my $paridx = delete $self->{scroll_to}) {
2255 $self->{children}[1]->update; 3389 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3390 }
2256} 3391}
2257 3392
2258sub update { 3393sub update {
2259 my ($self) = @_; 3394 my ($self) = @_;
2260 3395
… …
2262 3397
2263 return unless $self->{h} > 0; 3398 return unless $self->{h} > 0;
2264 3399
2265 delete $self->{texture}; 3400 delete $self->{texture};
2266 3401
2267 $ROOT->on_post_alloc ($self, sub { 3402 $ROOT->on_post_alloc ($self => sub {
2268 if (delete $self->{need_reflow}) { 3403 $self->force_uptodate;
2269 my $height = 0;
2270 3404
2271 $height += $_->[0] = $self->text_height ($_->[2]) 3405 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2272 for @{$self->{par}};
2273 3406
2274 $self->{height} = $height; 3407 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2275
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2277
2278 delete $self->{texture};
2279 }
2280
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 3408 glClearColor 0, 0, 0, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 3409 glClear GL_COLOR_BUFFER_BIT;
2284 3410
2285 glEnable GL_TEXTURE_2D; 3411 package CFPlus::UI::Base;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3412 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3413 (0, 0, $self->{w}, $self->{h});
2287 3414
2288 my $top = int $self->{children}[1]{range}[0]; 3415 my $top = int $self->{children}[1]{range}[0];
2289 3416
3417 my $paridx = 0;
3418 my $top_paragraph;
3419 my $top = int $self->{children}[1]{range}[0];
3420
2290 my $y0 = $top; 3421 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 3422 my $y1 = $top + $H;
2292 3423
2293 my $y = 0;
2294
2295 my $layout = $self->{layout};
2296
2297 $layout->set_font ($self->{font}) if $self->{font};
2298
2299 for my $par (@{$self->{par}}) { 3424 for my $para (@{$self->{par}}) {
2300 my $h = $par->[0]; 3425 my $h = $para->{h};
3426 my $y = $para->{y};
2301 3427
2302 if ($y0 < $y + $h && $y < $y1) { 3428 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 3429 my $layout = $self->get_layout ($para);
2304 $layout->set_markup ($par->[2]);
2305 3430
2306 my ($W, $H) = $layout->size; 3431 $layout->render ($para->{indent}, $y - $y0);
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 3432 $layout->draw;
3433
3434 if (my @w = @{ $para->{widget} }) {
3435 my @s = $layout->get_shapes;
3436
3437 for (@w) {
3438 my ($dx, $dy) = splice @s, 0, 2, ();
3439
3440 $_->{x} = $dx + $para->{indent};
3441 $_->{y} = $dy + $y - $y0;
3442
3443 $_->draw;
3444 }
3445 }
2308 } 3446 }
2309 3447
2310 $y += $h; 3448 $paridx++;
3449 $top_paragraph ||= $paridx if $y >= $top;
2311 } 3450 }
2312 3451
2313 glDisable GL_TEXTURE_2D; 3452 $self->{top_paragraph} = $top_paragraph;
2314 }; 3453 };
2315 }); 3454 });
2316} 3455}
2317 3456
3457sub reconfigure {
3458 my ($self) = @_;
3459
3460 $self->SUPER::reconfigure;
3461
3462 $_->{w} = 1e10 for @{ $self->{par} };
3463 $self->reflow;
3464}
3465
2318sub _draw { 3466sub _draw {
2319 my ($self) = @_; 3467 my ($self) = @_;
2320 3468
2321 glEnable GL_TEXTURE_2D; 3469 glEnable GL_TEXTURE_2D;
2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1; 3471 glColor 0, 0, 0, 1;
2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3472 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2325 glDisable GL_TEXTURE_2D; 3473 glDisable GL_TEXTURE_2D;
2326 3474
2327 $self->{children}[1]->draw; 3475 $self->{children}[1]->draw;
2328
2329} 3476}
2330 3477
2331############################################################################# 3478#############################################################################
2332 3479
2333package CFClient::UI::Animator; 3480package CFPlus::UI::Animator;
2334 3481
2335use CFClient::OpenGL; 3482use CFPlus::OpenGL;
2336 3483
2337our @ISA = CFClient::UI::Bin::; 3484our @ISA = CFPlus::UI::Bin::;
2338 3485
2339sub moveto { 3486sub moveto {
2340 my ($self, $x, $y) = @_; 3487 my ($self, $x, $y) = @_;
2341 3488
2342 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3489 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2370 glPopMatrix; 3517 glPopMatrix;
2371} 3518}
2372 3519
2373############################################################################# 3520#############################################################################
2374 3521
2375package CFClient::UI::Flopper; 3522package CFPlus::UI::Flopper;
2376 3523
2377our @ISA = CFClient::UI::Button::; 3524our @ISA = CFPlus::UI::Button::;
2378 3525
2379sub new { 3526sub new {
2380 my $class = shift; 3527 my $class = shift;
2381 3528
2382 my $self = $class->SUPER::new ( 3529 my $self = $class->SUPER::new (
2383 state => 0, 3530 state => 0,
2384 connect_activate => \&toggle_flopper, 3531 on_activate => \&toggle_flopper,
2385 @_ 3532 @_
2386 ); 3533 );
2387 3534
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 3535 $self
2394} 3536}
2395 3537
2396sub toggle_flopper { 3538sub toggle_flopper {
2397 my ($self) = @_; 3539 my ($self) = @_;
2398 3540
2399 # TODO: use animation 3541 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 3542}
2411 3543
2412############################################################################# 3544#############################################################################
2413 3545
2414package CFClient::UI::Tooltip; 3546package CFPlus::UI::Tooltip;
2415 3547
2416our @ISA = CFClient::UI::Bin::; 3548our @ISA = CFPlus::UI::Bin::;
2417 3549
2418use CFClient::OpenGL; 3550use CFPlus::OpenGL;
2419 3551
2420sub new { 3552sub new {
2421 my $class = shift; 3553 my $class = shift;
2422 3554
2423 $class->SUPER::new ( 3555 $class->SUPER::new (
… …
2427} 3559}
2428 3560
2429sub set_tooltip_from { 3561sub set_tooltip_from {
2430 my ($self, $widget) = @_; 3562 my ($self, $widget) = @_;
2431 3563
3564 my $tip = $widget->{tooltip};
3565 $tip = $tip->($widget) if "CODE" eq ref $tip;
3566
3567 $tip = CFPlus::Pod::section_label tooltip => $1
3568 if $tip =~ /^#(.*)$/;
3569
3570 if ($ENV{CFPLUS_DEBUG} & 2) {
3571 $tip .= "\n\n" . (ref $widget) . "\n"
3572 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3573 . "req $widget->{req_w} $widget->{req_h}\n"
3574 . "visible $widget->{visible}";
3575 }
3576
3577 $tip =~ s/^\n+//;
3578 $tip =~ s/\n+$//;
3579
2432 $self->add (new CFClient::UI::Label 3580 $self->add (new CFPlus::UI::Label
2433 markup => $widget->{tooltip}, 3581 markup => $tip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3582 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 3583 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 3584 style => 1, # FLAG_INVERSE
2437 ellipsise => 0, 3585 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 3586 font => ($widget->{tooltip_font} || $::FONT_PROP),
2439 ); 3587 );
2440} 3588}
2441 3589
… …
2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3593 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2446 3594
2447 ($w + 4, $h + 4) 3595 ($w + 4, $h + 4)
2448} 3596}
2449 3597
2450sub size_allocate { 3598sub invoke_size_allocate {
2451 my ($self, $w, $h) = @_; 3599 my ($self, $w, $h) = @_;
2452 3600
2453 $self->SUPER::size_allocate ($w - 4, $h - 4); 3601 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3602}
3603
3604sub invoke_visibility_change {
3605 my ($self, $visible) = @_;
3606
3607 return unless $visible;
3608
3609 $self->{root}->on_post_alloc ("move_$self" => sub {
3610 my $widget = $self->{owner}
3611 or return;
3612
3613 if ($widget->{visible}) {
3614 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3615
3616 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3617 if $x + $self->{w} > $self->{root}{w};
3618
3619 $self->move_abs ($x, $y);
3620 } else {
3621 $self->hide;
3622 }
3623 });
2454} 3624}
2455 3625
2456sub _draw { 3626sub _draw {
2457 my ($self) = @_; 3627 my ($self) = @_;
2458 3628
2459 glTranslate 0.375, 0.375; 3629 glTranslate 0.375, 0.375;
2460 3630
2461 my ($w, $h) = @$self{qw(w h)}; 3631 my ($w, $h) = @$self{qw(w h)};
2462 3632
2463 glColor 1, 0.8, 0.4; 3633 glColor 1, 0.8, 0.4;
2464 glBegin GL_QUADS; 3634 glRect 0, 0, $w, $h;
2465 glVertex 0 , 0;
2466 glVertex 0 , $h;
2467 glVertex $w, $h;
2468 glVertex $w, 0;
2469 glEnd;
2470 3635
2471 glColor 0, 0, 0; 3636 glColor 0, 0, 0;
2472 glBegin GL_LINE_LOOP; 3637 glRect_lineloop 0, 0, $w, $h;
2473 glVertex 0 , 0;
2474 glVertex 0 , $h;
2475 glVertex $w, $h;
2476 glVertex $w, 0;
2477 glEnd;
2478 3638
2479 glTranslate 2 - 0.375, 2 - 0.375; 3639 glTranslate 2 - 0.375, 2 - 0.375;
3640
2480 $self->SUPER::_draw; 3641 $self->SUPER::_draw;
2481} 3642}
2482 3643
2483############################################################################# 3644#############################################################################
2484 3645
2485package CFClient::UI::Face; 3646package CFPlus::UI::Face;
2486 3647
2487our @ISA = CFClient::UI::Base::; 3648our @ISA = CFPlus::UI::DrawBG::;
2488 3649
2489use CFClient::OpenGL; 3650use CFPlus::OpenGL;
2490 3651
2491sub new { 3652sub new {
2492 my $class = shift; 3653 my $class = shift;
2493 3654
2494 $class->SUPER::new ( 3655 my $self = $class->SUPER::new (
3656 size_w => 32,
3657 size_h => 8,
2495 aspect => 1, 3658 aspect => 1,
3659 can_events => 0,
2496 @_, 3660 @_,
2497 ) 3661 );
3662
3663 if ($self->{anim} && $self->{animspeed}) {
3664 CFPlus::weaken (my $widget = $self);
3665
3666 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3667 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3668 $self->{timer} = Event->timer (
3669 parked => 1,
3670 cb => sub {
3671 return unless $::CONN;
3672
3673 my $w = $widget
3674 or return;
3675
3676 ++$w->{frame};
3677 $w->update_face;
3678
3679 # somehow, $widget can go away
3680 $w->update;
3681 $w->update_timer;
3682 },
3683 );
3684
3685 $self->update_face;
3686 $self->update_timer;
3687 }
3688
3689 $self
3690}
3691
3692sub update_timer {
3693 my ($self) = @_;
3694
3695 return unless $self->{timer};
3696
3697 if ($self->{visible}) {
3698 $self->{timer}->at (
3699 $self->{anim_start}
3700 + $self->{animspeed}
3701 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3702 );
3703 $self->{timer}->start;
3704 } else {
3705 $self->{timer}->stop;
3706 }
3707}
3708
3709sub update_face {
3710 my ($self) = @_;
3711
3712 if ($::CONN) {
3713 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3714 if ($anim && @$anim) {
3715 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3716 delete $self->{face_change_cb};
3717
3718 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3719 unless ($tex->{name} || $tex->{loading}) {
3720 $tex->upload (sub { $self->reconfigure });
3721 }
3722 }
3723 }
3724 }
3725 }
2498} 3726}
2499 3727
2500sub size_request { 3728sub size_request {
2501 (32, 8) 3729 my ($self) = @_;
3730
3731 if ($::CONN) {
3732 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3733 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3734 if ($tex->{name}) {
3735 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3736 } elsif (!$tex->{loading}) {
3737 $tex->upload (sub { $self->reconfigure });
3738 }
3739 }
3740
3741 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3742 }
3743 }
3744
3745 ($self->{size_w} || 8, $self->{size_h} || 8)
3746}
3747
3748sub update {
3749 my ($self) = @_;
3750
3751 return unless $self->{visible};
3752
3753 $self->SUPER::update;
3754}
3755
3756sub invoke_visibility_change {
3757 my ($self) = @_;
3758
3759 $self->update_timer;
3760
3761 0
2502} 3762}
2503 3763
2504sub _draw { 3764sub _draw {
2505 my ($self) = @_; 3765 my ($self) = @_;
2506 3766
2507 return unless $::CONN;#d# manage and cache textures differently 3767 $self->SUPER::_draw;
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2509 3768
2510 # TODO animation 3769 if (my $tex = $self->{tex}) {
2511 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 3770 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3771 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 3772 glColor 0, 0, 0, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3773 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 3774 glDisable GL_TEXTURE_2D;
2517 } 3775 }
2518} 3776}
2519 3777
3778sub destroy {
3779 my ($self) = @_;
3780
3781 (delete $self->{timer})->cancel
3782 if $self->{timer};
3783
3784 $self->SUPER::destroy;
3785}
3786
2520############################################################################# 3787#############################################################################
2521 3788
2522package CFClient::UI::InventoryItem; 3789package CFPlus::UI::Buttonbar;
2523 3790
2524our @ISA = CFClient::UI::HBox::; 3791our @ISA = CFPlus::UI::HBox::;
2525 3792
2526sub _item_to_desc { 3793# TODO: should actually wrap buttons and other goodies.
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2552sub new {
2553 my $class = shift;
2554
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new (
2562 can_hover => 1,
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624 3794
2625############################################################################# 3795#############################################################################
2626 3796
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668}
2669
2670#############################################################################
2671
2672package CFClient::UI::Menu; 3797package CFPlus::UI::Menu;
2673 3798
2674our @ISA = CFClient::UI::FancyFrame::; 3799our @ISA = CFPlus::UI::Toplevel::;
2675 3800
2676use CFClient::OpenGL; 3801use CFPlus::OpenGL;
2677 3802
2678sub new { 3803sub new {
2679 my $class = shift; 3804 my $class = shift;
2680 3805
2681 my $self = $class->SUPER::new ( 3806 my $self = $class->SUPER::new (
2682 items => [], 3807 items => [],
2683 z => 100, 3808 z => 100,
2684 @_, 3809 @_,
2685 ); 3810 );
2686 3811
2687 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3812 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2688 3813
2689 for my $item (@{ $self->{items} }) { 3814 for my $item (@{ $self->{items} }) {
2690 my ($widget, $cb) = @$item; 3815 my ($widget, $cb, $tooltip) = @$item;
2691 3816
2692 # handle various types of items, only text for now 3817 # handle various types of items, only text for now
2693 if (!ref $widget) { 3818 if (!ref $widget) {
3819 if ($widget =~ /\t/) {
3820 my ($left, $right) = split /\t/, $widget, 2;
3821
2694 $widget = new CFClient::UI::Label 3822 $widget = new CFPlus::UI::HBox
2695 can_hover => 1, 3823 can_hover => 1,
2696 can_events => 1, 3824 can_events => 1,
3825 tooltip => $tooltip,
3826 children => [
3827 (new CFPlus::UI::Label markup => $left, expand => 1),
3828 (new CFPlus::UI::Label markup => $right, align => +1),
3829 ],
3830 ;
3831
3832 } else {
3833 $widget = new CFPlus::UI::Label
3834 can_hover => 1,
3835 can_events => 1,
2697 text => $widget; 3836 markup => $widget,
3837 tooltip => $tooltip;
3838 }
2698 } 3839 }
2699 3840
2700 $self->{item}{$widget} = $item; 3841 $self->{item}{$widget} = $item;
2701 3842
2702 $self->{vbox}->add ($widget); 3843 $self->{vbox}->add ($widget);
… …
2714 # maybe save $GRAB? must be careful about events... 3855 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 3856 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 3857 $self->{button} = $ev->{button};
2717 3858
2718 $self->show; 3859 $self->show;
2719 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3860 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2720} 3861}
2721 3862
2722sub mouse_motion { 3863sub invoke_mouse_motion {
2723 my ($self, $ev, $x, $y) = @_; 3864 my ($self, $ev, $x, $y) = @_;
2724 3865
2725 # TODO: should use vbox->find_widget or so 3866 # TODO: should use vbox->find_widget or so
2726 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3867 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2727 $self->{hover} = $self->{item}{$HOVER}; 3868 $self->{hover} = $self->{item}{$HOVER};
2728}
2729 3869
3870 0
3871}
3872
2730sub button_up { 3873sub invoke_button_up {
2731 my ($self, $ev, $x, $y) = @_; 3874 my ($self, $ev, $x, $y) = @_;
2732 3875
2733 if ($ev->{button} == $self->{button}) { 3876 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 3877 undef $GRAB;
2735 $self->hide; 3878 $self->hide;
2736 3879
2737 $self->emit ("popdown"); 3880 $self->emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 3881 $self->{hover}[1]->() if $self->{hover};
3882 } else {
3883 return 0
3884 }
3885
2739 } 3886 1
2740} 3887}
2741 3888
2742############################################################################# 3889#############################################################################
2743 3890
2744package CFClient::UI::Statusbox; 3891package CFPlus::UI::Multiplexer;
2745 3892
2746our @ISA = CFClient::UI::VBox::; 3893our @ISA = CFPlus::UI::Container::;
2747 3894
2748sub new { 3895sub new {
2749 my $class = shift; 3896 my $class = shift;
2750 3897
2751 $class->SUPER::new ( 3898 my $self = $class->SUPER::new (
3899 @_,
3900 );
3901
3902 $self->{current} = $self->{children}[0]
3903 if @{ $self->{children} };
3904
3905 $self
3906}
3907
3908sub add {
3909 my ($self, @widgets) = @_;
3910
3911 $self->SUPER::add (@widgets);
3912
3913 $self->{current} = $self->{children}[0]
3914 if @{ $self->{children} };
3915}
3916
3917sub get_current_page {
3918 my ($self) = @_;
3919
3920 $self->{current}
3921}
3922
3923sub set_current_page {
3924 my ($self, $page_or_widget) = @_;
3925
3926 my $widget = ref $page_or_widget
3927 ? $page_or_widget
3928 : $self->{children}[$page_or_widget];
3929
3930 $self->{current} = $widget;
3931 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3932
3933 $self->emit (page_changed => $self->{current});
3934
3935 $self->realloc;
3936}
3937
3938sub visible_children {
3939 $_[0]{current}
3940}
3941
3942sub size_request {
3943 my ($self) = @_;
3944
3945 $self->{current}->size_request
3946}
3947
3948sub invoke_size_allocate {
3949 my ($self, $w, $h) = @_;
3950
3951 $self->{current}->configure (0, 0, $w, $h);
3952
3953 1
3954}
3955
3956sub _draw {
3957 my ($self) = @_;
3958
3959 $self->{current}->draw;
3960}
3961
3962#############################################################################
3963
3964package CFPlus::UI::Notebook;
3965
3966use CFPlus::OpenGL;
3967
3968our @ISA = CFPlus::UI::VBox::;
3969
3970sub new {
3971 my $class = shift;
3972
3973 my $self = $class->SUPER::new (
3974 buttonbar => (new CFPlus::UI::Buttonbar),
3975 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3976 active_outline => [1, 1, 0],
3977 # filter => # will be put between multiplexer and $self
3978 @_,
3979 );
3980
3981 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3982 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3983
3984 {
3985 Scalar::Util::weaken (my $wself = $self);
3986
3987 $self->{multiplexer}->connect (c_add => sub {
3988 my ($mplex, $widgets) = @_;
3989
3990 for my $child (@$widgets) {
3991 Scalar::Util::weaken $child;
3992 $child->{c_tab_} ||= do {
3993 my $tab =
3994 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3995 ? $child->{c_tab}
3996 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3997
3998 $tab->connect (activate => sub {
3999 $wself->set_current_page ($child);
4000 });
4001
4002 $tab
4003 };
4004
4005 $self->{buttonbar}->add ($child->{c_tab_});
4006 }
4007 });
4008
4009 $self->{multiplexer}->connect (c_remove => sub {
4010 my ($mplex, $widgets) = @_;
4011
4012 for my $child (@$widgets) {
4013 $wself->{buttonbar}->remove ($child->{c_tab_});
4014 }
4015 });
4016 }
4017
4018 $self
4019}
4020
4021sub add {
4022 my ($self, @widgets) = @_;
4023
4024 $self->{multiplexer}->add (@widgets)
4025}
4026
4027sub remove {
4028 my ($self, @widgets) = @_;
4029
4030 $self->{multiplexer}->remove (@widgets)
4031}
4032
4033sub pages {
4034 my ($self) = @_;
4035 $self->{multiplexer}->children
4036}
4037
4038sub add_tab {
4039 my ($self, $title, $widget, $tooltip) = @_;
4040
4041 $title = [$title, $tooltip] unless ref $title;
4042 $widget->{c_tab} = $title;
4043
4044 $self->add ($widget);
4045}
4046
4047sub get_current_page {
4048 my ($self) = @_;
4049
4050 $self->{multiplexer}->get_current_page
4051}
4052
4053sub set_current_page {
4054 my ($self, $page) = @_;
4055
4056 $self->{multiplexer}->set_current_page ($page);
4057 $self->emit (page_changed => $self->{multiplexer}{current});
4058}
4059
4060sub _draw {
4061 my ($self) = @_;
4062
4063 $self->SUPER::_draw ();
4064
4065 if (my $cur = $self->{multiplexer}{current}) {
4066 if ($cur = $cur->{c_tab_}) {
4067 glTranslate $cur->{x}, $cur->{y};
4068 glLineWidth 3;
4069 glColor @{$self->{active_outline}};
4070 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4071 glLineWidth 1;
4072 }
4073 }
4074}
4075
4076#############################################################################
4077
4078package CFPlus::UI::Selector;
4079
4080use utf8;
4081
4082our @ISA = CFPlus::UI::Button::;
4083
4084sub new {
4085 my $class = shift;
4086
4087 my $self = $class->SUPER::new (
4088 options => [], # [value, title, longdesc], ...
4089 value => undef,
4090 @_,
4091 );
4092
4093 $self->_set_value ($self->{value});
4094
4095 $self
4096}
4097
4098sub invoke_button_down {
4099 my ($self, $ev) = @_;
4100
4101 my @menu_items;
4102
4103 for (@{ $self->{options} }) {
4104 my ($value, $title, $tooltip) = @$_;
4105
4106 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4107 }
4108
4109 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
4110}
4111
4112sub _set_value {
4113 my ($self, $value) = @_;
4114
4115 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
4116 or return;
4117
4118 $self->{value} = $item->[0];
4119 $self->set_markup ("$item->[1] ⇓");
4120 $self->set_tooltip ($item->[2]);
4121}
4122
4123sub set_value {
4124 my ($self, $value) = @_;
4125
4126 return unless $self->{value} ne $value;
4127
4128 $self->_set_value ($value);
4129 $self->emit (changed => $value);
4130}
4131
4132#############################################################################
4133
4134package CFPlus::UI::Statusbox;
4135
4136our @ISA = CFPlus::UI::VBox::;
4137
4138sub new {
4139 my $class = shift;
4140
4141 my $self = $class->SUPER::new (
2752 fontsize => 0.8, 4142 fontsize => 0.8,
2753 @_, 4143 @_,
2754 ) 4144 );
4145
4146 CFPlus::weaken (my $this = $self);
4147
4148 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
4149
4150 $self
2755} 4151}
2756 4152
2757sub reorder { 4153sub reorder {
2758 my ($self) = @_; 4154 my ($self) = @_;
2759 my $NOW = time; 4155 my $NOW = Time::HiRes::time;
4156
4157 # freeze display when hovering over any label
4158 return if $CFPlus::UI::TOOLTIP->{owner}
4159 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
4160 values %{ $self->{item} };
2760 4161
2761 while (my ($k, $v) = each %{ $self->{item} }) { 4162 while (my ($k, $v) = each %{ $self->{item} }) {
2762 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4163 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2763 } 4164 }
2764 4165
… …
2767 my @items = sort { 4168 my @items = sort {
2768 $a->{pri} <=> $b->{pri} 4169 $a->{pri} <=> $b->{pri}
2769 or $b->{id} <=> $a->{id} 4170 or $b->{id} <=> $a->{id}
2770 } values %{ $self->{item} }; 4171 } values %{ $self->{item} };
2771 4172
4173 $self->{timer}->interval (1);
4174
2772 my $count = 10 + 1; 4175 my $count = 10 + 1;
2773 for my $item (@items) { 4176 for my $item (@items) {
2774 last unless --$count; 4177 last unless --$count;
2775 4178
2776 push @widgets, $item->{label} ||= do { 4179 my $label = $item->{label} ||= do {
2777 # TODO: doesn't handle markup well (read as: at all) 4180 # TODO: doesn't handle markup well (read as: at all)
2778 my $short = $item->{count} > 1 4181 my $short = $item->{count} > 1
2779 ? "<b>$item->{count} ×</b> $item->{text}" 4182 ? "<b>$item->{count} ×</b> $item->{text}"
2780 : $item->{text}; 4183 : $item->{text};
2781 4184
2782 for ($short) { 4185 for ($short) {
2783 s/^\s+//; 4186 s/^\s+//;
2784 s/\s+/ /g; 4187 s/\s+/ /g;
2785 } 4188 }
2786 4189
2787 new CFClient::UI::Label 4190 new CFPlus::UI::Label
2788 markup => $short, 4191 markup => $short,
2789 tooltip => $item->{tooltip}, 4192 tooltip => $item->{tooltip},
2790 tooltip_font => $::FONT_PROP, 4193 tooltip_font => $::FONT_PROP,
2791 tooltip_width => 0.67, 4194 tooltip_width => 0.67,
2792 fontsize => $item->{fontsize} || $self->{fontsize}, 4195 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44, 4196 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 4197 fg => [@{ $item->{fg} }],
2795 can_events => 1, 4198 can_events => 1,
2796 can_hover => 1 4199 can_hover => 1
2797 }; 4200 };
4201
4202 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4203 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4204 $label->update;
4205 $label->set_max_size (undef, $label->{req_h} * $diff)
4206 if $diff < 1;
4207 $self->{timer}->interval (1/30);
4208 } else {
4209 $label->{fg}[3] = $item->{fg}[3] || 1;
4210 }
4211
4212 push @widgets, $label;
2798 } 4213 }
2799 4214
2800 $self->clear; 4215 $self->clear;
2801 $self->SUPER::add (reverse @widgets); 4216 $self->SUPER::add (reverse @widgets);
2802} 4217}
… …
2805 my ($self, $text, %arg) = @_; 4220 my ($self, $text, %arg) = @_;
2806 4221
2807 $text =~ s/^\s+//; 4222 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 4223 $text =~ s/\s+$//;
2809 4224
4225 return unless $text;
4226
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 4227 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2811 4228
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4229 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 4230
2814 if (my $item = $self->{item}{$group}) { 4231 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) { 4232 if ($item->{text} eq $text) {
2816 $item->{count}++; 4233 $item->{count}++;
2817 } else { 4234 } else {
2818 $item->{count} = 1; 4235 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text; 4236 $item->{text} = $item->{tooltip} = $text;
2820 } 4237 }
2821 $item->{id} = ++$self->{id}; 4238 $item->{id} += 0.2;#d#
2822 $item->{timeout} = $timeout; 4239 $item->{timeout} = $timeout;
2823 delete $item->{label}; 4240 delete $item->{label};
2824 } else { 4241 } else {
2825 $self->{item}{$group} = { 4242 $self->{item}{$group} = {
2826 id => ++$self->{id}, 4243 id => ++$self->{id},
… …
2832 count => 1, 4249 count => 1,
2833 %arg, 4250 %arg,
2834 }; 4251 };
2835 } 4252 }
2836 4253
4254 $ROOT->on_refresh (reorder => sub {
2837 $self->reorder; 4255 $self->reorder;
4256 });
2838} 4257}
2839 4258
2840sub reconfigure { 4259sub reconfigure {
2841 my ($self) = @_; 4260 my ($self) = @_;
2842 4261
… …
2845 4264
2846 $self->reorder; 4265 $self->reorder;
2847 $self->SUPER::reconfigure; 4266 $self->SUPER::reconfigure;
2848} 4267}
2849 4268
4269sub destroy {
4270 my ($self) = @_;
4271
4272 $self->{timer}->cancel;
4273
4274 $self->SUPER::destroy;
4275}
4276
2850############################################################################# 4277#############################################################################
2851 4278
2852package CFClient::UI::Root; 4279package CFPlus::UI::Root;
2853 4280
2854our @ISA = CFClient::UI::Container::; 4281our @ISA = CFPlus::UI::Container::;
2855 4282
4283use List::Util qw(min max);
4284
2856use CFClient::OpenGL; 4285use CFPlus::OpenGL;
2857 4286
2858sub new { 4287sub new {
2859 my $class = shift; 4288 my $class = shift;
2860 4289
2861 $class->SUPER::new ( 4290 my $self = $class->SUPER::new (
4291 visible => 1,
2862 @_, 4292 @_,
2863 ) 4293 );
2864}
2865 4294
2866sub configure { 4295 CFPlus::weaken ($self->{root} = $self);
2867 my ($self, $x, $y, $w, $h) = @_;
2868 4296
2869 $self->{w} = $w; 4297 $self
2870 $self->{h} = $h;
2871}
2872
2873sub check_size {
2874 my ($self) = @_;
2875
2876 $self->size_allocate ($self->{w}, $self->{h})
2877 if $self->{w};
2878} 4298}
2879 4299
2880sub size_request { 4300sub size_request {
2881 my ($self) = @_; 4301 my ($self) = @_;
2882 4302
2883 ($self->{w}, $self->{h}) 4303 ($self->{w}, $self->{h})
2884} 4304}
2885 4305
4306sub _to_pixel {
4307 my ($coord, $size, $max) = @_;
4308
4309 $coord =
4310 $coord eq "center" ? ($max - $size) * 0.5
4311 : $coord eq "max" ? $max
4312 : $coord;
4313
4314 $coord = 0 if $coord < 0;
4315 $coord = $max - $size if $coord > $max - $size;
4316
4317 int $coord + 0.5
4318}
4319
2886sub size_allocate { 4320sub invoke_size_allocate {
2887 my ($self, $w, $h) = @_; 4321 my ($self, $w, $h) = @_;
2888
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894 4322
2895 for my $child ($self->children) { 4323 for my $child ($self->children) {
2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4324 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897 4325
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 4326 $X = $child->{force_x} if exists $child->{force_x};
2899 if exists $child->{req_x}; 4327 $Y = $child->{force_y} if exists $child->{force_y};
2900 4328
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 4329 $X = _to_pixel $X, $W, $self->{w};
2902 if exists $child->{req_y}; 4330 $Y = _to_pixel $Y, $H, $self->{h};
2903
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 4331
2907 $child->configure ($X, $Y, $W, $H); 4332 $child->configure ($X, $Y, $W, $H);
2908 } 4333 }
4334
4335 1
2909} 4336}
2910 4337
2911sub coord2local { 4338sub coord2local {
2912 my ($self, $x, $y) = @_; 4339 my ($self, $x, $y) = @_;
2913 4340
… …
2921} 4348}
2922 4349
2923sub update { 4350sub update {
2924 my ($self) = @_; 4351 my ($self) = @_;
2925 4352
2926 $self->check_size;
2927 $::WANT_REFRESH++; 4353 $::WANT_REFRESH->start;
2928} 4354}
2929 4355
2930sub add { 4356sub add {
2931 my ($self, @children) = @_; 4357 my ($self, @children) = @_;
2932 4358
2933 for my $child (@children) {
2934 $child->{toplevel} = 1; 4359 $_->{is_toplevel} = 1
2935 4360 for @children;
2936 # integerise window positions
2937 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y};
2939 }
2940 4361
2941 $self->SUPER::add (@children); 4362 $self->SUPER::add (@children);
4363}
4364
4365sub remove {
4366 my ($self, @children) = @_;
4367
4368 $self->SUPER::remove (@children);
4369
4370 delete $self->{is_toplevel}
4371 for @children;
4372
4373 while (@children) {
4374 my $w = pop @children;
4375 push @children, $w->children;
4376 $w->set_invisible;
4377 }
2942} 4378}
2943 4379
2944sub on_refresh { 4380sub on_refresh {
2945 my ($self, $id, $cb) = @_; 4381 my ($self, $id, $cb) = @_;
2946 4382
… …
2959 while ($self->{refresh_hook}) { 4395 while ($self->{refresh_hook}) {
2960 $_->() 4396 $_->()
2961 for values %{delete $self->{refresh_hook}}; 4397 for values %{delete $self->{refresh_hook}};
2962 } 4398 }
2963 4399
2964 if ($self->{check_size}) { 4400 while ($self->{realloc}) {
2965 my @queue = ([], []); 4401 my %queue;
4402 my @queue;
4403 my $widget;
2966 4404
2967 for (;;) { 4405 outer:
2968 if ($self->{check_size}) { 4406 while () {
2969 # heuristic: check containers last 4407 if (my $realloc = delete $self->{realloc}) {
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4408 for $widget (values %$realloc) {
2971 for values %{delete $self->{check_size}} 4409 $widget->{visible} or next; # do not resize invisible widgets
4410
4411 $queue{$widget+0}++ and next; # duplicates are common
4412
4413 push @{ $queue[$widget->{visible}] }, $widget;
4414 }
2972 } 4415 }
2973 4416
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4417 while () {
4418 @queue or last outer;
2975 4419
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4420 $widget = pop @{ $queue[-1] || [] }
2977 ? @$widget{qw(user_w user_h)} 4421 and last;
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983 4422
4423 pop @queue;
4424 }
4425
4426 delete $queue{$widget+0};
4427
4428 my ($w, $h) = $widget->size_request;
4429
4430 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4431 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4432
4433 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4434 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4435
4436 $w = $widget->{force_w} if exists $widget->{force_w};
4437 $h = $widget->{force_h} if exists $widget->{force_h};
4438
4439 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4440 || delete $widget->{force_realloc}) {
2984 $widget->{req_w} = $w; 4441 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h; 4442 $widget->{req_h} = $h;
2986 4443
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4444 $self->{size_alloc}{$widget+0} = $widget;
2988 4445
2989 $widget->{parent}->check_size
2990 if $widget->{parent}; 4446 if (my $parent = $widget->{parent}) {
4447 $self->{realloc}{$parent+0} = $parent
4448 unless $queue{$parent+0};
4449
4450 $parent->{force_size_alloc} = 1;
4451 $self->{size_alloc}{$parent+0} = $parent;
4452 }
2991 } 4453 }
4454
4455 delete $self->{realloc}{$widget+0};
2992 } 4456 }
2993 }
2994 4457
2995 while ($self->{size_alloc}) { 4458 while (my $size_alloc = delete $self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) { 4459 my @queue = sort { $a->{visible} <=> $b->{visible} }
2997 my ($widget, $w, $h) = @$_; 4460 values %$size_alloc;
2998 4461
4462 while () {
4463 my $widget = pop @queue || last;
4464
4465 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4466
4467 $w = max $widget->{min_w}, $w;
4468 $h = max $widget->{min_h}, $h;
4469
4470# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4471# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4472
4473 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4474 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4475
2999 $w = 0 if $w < 0; 4476 $w = int $w + 0.5;
3000 $h = 0 if $h < 0; 4477 $h = int $h + 0.5;
3001 4478
4479 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4480 $widget->{old_w} = $widget->{w};
4481 $widget->{old_h} = $widget->{h};
4482
3002 $widget->{w} = $w; 4483 $widget->{w} = $w;
3003 $widget->{h} = $h; 4484 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h); 4485
3005 $widget->emit (size_allocate => $w, $h); 4486 $widget->emit (size_allocate => $w, $h);
4487 }
4488 }
3006 } 4489 }
3007 } 4490 }
3008 4491
3009 while ($self->{post_alloc_hook}) { 4492 while ($self->{post_alloc_hook}) {
3010 $_->() 4493 $_->()
… …
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4498 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 4499 glClear GL_COLOR_BUFFER_BIT;
3017 4500
3018 glMatrixMode GL_PROJECTION; 4501 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 4502 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4503 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 4504 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 4505 glLoadIdentity;
3023 4506
4507 {
4508 package CFPlus::UI::Base;
4509
4510 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4511 (0, 0, $self->{w}, $self->{h});
4512
3024 $self->_draw; 4513 $self->_draw;
4514 }
3025} 4515}
3026 4516
3027############################################################################# 4517#############################################################################
3028 4518
3029package CFClient::UI; 4519package CFPlus::UI;
3030 4520
3031$ROOT = new CFClient::UI::Root; 4521$ROOT = new CFPlus::UI::Root;
3032$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4522$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3033 4523
30341 45241
3035 4525

Diff Legend

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