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.43 by root, Sun Apr 9 22:12:11 2006 UTC vs.
Revision 1.69 by root, Tue Apr 11 17:32:14 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client; 10use CFClient;
11 11
12our $FOCUS; # the widget with current focus 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
13 16
14# class methods for events 17# class methods for events
15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
17sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
18sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
19 74
20sub new { 75sub new {
21 my $class = shift; 76 my $class = shift;
22 77
23 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
24} 84}
25 85
26sub move { 86sub move {
27 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
28 $self->{x} = $x; 88 $self->{x} = $x;
… …
44 104
45 $self->{w} = $w; 105 $self->{w} = $w;
46 $self->{h} = $h; 106 $self->{h} = $h;
47} 107}
48 108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114}
115
49sub focus_in { 116sub focus_in {
50 my ($widget) = @_; 117 my ($self) = @_;
51 $FOCUS = $widget; 118
119 return if $FOCUS == $self;
120
121 my $focus = $FOCUS; $FOCUS = $self;
122 $focus->update if $focus;
123 $FOCUS->update;
52} 124}
53 125
54sub focus_out { 126sub focus_out {
55 my ($widget) = @_; 127 my ($self) = @_;
56}
57 128
129 return unless $FOCUS == $self;
130
131 my $focus = $FOCUS; undef $FOCUS;
132 $focus->update if $focus; #?
133}
134
135sub mouse_motion { }
136sub button_up { }
58sub key_down { 137sub key_down { }
59 my ($widget, $sdlev) = @_;
60}
61
62sub key_up { 138sub key_up { }
63 my ($widget, $sdlev) = @_;
64}
65 139
66sub button_down { 140sub button_down {
67 my ($widget, $sdlev) = @_; 141 my ($self, $ev, $x, $y) = @_;
68}
69 142
70sub button_up { 143 $self->focus_in;
71 my ($widget, $sdlev) = @_;
72} 144}
73 145
74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 146sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 147sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 148sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 149sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 150sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
79 151
80sub draw { 152sub draw {
81 my ($self) = @_; 153 my ($self) = @_;
154
155 return unless $self->{h} && $self->{w};
82 156
83 glPushMatrix; 157 glPushMatrix;
84 glTranslate $self->{x}, $self->{y}, 0; 158 glTranslate $self->{x}, $self->{y}, 0;
85 $self->_draw; 159 $self->_draw;
160 if ($self == $HOVER) {
161 glColor 1, 1, 1, 0.4;
162 glEnable GL_BLEND;
163 glBegin GL_QUADS;
164 glVertex 0 , 0;
165 glVertex $self->{w}, 0;
166 glVertex $self->{w}, $self->{h};
167 glVertex 0 , $self->{h};
168 glEnd;
169 glDisable GL_BLEND;
170 }
86 glPopMatrix; 171 glPopMatrix;
87} 172}
88 173
89sub _draw { 174sub _draw {
90 my ($self) = @_; 175 my ($self) = @_;
… …
139 #$self->deactivate; 224 #$self->deactivate;
140} 225}
141 226
142############################################################################# 227#############################################################################
143 228
144package Crossfire::Client::Widget::Container; 229package CFClient::Widget::DrawBG;
145 230
146our @ISA = Crossfire::Client::Widget::; 231our @ISA = CFClient::Widget::;
232
233use strict;
234use SDL::OpenGL;
147 235
148sub new { 236sub new {
237 my $class = shift;
238
239 # range [value, low, high, page]
240
241 $class->SUPER::new (
242 bg => [0, 0, 0, 0.4],
243 active_bg => [1, 1, 1],
244 @_
245 )
246}
247
248sub _draw {
249 my ($self) = @_;
250
251 my ($w, $h) = @$self{qw(w h)};
252
253 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
254 glBegin GL_QUADS;
255 glVertex 0 , 0;
256 glVertex 0 , $h;
257 glVertex $w, $h;
258 glVertex $w, 0;
259 glEnd;
260}
261
262#############################################################################
263
264package CFClient::Widget::Empty;
265
266our @ISA = CFClient::Widget::;
267
268sub size_request {
269 (0, 0)
270}
271
272sub draw { }
273
274#############################################################################
275
276package CFClient::Widget::Container;
277
278our @ISA = CFClient::Widget::;
279
280sub new {
149 my ($class, @widgets) = @_; 281 my ($class, %arg) = @_;
150 282
283 my $children = delete $arg{children} || [];
284
151 my $self = $class->SUPER::new (children => []); 285 my $self = $class->SUPER::new (children => [], %arg);
152 $self->add ($_) for @widgets; 286 $self->add ($_) for @$children;
153 287
154 $self 288 $self
155} 289}
156 290
157sub add { 291sub add {
158 my ($self, $chld, $expand) = @_; 292 my ($self, $chld, $expand) = @_;
159 293
160 $chld->{expand} = $expand; 294 $chld->{expand} = $expand;
161 $chld->set_parent ($self); 295 $chld->set_parent ($self);
162 296
163 @{$self->{children}} = 297 $self->{children} = [
164 sort { $a->{z} <=> $b->{z} } 298 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld; 299 @{$self->{children}}, $chld
300 ];
166 301
167 $self->size_allocate ($self->{w}, $self->{h}) 302 $self->size_allocate ($self->{w}, $self->{h})
168 if $self->{w}; #TODO: check for "realised state" 303 if $self->{w}; #TODO: check for "realised state"
169} 304}
170 305
… …
177} 312}
178 313
179sub find_widget { 314sub find_widget {
180 my ($self, $x, $y) = @_; 315 my ($self, $x, $y) = @_;
181 316
317 $x -= $self->{x};
318 $y -= $self->{y};
319
182 my $res; 320 my $res;
183 321
184 for (@{ $self->{children} }) { 322 for (reverse @{ $self->{children} }) {
185 $res = $_->find_widget ($x, $y) 323 $res = $_->find_widget ($x, $y)
186 and return $res; 324 and return $res;
187 } 325 }
188 326
189 () 327 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
190} 328}
191 329
192sub _draw { 330sub _draw {
193 my ($self) = @_; 331 my ($self) = @_;
194 332
195 $_->draw for @{$self->{children}}; 333 $_->draw for @{$self->{children}};
196} 334}
197 335
198############################################################################# 336#############################################################################
199 337
200package Crossfire::Client::Widget::Bin; 338package CFClient::Widget::Bin;
201 339
202our @ISA = Crossfire::Client::Widget::Container::; 340our @ISA = CFClient::Widget::Container::;
341
342sub new {
343 my ($class, %arg) = @_;
344
345 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
346
347 $class->SUPER::new (children => [$child], %arg)
348}
349
350sub add {
351 my ($self, $widget) = @_;
352
353 $self->{children} = [];
354
355 $self->SUPER::add ($widget);
356}
357
358sub remove {
359 my ($self, $widget) = @_;
360
361 $self->SUPER::remove ($widget);
362
363 $self->{children} = [new CFClient::Widget::Empty]
364 unless @{$self->{children}};
365}
203 366
204sub child { $_[0]->{children}[0] } 367sub child { $_[0]->{children}[0] }
205 368
206sub size_request { 369sub size_request {
207 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 370 $_[0]{children}[0]->size_request
208} 371}
209 372
210sub size_allocate { 373sub size_allocate {
211 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
212 375
376 return unless $self->{w} != $w || $self->{h} != $h;
377
213 $self->SUPER::size_allocate ($w, $h); 378 $self->SUPER::size_allocate ($w, $h);
214 $self->{children}[0]->size_allocate ($w, $h) 379 $self->{children}[0]->size_allocate ($w, $h);
215 if $self->{children}[0]
216} 380}
217 381
218############################################################################# 382#############################################################################
219 383
220package Crossfire::Client::Widget::Toplevel; 384package CFClient::Widget::Window;
221 385
222our @ISA = Crossfire::Client::Widget::Container::; 386our @ISA = CFClient::Widget::Bin::;
387
388use SDL::OpenGL;
389
390sub new {
391 my ($class, %arg) = @_;
392
393 my $self = $class->SUPER::new (%arg);
394}
223 395
224sub update { 396sub update {
225 my ($self) = @_; 397 my ($self) = @_;
226 398
227 ::refresh (); 399 # we want to do this delayed...
228}
229
230sub add {
231 my ($self, $widget) = @_;
232
233 $self->SUPER::add ($widget);
234
235 $widget->size_allocate ($widget->size_request);
236}
237
238#############################################################################
239
240package Crossfire::Client::Widget::Window;
241
242our @ISA = Crossfire::Client::Widget::Bin::;
243
244use SDL::OpenGL;
245
246sub new {
247 my ($class, $x, $y, $z, $w, $h) = @_;
248
249 my $self = $class->SUPER::new;
250
251 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
252}
253
254sub update {
255 my ($self) = @_;
256
257 $self->render_chld; 400 $self->render_chld;
258 $self->SUPER::update; 401 $self->SUPER::update;
259} 402}
260 403
261sub render_chld { 404sub render_chld {
262 my ($self) = @_; 405 my ($self) = @_;
263 406
264 $self->{texture} = 407 $self->{texture} =
265 Crossfire::Client::Texture->new_from_opengl ( 408 CFClient::Texture->new_from_opengl (
266 $self->{w}, $self->{h}, sub { $self->child->draw } 409 $self->{w}, $self->{h}, sub { $self->child->draw }
267 ); 410 );
268} 411}
269 412
270sub size_allocate { 413sub size_allocate {
271 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
415
416 return unless $self->{w} != $w || $self->{h} != $h;
272 417
273 $self->{w} = $w; 418 $self->{w} = $w;
274 $self->{h} = $h; 419 $self->{h} = $h;
275 420
276 $self->child->size_allocate ($w, $h); 421 $self->child->size_allocate ($w, $h);
… …
287 or return; 432 or return;
288 433
289 glEnable GL_BLEND; 434 glEnable GL_BLEND;
290 glEnable GL_TEXTURE_2D; 435 glEnable GL_TEXTURE_2D;
291 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
292 glBindTexture GL_TEXTURE_2D, $tex->{name};
293 437
294 glBegin GL_QUADS; 438 $tex->draw_quad (0, 0, $w, $h);
295 glTexCoord 0, 0; glVertex 0, 0;
296 glTexCoord 0, 1; glVertex 0, $h;
297 glTexCoord 1, 1; glVertex $w, $h;
298 glTexCoord 1, 0; glVertex $w, 0;
299 glEnd;
300 439
301 glDisable GL_BLEND; 440 glDisable GL_BLEND;
302 glDisable GL_TEXTURE_2D; 441 glDisable GL_TEXTURE_2D;
303} 442}
304 443
305############################################################################# 444#############################################################################
306 445
307package Crossfire::Client::Widget::Frame; 446package CFClient::Widget::Frame;
308 447
309our @ISA = Crossfire::Client::Widget::Bin::; 448our @ISA = CFClient::Widget::Bin::;
310 449
311use SDL::OpenGL; 450use SDL::OpenGL;
312 451
313sub size_request { 452sub size_request {
314 my ($self) = @_; 453 my ($self) = @_;
… …
321} 460}
322 461
323sub size_allocate { 462sub size_allocate {
324 my ($self, $w, $h) = @_; 463 my ($self, $w, $h) = @_;
325 464
465 return unless $self->{w} != $w || $self->{h} != $h;
466
326 $self->{w} = $w; 467 $self->{w} = $w;
327 $self->{h} = $h; 468 $self->{h} = $h;
328 469
329 $self->child->size_allocate ($w - 4, $h - 4); 470 $self->child->size_allocate ($w - 4, $h - 4);
330 $self->child->move (2, 2); 471 $self->child->move (2, 2);
… …
337 478
338 my ($w, $h) = $chld->size_request; 479 my ($w, $h) = $chld->size_request;
339 480
340 glBegin GL_QUADS; 481 glBegin GL_QUADS;
341 glColor 0, 0, 0; 482 glColor 0, 0, 0;
342 glTexCoord 0, 0; glVertex 0 , 0; 483 glVertex 0 , 0;
343 glTexCoord 0, 1; glVertex 0 , $h + 4; 484 glVertex 0 , $h + 4;
344 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 485 glVertex $w + 4 , $h + 4;
345 glTexCoord 1, 0; glVertex $w + 4 , 0; 486 glVertex $w + 4 , 0;
346 glEnd; 487 glEnd;
347 488
348 $chld->draw; 489 $chld->draw;
349} 490}
350 491
351############################################################################# 492#############################################################################
352 493
353package Crossfire::Client::Widget::FancyFrame; 494package CFClient::Widget::FancyFrame;
354 495
355our @ISA = Crossfire::Client::Widget::Bin::; 496our @ISA = CFClient::Widget::Bin::;
356 497
357use SDL::OpenGL; 498use SDL::OpenGL;
358 499
359my @tex = 500my @tex =
360 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 501 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
361 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 502 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
362 503
363sub size_request { 504sub size_request {
364 my ($self) = @_; 505 my ($self) = @_;
365 506
… …
374} 515}
375 516
376sub size_allocate { 517sub size_allocate {
377 my ($self, $w, $h) = @_; 518 my ($self, $w, $h) = @_;
378 519
520 return unless $self->{w} != $w || $self->{h} != $h;
521
379 $self->SUPER::size_allocate ($w, $h); 522 $self->SUPER::size_allocate ($w, $h);
380 523
381 $h -= $tex[1]->{height}; 524 $h -= $tex[1]->{height};
382 $h -= $tex[4]->{height}; 525 $h -= $tex[4]->{height};
383 $w -= $tex[2]->{width}; 526 $w -= $tex[2]->{width};
384 $w -= $tex[3]->{width}; 527 $w -= $tex[3]->{width};
385 528
386 $h = $h < 0 ? 0 : $h; 529 $h = $h < 0 ? 0 : $h;
387 $w = $w < 0 ? 0 : $w; 530 $w = $w < 0 ? 0 : $w;
388 531
532 my $child = $self->child;
533
389 $self->child->size_allocate ($w, $h); 534 $child->size_allocate ($w, $h);
390 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 535 $child->move ($tex[3]->{width}, $tex[1]->{height});
391} 536}
392 537
393sub _draw { 538sub _draw {
394 my ($self) = @_; 539 my ($self) = @_;
395 540
… …
400 glEnable GL_TEXTURE_2D; 545 glEnable GL_TEXTURE_2D;
401 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
402 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
403 548
404 my $top = $tex[1]; 549 my $top = $tex[1];
405 glBindTexture GL_TEXTURE_2D, $top->{name}; 550 $top->draw_quad (0, 0, $w, $top->{height});
406
407 glBegin GL_QUADS;
408 glTexCoord 0, 0; glVertex 0 , 0;
409 glTexCoord 0, 1; glVertex 0 , $top->{height};
410 glTexCoord 1, 1; glVertex $w , $top->{height};
411 glTexCoord 1, 0; glVertex $w , 0;
412 glEnd;
413 551
414 my $left = $tex[3]; 552 my $left = $tex[3];
415 glBindTexture GL_TEXTURE_2D, $left->{name}; 553 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
416
417 glBegin GL_QUADS;
418 glTexCoord 0, 0; glVertex 0 , $top->{height};
419 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
420 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
421 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
422 glEnd;
423 554
424 my $right = $tex[2]; 555 my $right = $tex[2];
425 glBindTexture GL_TEXTURE_2D, $right->{name}; 556 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
426
427 glBegin GL_QUADS;
428 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
429 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
430 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
431 glTexCoord 1, 0; glVertex $w , $top->{height};
432 glEnd;
433 557
434 my $bottom = $tex[4]; 558 my $bottom = $tex[4];
435 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 559 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
436
437 glBegin GL_QUADS;
438 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
439 glTexCoord 0, 1; glVertex 0 , $h;
440 glTexCoord 1, 1; glVertex $w , $h;
441 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
442 glEnd;
443 560
444 my $bg = $tex[0]; 561 my $bg = $tex[0];
445 glBindTexture GL_TEXTURE_2D, $bg->{name}; 562 glBindTexture GL_TEXTURE_2D, $bg->{name};
446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
447 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 564 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
448 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 565 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
449 566
450 my $rep_x = $cw / $bg->{width}; 567 my $rep_x = $cw / $bg->{width};
451 my $rep_y = $ch / $bg->{height}; 568 my $rep_y = $ch / $bg->{height};
452 569
453 glBegin GL_QUADS; 570 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
454 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
455 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
456 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
457 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
458 glEnd;
459 571
460 glDisable GL_BLEND; 572 glDisable GL_BLEND;
461 glDisable GL_TEXTURE_2D; 573 glDisable GL_TEXTURE_2D;
462 574
463 $self->child->draw; 575 $self->child->draw;
464 576
465} 577}
466 578
467############################################################################# 579#############################################################################
468 580
469package Crossfire::Client::Widget::Table; 581package CFClient::Widget::Table;
470 582
471our @ISA = Crossfire::Client::Widget::Bin::; 583our @ISA = CFClient::Widget::Bin::;
472 584
473use SDL::OpenGL; 585use SDL::OpenGL;
474 586
475sub add { 587sub add {
476 my ($self, $x, $y, $chld) = @_; 588 my ($self, $x, $y, $chld) = @_;
… …
551 } 663 }
552} 664}
553 665
554############################################################################# 666#############################################################################
555 667
556package Crossfire::Client::Widget::VBox; 668package CFClient::Widget::VBox;
557 669
558our @ISA = Crossfire::Client::Widget::Container::; 670our @ISA = CFClient::Widget::Container::;
559 671
560use SDL::OpenGL; 672use SDL::OpenGL;
561 673
562sub size_request { 674sub size_request {
563 my ($self) = @_; 675 my ($self) = @_;
… …
571} 683}
572 684
573sub size_allocate { 685sub size_allocate {
574 my ($self, $w, $h) = @_; 686 my ($self, $w, $h) = @_;
575 687
688 return unless $self->{w} != $w || $self->{h} != $h;
689
576 $self->w ($w); 690 $self->{w} = $w;
577 $self->h ($h); 691 $self->{h} = $h;
578 692
579 my $exp; 693 return unless $self->{h};
580 my @oth; 694
581 # find expand widget 695 my $children = $self->{children};
582 for (@{$self->{children}}) { 696
583 if ($_->{expand}) { 697 my @h = map +($_->size_request)[1], @$children;
584 $exp = $_; 698
585 last; 699 my $req_h = List::Util::sum @h;
700
701 if ($req_h > $h) {
702 # ah well, not enough space
703 $_ = $h[$_] * $h / $req_h for @h;
704 } else {
705 my @exp = grep $_->{expand}, @$children;
706 @exp = @$children unless @exp;
707
708 my %exp = map +($_ => 1), @exp;
709
710 for (0 .. $#$children) {
711 my $child = $children->[$_];
712
713 my $alloc_h = $h[$_];
714 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
715 $h[$_] = $alloc_h;
586 } 716 }
587 push @oth, $_;
588 }
589
590 my ($ow, $oh);
591
592 # get sizes of other widgets
593 for (@oth) {
594 my ($w, $h) = $_->size_request;
595 $oh += $h;
596 if ($ow < $w) { $ow = $w }
597 } 717 }
598 718
599 my $y = 0; 719 my $y = 0;
600 for (@{$self->{children}}) { 720 for (0 .. $#$children) {
721 my $child = $children->[$_];
722 my $h = $h[$_];
601 $_->move (0, $y); 723 $child->move (0, $y);
602
603 if ($_ == $exp) {
604 $_->size_allocate ($w, $h - $oh);
605 $y += $h - $oh;
606 } else {
607 my ($cw, $h) = $_->size_request;
608 $_->size_allocate ($w, $h); 724 $child->size_allocate ($w, $h);
725
609 $y += $h; 726 $y += $h;
610 }
611 } 727 }
612} 728}
613 729
614############################################################################# 730#############################################################################
615 731
616package Crossfire::Client::Widget::Label; 732package CFClient::Widget::Label;
617 733
618our @ISA = Crossfire::Client::Widget::; 734our @ISA = CFClient::Widget::;
619 735
620use SDL::OpenGL; 736use SDL::OpenGL;
621 737
622sub new { 738sub new {
623 my ($class, $x, $y, $z, $height, $text) = @_; 739 my ($class, %arg) = @_;
624 740
625 # TODO: color, and make height, xyz etc. optional 741 my $self = $class->SUPER::new (
626 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 742 fg => [1, 1, 1],
743 height => $::FONTSIZE,
744 text => "",
745 layout => new CFClient::Layout,
746 %arg
747 );
627 748
628 $self->set_text ($text); 749 $self->set_text ($self->{text});
629 750
630 $self 751 $self
752}
753
754sub escape_text {
755 local $_ = $_[1];
756
757 s/&/&amp;/g;
758 s/>/&gt;/g;
759 s/</&lt;/g;
760
761 $_[1]
631} 762}
632 763
633sub set_text { 764sub set_text {
634 my ($self, $text) = @_; 765 my ($self, $text) = @_;
635 766
636 $self->{text} = $text; 767 $self->{text} = $text;
637 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 768 $self->{layout}->set_markup ($text);
638 769
770 delete $self->{texture};
639 $self->update; 771 $self->update;
640} 772}
641 773
642sub get_text { 774sub get_text {
643 my ($self, $text) = @_; 775 my ($self, $text) = @_;
… …
646} 778}
647 779
648sub size_request { 780sub size_request {
649 my ($self) = @_; 781 my ($self) = @_;
650 782
651 ( 783 $self->{layout}->set_width;
784 $self->{layout}->set_height ($self->{height});
785 $self->{layout}->size
786# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
787# (
652 $self->{texture}{width}, 788# $self->{texture}{width},
653 $self->{texture}{height}, 789# $self->{texture}{height},
654 ) 790# )
791# } else {
792# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
793#
794# ($w, $h)
795# }
796}
797
798sub size_allocate {
799 my ($self, $w, $h) = @_;
800
801 return unless $self->{w} != $w || $self->{h} != $h;
802
803 $self->SUPER::size_allocate ($w, $h);
804 delete $self->{texture};
805}
806
807sub update {
808 my ($self) = @_;
809
810 delete $self->{texture};
811 $self->SUPER::update;
655} 812}
656 813
657sub _draw { 814sub _draw {
658 my ($self) = @_; 815 my ($self) = @_;
659 816
660 my $tex = $self->{texture}; 817 my $tex = $self->{texture} ||= do {
818 $self->{layout}->set_width ($self->{w});
819 new_from_layout CFClient::Texture $self->{layout};
820 };
661 821
662 glEnable GL_BLEND; 822 glEnable GL_BLEND;
663 glEnable GL_TEXTURE_2D; 823 glEnable GL_TEXTURE_2D;
664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 824 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
666 glBindTexture GL_TEXTURE_2D, $tex->{name};
667 826
668 glColor 1, 0, 0, 1; # TODO color 827 glColor @{$self->{fg}};
669 828
670 glBegin GL_QUADS; 829 $tex->draw_quad (0, 0);
671 glTexCoord 0, 0; glVertex 0 , 0;
672 glTexCoord 0, 1; glVertex 0 , $tex->{height};
673 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
674 glTexCoord 1, 0; glVertex $tex->{width}, 0;
675 glEnd;
676 830
677 glDisable GL_BLEND; 831 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D; 832 glDisable GL_TEXTURE_2D;
679} 833}
680 834
681############################################################################# 835#############################################################################
682 836
683package Crossfire::Client::Widget::TextEntry; 837package CFClient::Widget::Entry;
684 838
685our @ISA = Crossfire::Client::Widget::Label::; 839our @ISA = CFClient::Widget::Label::;
686 840
687use SDL; 841use SDL;
688use SDL::OpenGL; 842use SDL::OpenGL;
689 843
844sub new {
845 my $class = shift;
846
847 $class->SUPER::new (
848 fg => [1, 1, 1],
849 bg => [0, 0, 0, 0.4],
850 active_bg => [1, 1, 1],
851 active_fg => [0, 0, 0],
852 @_
853 )
854}
855
856sub _set_text {
857 my ($self, $text) = @_;
858
859 $self->{last_activity} = $::NOW;
860
861 $self->{text} = $text;
862 $self->{layout}->set_width ($self->{w});
863 $self->{layout}->set_markup ($self->escape_text ($text));
864
865 $text = substr $text, 0, $self->{cursor};
866 utf8::encode $text;
867
868 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
869}
870
871sub size_request {
872 my ($self) = @_;
873
874 my ($w, $h) = $self->SUPER::size_request;
875
876 ($w + 1, $h) # add 1 for cursor
877}
878
879sub size_allocate {
880 my ($self, $w, $h) = @_;
881
882 return unless $self->{w} != $w || $self->{h} != $h;
883
884 $self->SUPER::size_allocate ($w, $h);
885
886 $self->_set_text ($self->{text});
887}
888
889sub set_text {
890 my ($self, $text) = @_;
891
892 $self->{cursor} = length $text;
893 $self->_set_text ($text);
894 $self->update;
895}
896
690sub key_down { 897sub key_down {
691 my ($self, $ev) = @_; 898 my ($self, $ev) = @_;
692 899
693 my $mod = $ev->key_mod; 900 my $mod = $ev->key_mod;
694 my $sym = $ev->key_sym; 901 my $sym = $ev->key_sym;
695 902
696 $ev->set_unicode (1);
697 my $uni = $ev->key_unicode; 903 my $uni = $ev->key_unicode;
698 904
699 my $text = $self->get_text; 905 my $text = $self->get_text;
700 906
701 if ($sym == SDLK_BACKSPACE) { 907 if ($sym == SDLK_BACKSPACE) {
702 substr $text, -1, 1, ''; 908 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
703 909 } elsif ($sym == SDLK_DELETE) {
910 substr $text, $self->{cursor}, 1, "";
911 } elsif ($sym == SDLK_LEFT) {
912 --$self->{cursor} if $self->{cursor};
913 } elsif ($sym == SDLK_RIGHT) {
914 ++$self->{cursor} if $self->{cursor} < length $self->{text};
704 } elsif ($uni) { 915 } elsif ($uni) {
705 $text .= chr $uni; 916 substr $text, $self->{cursor}++, 0, chr $uni;
706 } 917 }
918
707 $self->set_text ($text); 919 $self->_set_text ($text);
920 $self->update;
708} 921}
709 922
710############################################################################# 923sub focus_in {
924 my ($self) = @_;
711 925
926 $self->{last_activity} = $::NOW;
927
928 $self->SUPER::focus_in;
929}
930
931sub button_down {
932 my ($self, $ev, $x, $y) = @_;
933
934 $self->SUPER::button_down ($ev, $x, $y);
935
936 my $idx = $self->{layout}->xy_to_index ($x, $y);
937
938 # byte-index to char-index
939 my $text = $self->{layout};
940 utf8::encode $text;
941 $self->{cursor} = length substr $text, 0, $idx;
942
943 $self->_set_text ($self->{text});
944 $self->update;
945}
946
947sub mouse_motion {
948 my ($self, $ev, $x, $y) = @_;
949# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
950}
951
952sub _draw {
953 my ($self) = @_;
954
955 local $self->{fg} = $self->{fg};
956
957 if ($FOCUS == $self) {
958 glColor @{$self->{active_bg}};
959 $self->{fg} = $self->{active_fg};
960 } else {
961 glColor @{$self->{bg}};
962 }
963
964 glBegin GL_QUADS;
965 glVertex 0 , 0;
966 glVertex 0 , $self->{h};
967 glVertex $self->{w}, $self->{h};
968 glVertex $self->{w}, 0;
969 glEnd;
970
971 $self->SUPER::_draw;
972
973 #TODO: force update every cursor change :(
974 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
975 glColor @{$self->{fg}};
976 glBegin GL_LINES;
977 glVertex $self->{cur_x}, $self->{cur_y};
978 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
979 glEnd;
980 }
981}
982
983#############################################################################
984
985package CFClient::Widget::Slider;
986
987use strict;
988
989use SDL::OpenGL;
990use SDL::OpenGL::Constants;
991
992our @ISA = CFClient::Widget::DrawBG::;
993
994sub size_request {
995 my ($self) = @_;
996
997 my $w = 20;
998 my $h = 10;
999
1000 $self->{vertical} ? ($h, $w) : ($w, $h)
1001}
1002
1003sub new {
1004 my $class = shift;
1005
1006 # range [value, low, high, page]
1007
1008 $class->SUPER::new (
1009 fg => [1, 1, 1],
1010 active_fg => [0, 0, 0],
1011 range => [0, 0, 100, 10],
1012 vertical => 0,
1013 @_
1014 )
1015}
1016
1017sub button_down {
1018 my ($self, $ev, $x, $y) = @_;
1019
1020 $self->SUPER::button_down ($ev, $x, $y);
1021 $self->mouse_motion ($ev, $x, $y);
1022}
1023
1024sub mouse_motion {
1025 my ($self, $ev, $x, $y) = @_;
1026
1027 if ($GRAB == $self) {
1028 my ($value, $lo, $hi, $page) = @{$self->{range}};
1029
1030 $x = $x * ($hi - $lo) / $self->{w} + $lo;
1031 $x = $lo if $x < $lo;
1032 $x = $hi - $page if $x > $hi - $page;
1033 $self->{range}[0] = $x;
1034
1035 $self->{changed}($x) if $self->{changed};
1036 $self->update;
1037 }
1038}
1039
1040sub _draw {
1041 my ($self) = @_;
1042
1043 $self->SUPER::_draw ();
1044
1045 glPushMatrix;
1046
1047 my ($w, $h) = @$self{qw(w h)};
1048
1049 if ($self->{vertical}) {
1050 # draw a vertical slider like a rotated horizontal slider
1051
1052 glTranslate 0, $self->{w};
1053 glRotate 90, 0, 0, 1;
1054
1055 ($w, $h) = ($h, $w);
1056 }
1057
1058 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1059 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1060
1061 my ($value, $lo, $hi, $page) = @{$self->{range}};
1062
1063 $page = int $page * $w / ($hi - $lo);
1064 $value = int +($value - $lo) * $w / ($hi - $lo);
1065
1066 $w -= $page;
1067 $page &= ~1;
1068 glTranslate $page * 0.5, 0, 0;
1069
1070 glColor @$fg;
1071 glBegin GL_LINES;
1072 glVertex 0, 0; glVertex 0, $h;
1073 glVertex $w - 1, 0; glVertex $w - 1, $h;
1074 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1075 glEnd;
1076
1077 my $knob_a = $value - $page * 0.5;
1078 my $knob_b = $value + $page * 0.5;
1079
1080 glBegin GL_QUADS;
1081 glColor @$fg;
1082 glVertex $knob_a, 0;
1083 glVertex $knob_a, $h;
1084 glVertex $knob_b, $h;
1085 glVertex $knob_b, 0;
1086
1087 if ($knob_a < $knob_b - 2) {
1088 glColor @$bg;
1089 glVertex $knob_a + 1, 1;
1090 glVertex $knob_a + 1, $h - 1;
1091 glVertex $knob_b - 1, $h - 1;
1092 glVertex $knob_b - 1, 1;
1093 }
1094 glEnd;
1095
1096 glPopMatrix;
1097}
1098
1099#############################################################################
1100
712package Crossfire::Client::Widget::MapWidget; 1101package CFClient::Widget::MapWidget;
713 1102
714use strict; 1103use strict;
715 1104
716use List::Util qw(min max); 1105use List::Util qw(min max);
717 1106
718use SDL; 1107use SDL;
719use SDL::OpenGL; 1108use SDL::OpenGL;
720use SDL::OpenGL::Constants; 1109use SDL::OpenGL::Constants;
721 1110
722our @ISA = Crossfire::Client::Widget::; 1111our @ISA = CFClient::Widget::;
1112
1113sub new {
1114 my $class = shift;
1115
1116 $class->SUPER::new (
1117 z => -1,
1118 list => (glGenLists 1),
1119 @_
1120 )
1121}
723 1122
724sub key_down { 1123sub key_down {
725 print "MAPKEYDOWN\n"; 1124 print "MAPKEYDOWN\n";
726} 1125}
727 1126
728sub key_up { 1127sub key_up {
729} 1128}
730 1129
731sub size_request { 1130sub size_request {
732 1131 (
1132 1 + int $::WIDTH / 32,
1133 1 + int $::HEIGHT / 32,
1134 )
733} 1135}
734 1136
735sub size_allocate { 1137sub update {
1138 my ($self) = @_;
1139
1140 $self->{need_update} = 1;
736} 1141}
737 1142
738sub _draw { 1143sub _draw {
739 my ($self) = @_; 1144 my ($self) = @_;
740 1145
1146 if (delete $self->{need_update}) {
1147 glNewList $self->{list}, GL_COMPILE;
1148
741 my $mx = $::CONN->{mapx}; 1149 my $mx = $::CONN->{mapx};
742 my $my = $::CONN->{mapy}; 1150 my $my = $::CONN->{mapy};
743 1151
744 my $map = $::CONN->{map}; 1152 my $map = $::CONN->{map};
745 1153
746 my ($xofs, $yofs); 1154 my ($xofs, $yofs);
747 1155
748 my $sw = 1 + int $::WIDTH / 32; 1156 my $sw = 1 + int $::WIDTH / 32;
749 my $sh = 1 + int $::HEIGHT / 32; 1157 my $sh = 1 + int $::HEIGHT / 32;
750 1158
751 if ($::CONN->{mapw} > $sw) { 1159 if ($::CONN->{mapw} > $sw) {
752 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1160 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
753 } else { 1161 } else {
754 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1162 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
755 } 1163 }
756 1164
757 if ($::CONN->{maph} > $sh) { 1165 if ($::CONN->{maph} > $sh) {
758 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1166 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
759 } else { 1167 } else {
760 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1168 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
761 } 1169 }
762 1170
763 glEnable GL_TEXTURE_2D; 1171 glEnable GL_TEXTURE_2D;
764 glEnable GL_BLEND; 1172 glEnable GL_BLEND;
765 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1173 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
766 1174
767 my $sw4 = ($sw + 3) & ~3; 1175 my $sw4 = ($sw + 3) & ~3;
768 my $lighting = "\x00" x ($sw4 * $sh); 1176 my $darkness = "\x00" x ($sw4 * $sh);
769 1177
770 for my $x (0 .. $sw - 1) { 1178 for my $x (0 .. $sw - 1) {
1179 my $row = $map->[$x + $xofs];
771 for my $y (0 .. $sh - 1) { 1180 for my $y (0 .. $sh - 1) {
772 1181
773 my $cell = $map->[$x + $xofs][$y + $yofs] 1182 my $cell = $row->[$y + $yofs]
774 or next; 1183 or next;
775 1184
776 my $darkness = $cell->[0] * (1 / 255); 1185 my $dark = $cell->[0];
777 if ($darkness < 0) { 1186 if ($dark < 0) {
778 $darkness = 0.15; 1187 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1188 } else {
1189 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
779 } 1190 }
780 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
781 1191
782 for my $num (grep $_, @$cell[1,2,3]) { 1192 for my $num (grep $_, @$cell[1,2,3]) {
783 my $tex = $::CONN->{face}[$num]{texture} || next; 1193 my $tex = $::CONN->{face}[$num]{texture} || next;
784 1194
785 glBindTexture GL_TEXTURE_2D, $tex->{name};
786
787 my $w = $tex->{width}; 1195 my $w = $tex->{width};
788 my $h = $tex->{height}; 1196 my $h = $tex->{height};
789 1197
790 my $px = ($x + 1) * 32 - $w; 1198 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
791 my $py = ($y + 1) * 32 - $h;
792
793 glBegin GL_QUADS;
794 glTexCoord 0, 0; glVertex $px , $py;
795 glTexCoord 0, 1; glVertex $px , $py + $h;
796 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
797 glTexCoord 1, 0; glVertex $px + $w, $py;
798 glEnd; 1199 }
799 } 1200 }
800 } 1201 }
801 }
802 1202
803# if (1) { # higher quality darkness 1203# if (1) { # higher quality darkness
804# $lighting =~ s/(.)/$1$1$1/gs; 1204# $lighting =~ s/(.)/$1$1$1/gs;
805# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1205# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
806# 1206#
… …
808# 1208#
809# $lighting = $pb->get_pixels; 1209# $lighting = $pb->get_pixels;
810# $lighting =~ s/(.)../$1/gs; 1210# $lighting =~ s/(.)../$1/gs;
811# } 1211# }
812 1212
813 $lighting = new Crossfire::Client::Texture
814 width => $sw4,
815 height => $sh,
816 data => $lighting,
817 internalformat => GL_ALPHA4,
818 format => GL_ALPHA;
819
820 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1213 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
821 glColor 0, 0, 0, 0.75;
822 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
823 glBindTexture GL_TEXTURE_2D, $lighting->{name};
824 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
825 glBegin GL_QUADS;
826 glTexCoord 0, 0; glVertex 0 , 0;
827 glTexCoord 0, 1; glVertex 0 , $sh * 32;
828 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
829 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
830 glEnd;
831 1215
1216 $darkness = new CFClient::Texture
1217 width => $sw4,
1218 height => $sh,
1219 data => $darkness,
1220 internalformat => GL_ALPHA,
1221 format => GL_ALPHA;
1222
1223 glColor 0.45, 0.45, 0.45, 1;
1224 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1225
832 glDisable GL_TEXTURE_2D; 1226 glDisable GL_TEXTURE_2D;
833 glDisable GL_BLEND; 1227 glDisable GL_BLEND;
1228
1229 glEndList;
1230 }
1231
1232 glCallList $self->{list};
834} 1233}
835 1234
836my %DIR = ( 1235my %DIR = (
837 SDLK_KP8, [1, "north"], 1236 SDLK_KP8, [1, "north"],
838 SDLK_KP9, [2, "northeast"], 1237 SDLK_KP9, [2, "northeast"],
… …
884 } 1283 }
885} 1284}
886 1285
887############################################################################# 1286#############################################################################
888 1287
889package Crossfire::Client::Widget::Animator; 1288package CFClient::Widget::Animator;
890 1289
891use SDL::OpenGL; 1290use SDL::OpenGL;
892 1291
893our @ISA = Crossfire::Client::Widget::Bin::; 1292our @ISA = CFClient::Widget::Bin::;
894 1293
895sub moveto { 1294sub moveto {
896 my ($self, $x, $y) = @_; 1295 my ($self, $x, $y) = @_;
897 1296
898 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1297 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
899 $self->{speed} = 0.2; 1298 $self->{speed} = 0.001;
900 $self->{time} = 1; 1299 $self->{time} = 1;
901 1300
902 ::animation_start $self; 1301 ::animation_start $self;
903} 1302}
904 1303
… …
919 1318
920sub _draw { 1319sub _draw {
921 my ($self) = @_; 1320 my ($self) = @_;
922 1321
923 glPushMatrix; 1322 glPushMatrix;
924 glRotate $self->{time} * 10000, 0, 1, 0; 1323 glRotate $self->{time} * 1000, 0, 1, 0;
925 $self->{children}[0]->draw; 1324 $self->{children}[0]->draw;
926 glPopMatrix; 1325 glPopMatrix;
927} 1326}
928 1327
9291; 1328#############################################################################
930 1329
1330package CFClient::Widget::Toplevel;
1331
1332our @ISA = CFClient::Widget::Container::;
1333
1334sub size_request {
1335 ($::WIDTH, $::HEIGHT)
1336}
1337
1338sub size_allocate {
1339 my ($self, $w, $h) = @_;
1340
1341 $self->SUPER::size_allocate ($w, $h);
1342
1343 $_->size_allocate ($_->size_request)
1344 for @{$self->{children}};
1345}
1346
1347sub translate {
1348 my ($self, $x, $y) = @_;
1349
1350 ($x, $y)
1351}
1352
1353sub update {
1354 my ($self) = @_;
1355
1356 $self->size_allocate ($self->size_request);
1357 ::refresh ();
1358}
1359
1360sub add {
1361 my ($self, $widget) = @_;
1362
1363 $self->SUPER::add ($widget);
1364
1365 $widget->size_allocate ($widget->size_request);
1366}
1367
1368sub draw {
1369 my ($self) = @_;
1370
1371 $self->_draw;
1372}
1373
1374#############################################################################
1375
1376package CFClient::Widget;
1377
1378$TOPLEVEL = new CFClient::Widget::Toplevel;
1379
13801
1381

Diff Legend

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