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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.214 by root, Wed May 17 22:59:13 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

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