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

Diff Legend

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