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

Diff Legend

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