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.38 by root, Sun Apr 9 21:34:49 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
10our $FOCUS; # the widget with current focus 10use CFClient;
11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
11 16
12# class methods for events 17# class methods for events
13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
14sub 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
15sub 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
16sub 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}
17 74
18sub new { 75sub new {
19 my $class = shift; 76 my $class = shift;
20 77
21 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
22} 84}
23 85
24sub move { 86sub move {
25 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
26 $self->{x} = $x; 88 $self->{x} = $x;
… …
37 Carp::confess "size_request is abtract"; 99 Carp::confess "size_request is abtract";
38} 100}
39 101
40sub size_allocate { 102sub size_allocate {
41 my ($self, $w, $h) = @_; 103 my ($self, $w, $h) = @_;
104
42 $self->w ($w); 105 $self->{w} = $w;
43 $self->h ($h); 106 $self->{h} = $h;
107}
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});
44} 114}
45 115
46sub focus_in { 116sub focus_in {
47 my ($widget) = @_; 117 my ($self) = @_;
48 $FOCUS = $widget; 118
119 return if $FOCUS == $self;
120
121 my $focus = $FOCUS; $FOCUS = $self;
122 $focus->update if $focus;
123 $FOCUS->update;
49} 124}
50 125
51sub focus_out { 126sub focus_out {
52 my ($widget) = @_; 127 my ($self) = @_;
53}
54 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 { }
55sub key_down { 137sub key_down { }
56 my ($widget, $sdlev) = @_;
57}
58
59sub key_up { 138sub key_up { }
60 my ($widget, $sdlev) = @_;
61}
62 139
63sub button_down { 140sub button_down {
64 my ($widget, $sdlev) = @_; 141 my ($self, $ev, $x, $y) = @_;
65}
66 142
67sub button_up { 143 $self->focus_in;
68 my ($widget, $sdlev) = @_;
69} 144}
70 145
71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 146sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 147sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 148sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 149sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 150sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
76 151
77sub draw { 152sub draw {
78 my ($self) = @_; 153 my ($self) = @_;
154
155 return unless $self->{h} && $self->{w};
79 156
80 glPushMatrix; 157 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 158 glTranslate $self->{x}, $self->{y}, 0;
82 $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 }
83 glPopMatrix; 171 glPopMatrix;
84} 172}
85 173
86sub _draw { 174sub _draw {
87 my ($self) = @_; 175 my ($self) = @_;
… …
134 my ($self) = @_; 222 my ($self) = @_;
135 223
136 #$self->deactivate; 224 #$self->deactivate;
137} 225}
138 226
139package Crossfire::Client::Widget::Container; 227#############################################################################
140 228
229package CFClient::Widget::DrawBG;
230
141our @ISA = Crossfire::Client::Widget::; 231our @ISA = CFClient::Widget::;
232
233use strict;
234use SDL::OpenGL;
142 235
143sub 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 {
144 my ($class, @widgets) = @_; 281 my ($class, %arg) = @_;
145 282
283 my $children = delete $arg{children} || [];
284
146 my $self = $class->SUPER::new (children => []); 285 my $self = $class->SUPER::new (children => [], %arg);
147 $self->add ($_) for @widgets; 286 $self->add ($_) for @$children;
148 287
149 $self 288 $self
150} 289}
151 290
152sub add { 291sub add {
153 my ($self, $chld, $expand) = @_; 292 my ($self, $chld, $expand) = @_;
154 293
155 $chld->{expand} = $expand; 294 $chld->{expand} = $expand;
156 $chld->set_parent ($self); 295 $chld->set_parent ($self);
157 296
158 @{$self->{children}} = 297 $self->{children} = [
159 sort { $a->{z} <=> $b->{z} } 298 sort { $a->{z} <=> $b->{z} }
160 @{$self->{children}}, $chld; 299 @{$self->{children}}, $chld
300 ];
161 301
162 $self->size_allocate ($self->{w}, $self->{h}); 302 $self->size_allocate ($self->{w}, $self->{h})
303 if $self->{w}; #TODO: check for "realised state"
163} 304}
164 305
165sub remove { 306sub remove {
166 my ($self, $widget) = @_; 307 my ($self, $widget) = @_;
167 308
… …
171} 312}
172 313
173sub find_widget { 314sub find_widget {
174 my ($self, $x, $y) = @_; 315 my ($self, $x, $y) = @_;
175 316
317 $x -= $self->{x};
318 $y -= $self->{y};
319
176 my $res; 320 my $res;
177 321
178 for (@{ $self->{children} }) { 322 for (reverse @{ $self->{children} }) {
179 $res = $_->find_widget ($x, $y) 323 $res = $_->find_widget ($x, $y)
180 and return $res; 324 and return $res;
181 } 325 }
182 326
327 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
328}
329
330sub _draw {
331 my ($self) = @_;
332
333 $_->draw for @{$self->{children}};
334}
335
336#############################################################################
337
338package CFClient::Widget::Bin;
339
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} = [];
183 () 354
355 $self->SUPER::add ($widget);
184} 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}
366
367sub child { $_[0]->{children}[0] }
185 368
186sub size_request { 369sub size_request {
187 my ($self) = @_;
188
189 my ($hs, $ws) = (0, 0);
190 for (@{$self->{children} || []}) {
191 my ($w, $h) = $_->size_request;
192 $hs += $h;
193 if ($ws < $w) { $ws = $w }
194 }
195
196 return ($ws, $hs);
197}
198
199sub _draw {
200 my ($self) = @_;
201
202 $_->draw for @{$self->{children}};
203}
204
205package Crossfire::Client::Widget::Bin;
206
207our @ISA = Crossfire::Client::Widget::Container::;
208
209sub get { $_[0]->{children}[0] }
210
211sub size_request {
212 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 370 $_[0]{children}[0]->size_request
213} 371}
214 372
215sub size_allocate { 373sub size_allocate {
216 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
375
376 return unless $self->{w} != $w || $self->{h} != $h;
377
217 $self->SUPER::size_allocate ($w, $h); 378 $self->SUPER::size_allocate ($w, $h);
218 $self->{children}[0]->size_allocate ($w, $h) 379 $self->{children}[0]->size_allocate ($w, $h);
219 if $self->{children}[0]
220} 380}
221 381
222package Crossfire::Client::Widget::Toplevel; 382#############################################################################
223 383
384package CFClient::Widget::Window;
385
224our @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}
225 395
226sub update { 396sub update {
227 my ($self) = @_; 397 my ($self) = @_;
228 398
229 ::refresh (); 399 # we want to do this delayed...
230}
231
232package Crossfire::Client::Widget::Window;
233
234our @ISA = Crossfire::Client::Widget::Bin::;
235
236use SDL::OpenGL;
237
238sub add {
239 my ($self, $chld) = @_;
240 warn "ADD $chld\n";
241 $self->SUPER::add ($chld);
242 $chld->set_parent ($self);
243}
244
245sub remove {
246 my ($self) = @_;
247 # TODO FIXME: removing a child from a window will crash, see render_chld
248 # $self->update;
249}
250
251sub update {
252 my ($self) = @_;
253 $self->render_chld; 400 $self->render_chld;
401 $self->SUPER::update;
254} 402}
255 403
256sub render_chld { 404sub render_chld {
257 my ($self) = @_; 405 my ($self) = @_;
258 my $chld = $self->get;
259 my ($w, $h) = $self->size_request;
260 406
261 require Carp;
262 Carp::cluck "RENDERCHI $w $h";
263 warn "RENDERCHI $w $h\n";
264 $self->{texture} = 407 $self->{texture} =
265 Crossfire::Client::Texture->new_from_opengl ( 408 CFClient::Texture->new_from_opengl (
266 $w, $h, sub { $chld->draw } 409 $self->{w}, $self->{h}, sub { $self->child->draw }
267 ); 410 );
268 $self->{texture}->upload;
269}
270
271sub size_request {
272 my ($self) = @_;
273 ($self->w, $self->h)
274} 411}
275 412
276sub size_allocate { 413sub size_allocate {
277 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
278 415
416 return unless $self->{w} != $w || $self->{h} != $h;
417
279 $self->w ($w); 418 $self->{w} = $w;
280 $self->h ($h); 419 $self->{h} = $h;
420
281 $self->get->size_allocate ($w, $h); 421 $self->child->size_allocate ($w, $h);
282 422
283 $self->update; #TODO: Move this to the size_request event propably? 423 $self->render_chld;
284} 424}
285 425
286sub _draw { 426sub _draw {
287 my ($self) = @_; 427 my ($self) = @_;
288 428
… …
292 or return; 432 or return;
293 433
294 glEnable GL_BLEND; 434 glEnable GL_BLEND;
295 glEnable GL_TEXTURE_2D; 435 glEnable GL_TEXTURE_2D;
296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
297 glBindTexture GL_TEXTURE_2D, $tex->{name};
298 437
299 glBegin GL_QUADS; 438 $tex->draw_quad (0, 0, $w, $h);
300 glTexCoord 0, 0; glVertex 0, 0;
301 glTexCoord 0, 1; glVertex 0, $h;
302 glTexCoord 1, 1; glVertex $w, $h;
303 glTexCoord 1, 0; glVertex $w, 0;
304 glEnd;
305 439
306 glDisable GL_BLEND; 440 glDisable GL_BLEND;
307 glDisable GL_TEXTURE_2D; 441 glDisable GL_TEXTURE_2D;
308} 442}
309 443
444#############################################################################
445
310package Crossfire::Client::Widget::Frame; 446package CFClient::Widget::Frame;
311 447
312our @ISA = Crossfire::Client::Widget::Bin::; 448our @ISA = CFClient::Widget::Bin::;
313 449
314use SDL::OpenGL; 450use SDL::OpenGL;
315 451
316sub size_request { 452sub size_request {
317 my ($self) = @_; 453 my ($self) = @_;
318 my $chld = $self->get 454 my $chld = $self->child
319 or return (0, 0); 455 or return (0, 0);
320 456
321 $chld->move (2, 2); 457 $chld->move (2, 2);
322 458
323 map { $_ + 4 } $chld->size_request; 459 map { $_ + 4 } $chld->size_request;
324} 460}
325 461
326sub size_allocate { 462sub size_allocate {
327 my ($self, $w, $h) = @_; 463 my ($self, $w, $h) = @_;
464
465 return unless $self->{w} != $w || $self->{h} != $h;
328 466
329 $self->w ($w); 467 $self->{w} = $w;
330 $self->h ($h); 468 $self->{h} = $h;
331 469
332 $self->get->size_allocate ($w - 4, $h - 4); 470 $self->child->size_allocate ($w - 4, $h - 4);
333 $self->get->move (2, 2); 471 $self->child->move (2, 2);
334} 472}
335 473
336sub _draw { 474sub _draw {
337 my ($self) = @_; 475 my ($self) = @_;
338 476
339 my $chld = $self->get; 477 my $chld = $self->child;
340 478
341 my ($w, $h) = $chld->size_request; 479 my ($w, $h) = $chld->size_request;
342 480
343 glBegin GL_QUADS; 481 glBegin GL_QUADS;
344 glColor 0, 0, 0; 482 glColor 0, 0, 0;
345 glTexCoord 0, 0; glVertex 0 , 0; 483 glVertex 0 , 0;
346 glTexCoord 0, 1; glVertex 0 , $h + 4; 484 glVertex 0 , $h + 4;
347 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 485 glVertex $w + 4 , $h + 4;
348 glTexCoord 1, 0; glVertex $w + 4 , 0; 486 glVertex $w + 4 , 0;
349 glEnd; 487 glEnd;
350 488
351 $chld->draw; 489 $chld->draw;
352} 490}
353 491
492#############################################################################
493
354package Crossfire::Client::Widget::FancyFrame; 494package CFClient::Widget::FancyFrame;
355 495
356our @ISA = Crossfire::Client::Widget::Frame::; 496our @ISA = CFClient::Widget::Bin::;
357 497
358use SDL::OpenGL; 498use SDL::OpenGL;
359 499
360sub new { 500my @tex =
361 my ($self, $theme) = @_;
362 $self = $self->SUPER::new;
363
364 $self->{txts} = [
365 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 501 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
366 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);
367 ];
368 $self
369}
370 503
371sub size_request { 504sub size_request {
372 my ($self) = @_; 505 my ($self) = @_;
506
373 my ($w, $h) = $self->get->size_request; 507 my ($w, $h) = $self->SUPER::size_request;
374 508
375 $h += $self->{txts}->[1]->{height}; 509 $h += $tex[1]->{height};
376 $h += $self->{txts}->[4]->{height}; 510 $h += $tex[4]->{height};
377 $w += $self->{txts}->[2]->{width}; 511 $w += $tex[2]->{width};
378 $w += $self->{txts}->[3]->{width}; 512 $w += $tex[3]->{width};
379 513
380 ($w, $h) 514 ($w, $h)
381} 515}
382 516
383sub size_allocate { 517sub size_allocate {
384 my ($self, $w, $h) = @_; 518 my ($self, $w, $h) = @_;
385 519
386 $self->w ($w); 520 return unless $self->{w} != $w || $self->{h} != $h;
387 $self->h ($h); 521
522 $self->SUPER::size_allocate ($w, $h);
523
388 $h -= $self->{txts}->[1]->{height}; 524 $h -= $tex[1]->{height};
389 $h -= $self->{txts}->[4]->{height}; 525 $h -= $tex[4]->{height};
390 $w -= $self->{txts}->[2]->{width}; 526 $w -= $tex[2]->{width};
391 $w -= $self->{txts}->[3]->{width}; 527 $w -= $tex[3]->{width};
392 528
393 $h = $h < 0 ? 0 : $h; 529 $h = $h < 0 ? 0 : $h;
394 $w = $w < 0 ? 0 : $w; 530 $w = $w < 0 ? 0 : $w;
395 warn "CHILD:$w $h\n"; 531
532 my $child = $self->child;
533
396 $self->get->size_allocate ($w, $h); 534 $child->size_allocate ($w, $h);
397 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 535 $child->move ($tex[3]->{width}, $tex[1]->{height});
398} 536}
399 537
400sub _draw { 538sub _draw {
401 my ($self) = @_; 539 my ($self) = @_;
402 540
403 my ($w, $h) = ($self->w, $self->h); 541 my ($w, $h) = ($self->{w}, $self->{h});
404 my ($cw, $ch) = ($self->get->w, $self->get->h); 542 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
405 543
406 glEnable GL_BLEND; 544 glEnable GL_BLEND;
407 glEnable GL_TEXTURE_2D; 545 glEnable GL_TEXTURE_2D;
408 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
410 548
411 my $top = $self->{txts}->[1]; 549 my $top = $tex[1];
412 glBindTexture GL_TEXTURE_2D, $top->{name}; 550 $top->draw_quad (0, 0, $w, $top->{height});
413 551
414 glBegin GL_QUADS;
415 glTexCoord 0, 0; glVertex 0 , 0;
416 glTexCoord 0, 1; glVertex 0 , $top->{height};
417 glTexCoord 1, 1; glVertex $w , $top->{height};
418 glTexCoord 1, 0; glVertex $w , 0;
419 glEnd;
420
421 my $left = $self->{txts}->[3]; 552 my $left = $tex[3];
422 glBindTexture GL_TEXTURE_2D, $left->{name}; 553 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
423 554
424 glBegin GL_QUADS;
425 glTexCoord 0, 0; glVertex 0 , $top->{height};
426 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
427 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
428 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
429 glEnd;
430
431 my $right = $self->{txts}->[2]; 555 my $right = $tex[2];
432 glBindTexture GL_TEXTURE_2D, $right->{name}; 556 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
433 557
434 glBegin GL_QUADS;
435 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
436 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
437 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
438 glTexCoord 1, 0; glVertex $w , $top->{height};
439 glEnd;
440
441 my $bottom = $self->{txts}->[4]; 558 my $bottom = $tex[4];
442 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 559 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
443 560
444 glBegin GL_QUADS; 561 my $bg = $tex[0];
445 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
446 glTexCoord 0, 1; glVertex 0 , $h;
447 glTexCoord 1, 1; glVertex $w , $h;
448 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
449 glEnd;
450
451 my $bg = $self->{txts}->[0];
452 glBindTexture GL_TEXTURE_2D, $bg->{name}; 562 glBindTexture GL_TEXTURE_2D, $bg->{name};
453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
454 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 564 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
455 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 565 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
456 566
457 my $rep_x = $cw / $bg->{width}; 567 my $rep_x = $cw / $bg->{width};
458 my $rep_y = $ch / $bg->{height}; 568 my $rep_y = $ch / $bg->{height};
459 569
460 glBegin GL_QUADS; 570 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
461 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
462 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
463 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
464 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
465 glEnd;
466 571
467 glDisable GL_BLEND; 572 glDisable GL_BLEND;
468 glDisable GL_TEXTURE_2D; 573 glDisable GL_TEXTURE_2D;
469 574
470 $self->get->draw; 575 $self->child->draw;
471 576
472} 577}
473 578
579#############################################################################
580
474package Crossfire::Client::Widget::Table; 581package CFClient::Widget::Table;
475 582
476our @ISA = Crossfire::Client::Widget::Bin::; 583our @ISA = CFClient::Widget::Bin::;
477 584
478use SDL::OpenGL; 585use SDL::OpenGL;
479 586
480sub add { 587sub add {
481 my ($self, $x, $y, $chld) = @_; 588 my ($self, $x, $y, $chld) = @_;
… …
554 661
555 $y += $self->max_row_height ($yi); 662 $y += $self->max_row_height ($yi);
556 } 663 }
557} 664}
558 665
666#############################################################################
667
559package Crossfire::Client::Widget::VBox; 668package CFClient::Widget::VBox;
560 669
561our @ISA = Crossfire::Client::Widget::Container::; 670our @ISA = CFClient::Widget::Container::;
562 671
563use SDL::OpenGL; 672use SDL::OpenGL;
673
674sub size_request {
675 my ($self) = @_;
676
677 my @alloc = map [$_->size_request], @{$self->{children}};
678
679 (
680 (List::Util::max map $_->[0], @alloc),
681 (List::Util::sum map $_->[1], @alloc),
682 )
683}
564 684
565sub size_allocate { 685sub size_allocate {
566 my ($self, $w, $h) = @_; 686 my ($self, $w, $h) = @_;
567 687
688 return unless $self->{w} != $w || $self->{h} != $h;
689
568 $self->w ($w); 690 $self->{w} = $w;
569 $self->h ($h); 691 $self->{h} = $h;
570 692
571 my $exp; 693 return unless $self->{h};
572 my @oth; 694
573 # find expand widget 695 my $children = $self->{children};
574 for (@{$self->{children}}) { 696
575 if ($_->{expand}) { 697 my @h = map +($_->size_request)[1], @$children;
576 $exp = $_; 698
577 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;
578 } 716 }
579 push @oth, $_;
580 }
581
582 my ($ow, $oh);
583
584 # get sizes of other widgets
585 for (@oth) {
586 my ($w, $h) = $_->size_request;
587 $oh += $h;
588 if ($ow < $w) { $ow = $w }
589 } 717 }
590 718
591 my $y = 0; 719 my $y = 0;
592 for (@{$self->{children}}) { 720 for (0 .. $#$children) {
721 my $child = $children->[$_];
722 my $h = $h[$_];
593 $_->move (0, $y); 723 $child->move (0, $y);
594
595 if ($_ == $exp) {
596 $_->size_allocate ($w, $h - $oh);
597 $y += $h - $oh;
598 } else {
599 my ($cw, $h) = $_->size_request;
600 $_->size_allocate ($w, $h); 724 $child->size_allocate ($w, $h);
725
601 $y += $h; 726 $y += $h;
602 }
603 } 727 }
604} 728}
605 729
606sub _draw { 730#############################################################################
607 my ($self) = @_;
608 731
609 my ($x, $y);
610 for (@{$self->{children} || []}) {
611 $_->draw;
612 $y += $_->h;
613 }
614}
615
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
835#############################################################################
836
681package Crossfire::Client::Widget::TextEntry; 837package CFClient::Widget::Entry;
682 838
683our @ISA = Crossfire::Client::Widget::Label::; 839our @ISA = CFClient::Widget::Label::;
684 840
685use SDL; 841use SDL;
686use SDL::OpenGL; 842use SDL::OpenGL;
687 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
688sub key_down { 897sub key_down {
689 my ($self, $ev) = @_; 898 my ($self, $ev) = @_;
690 899
691 my $mod = $ev->key_mod; 900 my $mod = $ev->key_mod;
692 my $sym = $ev->key_sym; 901 my $sym = $ev->key_sym;
693 902
694 $ev->set_unicode (1);
695 my $uni = $ev->key_unicode; 903 my $uni = $ev->key_unicode;
696 904
697 my $text = $self->get_text; 905 my $text = $self->get_text;
698 906
699 if ($sym == SDLK_BACKSPACE) { 907 if ($sym == SDLK_BACKSPACE) {
700 substr $text, -1, 1, ''; 908 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
701 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};
702 } elsif ($uni) { 915 } elsif ($uni) {
703 $text .= chr $uni; 916 substr $text, $self->{cursor}++, 0, chr $uni;
704 } 917 }
918
705 $self->set_text ($text); 919 $self->_set_text ($text);
920 $self->update;
706} 921}
707 922
923sub focus_in {
924 my ($self) = @_;
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
708package Crossfire::Client::Widget::MapWidget; 1101package CFClient::Widget::MapWidget;
709 1102
710use strict; 1103use strict;
711 1104
712use List::Util qw(min max); 1105use List::Util qw(min max);
713 1106
714use SDL; 1107use SDL;
715use SDL::OpenGL; 1108use SDL::OpenGL;
716use SDL::OpenGL::Constants; 1109use SDL::OpenGL::Constants;
717 1110
718our @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}
719 1122
720sub key_down { 1123sub key_down {
721 print "MAPKEYDOWN\n"; 1124 print "MAPKEYDOWN\n";
722} 1125}
723 1126
724sub key_up { 1127sub key_up {
725} 1128}
726 1129
727sub size_request { 1130sub size_request {
728 1131 (
1132 1 + int $::WIDTH / 32,
1133 1 + int $::HEIGHT / 32,
1134 )
729} 1135}
730 1136
731sub size_allocate { 1137sub update {
1138 my ($self) = @_;
1139
1140 $self->{need_update} = 1;
732} 1141}
733 1142
734sub _draw { 1143sub _draw {
735 my ($self) = @_; 1144 my ($self) = @_;
736 1145
1146 if (delete $self->{need_update}) {
1147 glNewList $self->{list}, GL_COMPILE;
1148
737 my $mx = $::CONN->{mapx}; 1149 my $mx = $::CONN->{mapx};
738 my $my = $::CONN->{mapy}; 1150 my $my = $::CONN->{mapy};
739 1151
740 my $map = $::CONN->{map}; 1152 my $map = $::CONN->{map};
741 1153
742 my ($xofs, $yofs); 1154 my ($xofs, $yofs);
743 1155
744 my $sw = 1 + int $::WIDTH / 32; 1156 my $sw = 1 + int $::WIDTH / 32;
745 my $sh = 1 + int $::HEIGHT / 32; 1157 my $sh = 1 + int $::HEIGHT / 32;
746 1158
747 if ($::CONN->{mapw} > $sw) { 1159 if ($::CONN->{mapw} > $sw) {
748 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1160 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
749 } else { 1161 } else {
750 $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};
751 } 1163 }
752 1164
753 if ($::CONN->{maph} > $sh) { 1165 if ($::CONN->{maph} > $sh) {
754 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1166 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
755 } else { 1167 } else {
756 $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};
757 } 1169 }
758 1170
759 glEnable GL_TEXTURE_2D; 1171 glEnable GL_TEXTURE_2D;
760 glEnable GL_BLEND; 1172 glEnable GL_BLEND;
761 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1173 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
762 1174
763 my $sw4 = ($sw + 3) & ~3; 1175 my $sw4 = ($sw + 3) & ~3;
764 my $lighting = "\x00" x ($sw4 * $sh); 1176 my $darkness = "\x00" x ($sw4 * $sh);
765 1177
766 for my $x (0 .. $sw - 1) { 1178 for my $x (0 .. $sw - 1) {
1179 my $row = $map->[$x + $xofs];
767 for my $y (0 .. $sh - 1) { 1180 for my $y (0 .. $sh - 1) {
768 1181
769 my $cell = $map->[$x + $xofs][$y + $yofs] 1182 my $cell = $row->[$y + $yofs]
770 or next; 1183 or next;
771 1184
772 my $darkness = $cell->[0] * (1 / 255); 1185 my $dark = $cell->[0];
773 if ($darkness < 0) { 1186 if ($dark < 0) {
774 $darkness = 0.15; 1187 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1188 } else {
1189 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
775 } 1190 }
776 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
777 1191
778 for my $num (grep $_, @$cell[1,2,3]) { 1192 for my $num (grep $_, @$cell[1,2,3]) {
779 my $tex = $::CONN->{face}[$num]{texture} || next; 1193 my $tex = $::CONN->{face}[$num]{texture} || next;
780 1194
781 glBindTexture GL_TEXTURE_2D, $tex->{name};
782
783 my $w = $tex->{width}; 1195 my $w = $tex->{width};
784 my $h = $tex->{height}; 1196 my $h = $tex->{height};
785 1197
786 my $px = ($x + 1) * 32 - $w; 1198 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
787 my $py = ($y + 1) * 32 - $h;
788
789 glBegin GL_QUADS;
790 glTexCoord 0, 0; glVertex $px , $py;
791 glTexCoord 0, 1; glVertex $px , $py + $h;
792 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
793 glTexCoord 1, 0; glVertex $px + $w, $py;
794 glEnd; 1199 }
795 } 1200 }
796 } 1201 }
797 }
798 1202
799# if (1) { # higher quality darkness 1203# if (1) { # higher quality darkness
800# $lighting =~ s/(.)/$1$1$1/gs; 1204# $lighting =~ s/(.)/$1$1$1/gs;
801# 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;
802# 1206#
… …
804# 1208#
805# $lighting = $pb->get_pixels; 1209# $lighting = $pb->get_pixels;
806# $lighting =~ s/(.)../$1/gs; 1210# $lighting =~ s/(.)../$1/gs;
807# } 1211# }
808 1212
809 $lighting = new Crossfire::Client::Texture
810 width => $sw4,
811 height => $sh,
812 data => $lighting,
813 internalformat => GL_ALPHA4,
814 format => GL_ALPHA;
815
816 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1213 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
817 glColor 0, 0, 0, 0.75;
818 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
819 glBindTexture GL_TEXTURE_2D, $lighting->{name};
820 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
821 glBegin GL_QUADS;
822 glTexCoord 0, 0; glVertex 0 , 0;
823 glTexCoord 0, 1; glVertex 0 , $sh * 32;
824 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
825 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
826 glEnd;
827 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
828 glDisable GL_TEXTURE_2D; 1226 glDisable GL_TEXTURE_2D;
829 glDisable GL_BLEND; 1227 glDisable GL_BLEND;
1228
1229 glEndList;
1230 }
1231
1232 glCallList $self->{list};
830} 1233}
831 1234
832my %DIR = ( 1235my %DIR = (
833 SDLK_KP8, [1, "north"], 1236 SDLK_KP8, [1, "north"],
834 SDLK_KP9, [2, "northeast"], 1237 SDLK_KP9, [2, "northeast"],
… …
878 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1281 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
879 $::CONN->send ("command run_stop"); 1282 $::CONN->send ("command run_stop");
880 } 1283 }
881} 1284}
882 1285
1286#############################################################################
1287
883package Crossfire::Client::Widget::Animator; 1288package CFClient::Widget::Animator;
884 1289
885use SDL::OpenGL; 1290use SDL::OpenGL;
886 1291
887our @ISA = Crossfire::Client::Widget::Bin::; 1292our @ISA = CFClient::Widget::Bin::;
888 1293
889sub moveto { 1294sub moveto {
890 my ($self, $x, $y) = @_; 1295 my ($self, $x, $y) = @_;
891 1296
892 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1297 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
893 $self->{speed} = 0.2; 1298 $self->{speed} = 0.001;
894 $self->{time} = 1; 1299 $self->{time} = 1;
895 1300
896 ::animation_start $self; 1301 ::animation_start $self;
897} 1302}
898 1303
… …
913 1318
914sub _draw { 1319sub _draw {
915 my ($self) = @_; 1320 my ($self) = @_;
916 1321
917 glPushMatrix; 1322 glPushMatrix;
918 glRotate $self->{time} * 10000, 0, 1, 0; 1323 glRotate $self->{time} * 1000, 0, 1, 0;
919 $self->{children}[0]->draw; 1324 $self->{children}[0]->draw;
920 glPopMatrix; 1325 glPopMatrix;
921} 1326}
922 1327
9231; 1328#############################################################################
924 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