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.66 by root, Tue Apr 11 14:36:02 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 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus;
121 $FOCUS->update;
49} 122}
50 123
51sub focus_out { 124sub focus_out {
52 my ($widget) = @_; 125 my ($self) = @_;
53}
54 126
55sub key_down { 127 return unless $FOCUS == $self;
56 my ($widget, $sdlev) = @_;
57}
58 128
59sub key_up { 129 my $focus = $FOCUS; undef $FOCUS;
60 my ($widget, $sdlev) = @_; 130 $focus->update if $focus; #?
61} 131}
62 132
133sub mouse_motion { }
134sub button_up { }
63sub button_down { 135sub button_down { }
64 my ($widget, $sdlev) = @_; 136sub key_down { }
65} 137sub key_up { }
66 138
67sub button_up {
68 my ($widget, $sdlev) = @_;
69}
70
71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
76 144
77sub draw { 145sub draw {
78 my ($self) = @_; 146 my ($self) = @_;
79 147
80 glPushMatrix; 148 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 149 glTranslate $self->{x}, $self->{y}, 0;
82 $self->_draw; 150 $self->_draw;
151 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4;
153 glEnable GL_BLEND;
154 glBegin GL_QUADS;
155 glVertex 0 , 0;
156 glVertex $self->{w}, 0;
157 glVertex $self->{w}, $self->{h};
158 glVertex 0 , $self->{h};
159 glEnd;
160 glDisable GL_BLEND;
161 }
83 glPopMatrix; 162 glPopMatrix;
84} 163}
85 164
86sub _draw { 165sub _draw {
87 my ($self) = @_; 166 my ($self) = @_;
… …
134 my ($self) = @_; 213 my ($self) = @_;
135 214
136 #$self->deactivate; 215 #$self->deactivate;
137} 216}
138 217
218#############################################################################
219
220package CFClient::Widget::Empty;
221
222our @ISA = CFClient::Widget::;
223
224sub size_request {
225 (0, 0)
226}
227
228sub draw {
229}
230
231#############################################################################
232
139package Crossfire::Client::Widget::Container; 233package CFClient::Widget::Container;
140 234
141our @ISA = Crossfire::Client::Widget::; 235our @ISA = CFClient::Widget::;
142 236
143sub new { 237sub new {
144 my ($class, @widgets) = @_; 238 my ($class, %arg) = @_;
145 239
240 my $children = delete $arg{children} || [];
241
146 my $self = $class->SUPER::new (children => []); 242 my $self = $class->SUPER::new (children => [], %arg);
147 $self->add ($_) for @widgets; 243 $self->add ($_) for @$children;
148 244
149 $self 245 $self
150} 246}
151 247
152sub add { 248sub add {
153 my ($self, $chld, $expand) = @_; 249 my ($self, $chld, $expand) = @_;
154 250
155 $chld->{expand} = $expand; 251 $chld->{expand} = $expand;
156 $chld->set_parent ($self); 252 $chld->set_parent ($self);
157 253
158 @{$self->{children}} = 254 $self->{children} = [
159 sort { $a->{z} <=> $b->{z} } 255 sort { $a->{z} <=> $b->{z} }
160 @{$self->{children}}, $chld; 256 @{$self->{children}}, $chld
257 ];
161 258
162 $self->size_allocate ($self->{w}, $self->{h}); 259 $self->size_allocate ($self->{w}, $self->{h})
260 if $self->{w}; #TODO: check for "realised state"
163} 261}
164 262
165sub remove { 263sub remove {
166 my ($self, $widget) = @_; 264 my ($self, $widget) = @_;
167 265
… …
171} 269}
172 270
173sub find_widget { 271sub find_widget {
174 my ($self, $x, $y) = @_; 272 my ($self, $x, $y) = @_;
175 273
274 $x -= $self->{x};
275 $y -= $self->{y};
276
176 my $res; 277 my $res;
177 278
178 for (@{ $self->{children} }) { 279 for (reverse @{ $self->{children} }) {
179 $res = $_->find_widget ($x, $y) 280 $res = $_->find_widget ($x, $y)
180 and return $res; 281 and return $res;
181 } 282 }
182 283
183 () 284 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
184}
185
186sub 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} 285}
198 286
199sub _draw { 287sub _draw {
200 my ($self) = @_; 288 my ($self) = @_;
201 289
202 $_->draw for @{$self->{children}}; 290 $_->draw for @{$self->{children}};
203} 291}
204 292
293#############################################################################
294
205package Crossfire::Client::Widget::Bin; 295package CFClient::Widget::Bin;
206 296
207our @ISA = Crossfire::Client::Widget::Container::; 297our @ISA = CFClient::Widget::Container::;
208 298
299sub new {
300 my ($class, %arg) = @_;
301
302 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
303
304 $class->SUPER::new (children => [$child], %arg)
305}
306
307sub add {
308 my ($self, $widget) = @_;
309
310 $self->{children} = [];
311
312 $self->SUPER::add ($widget);
313}
314
315sub remove {
316 my ($self, $widget) = @_;
317
318 $self->SUPER::remove ($widget);
319
320 $self->{children} = [new CFClient::Widget::Empty]
321 unless @{$self->{children}};
322}
323
209sub get { $_[0]->{children}[0] } 324sub child { $_[0]->{children}[0] }
210 325
211sub size_request { 326sub size_request {
212 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 327 $_[0]{children}[0]->size_request if $_[0]{children}[0];
213} 328}
214 329
215sub size_allocate { 330sub size_allocate {
216 my ($self, $w, $h) = @_; 331 my ($self, $w, $h) = @_;
332
217 $self->SUPER::size_allocate ($w, $h); 333 $self->SUPER::size_allocate ($w, $h);
218 $self->{children}[0]->size_allocate ($w, $h) 334 $self->{children}[0]->size_allocate ($w, $h)
219 if $self->{children}[0] 335 if $self->{children}[0]
220} 336}
221 337
222package Crossfire::Client::Widget::Toplevel; 338#############################################################################
223 339
340package CFClient::Widget::Window;
341
224our @ISA = Crossfire::Client::Widget::Container::; 342our @ISA = CFClient::Widget::Bin::;
343
344use SDL::OpenGL;
345
346sub new {
347 my ($class, %arg) = @_;
348
349 my $self = $class->SUPER::new (%arg);
350}
225 351
226sub update { 352sub update {
227 my ($self) = @_; 353 my ($self) = @_;
228 354
229 ::refresh (); 355 # 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; 356 $self->render_chld;
357 $self->SUPER::update;
254} 358}
255 359
256sub render_chld { 360sub render_chld {
257 my ($self) = @_; 361 my ($self) = @_;
258 my $chld = $self->get;
259 my ($w, $h) = $self->size_request;
260 362
261 require Carp;
262 Carp::cluck "RENDERCHI $w $h";
263 warn "RENDERCHI $w $h\n";
264 $self->{texture} = 363 $self->{texture} =
265 Crossfire::Client::Texture->new_from_opengl ( 364 CFClient::Texture->new_from_opengl (
266 $w, $h, sub { $chld->draw } 365 $self->{w}, $self->{h}, sub { $self->child->draw }
267 ); 366 );
268 $self->{texture}->upload;
269}
270
271sub size_request {
272 my ($self) = @_;
273 ($self->w, $self->h)
274} 367}
275 368
276sub size_allocate { 369sub size_allocate {
277 my ($self, $w, $h) = @_; 370 my ($self, $w, $h) = @_;
278 371
279 $self->w ($w); 372 $self->{w} = $w;
280 $self->h ($h); 373 $self->{h} = $h;
374
281 $self->get->size_allocate ($w, $h); 375 $self->child->size_allocate ($w, $h);
282 376
283 $self->update; #TODO: Move this to the size_request event propably? 377 $self->render_chld;
284} 378}
285 379
286sub _draw { 380sub _draw {
287 my ($self) = @_; 381 my ($self) = @_;
288 382
… …
292 or return; 386 or return;
293 387
294 glEnable GL_BLEND; 388 glEnable GL_BLEND;
295 glEnable GL_TEXTURE_2D; 389 glEnable GL_TEXTURE_2D;
296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
297 glBindTexture GL_TEXTURE_2D, $tex->{name};
298 391
299 glBegin GL_QUADS; 392 $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 393
306 glDisable GL_BLEND; 394 glDisable GL_BLEND;
307 glDisable GL_TEXTURE_2D; 395 glDisable GL_TEXTURE_2D;
308} 396}
309 397
398#############################################################################
399
310package Crossfire::Client::Widget::Frame; 400package CFClient::Widget::Frame;
311 401
312our @ISA = Crossfire::Client::Widget::Bin::; 402our @ISA = CFClient::Widget::Bin::;
313 403
314use SDL::OpenGL; 404use SDL::OpenGL;
315 405
316sub size_request { 406sub size_request {
317 my ($self) = @_; 407 my ($self) = @_;
318 my $chld = $self->get 408 my $chld = $self->child
319 or return (0, 0); 409 or return (0, 0);
320 410
321 $chld->move (2, 2); 411 $chld->move (2, 2);
322 412
323 map { $_ + 4 } $chld->size_request; 413 map { $_ + 4 } $chld->size_request;
324} 414}
325 415
326sub size_allocate { 416sub size_allocate {
327 my ($self, $w, $h) = @_; 417 my ($self, $w, $h) = @_;
328 418
329 $self->w ($w); 419 $self->{w} = $w;
330 $self->h ($h); 420 $self->{h} = $h;
331 421
332 $self->get->size_allocate ($w - 4, $h - 4); 422 $self->child->size_allocate ($w - 4, $h - 4);
333 $self->get->move (2, 2); 423 $self->child->move (2, 2);
334} 424}
335 425
336sub _draw { 426sub _draw {
337 my ($self) = @_; 427 my ($self) = @_;
338 428
339 my $chld = $self->get; 429 my $chld = $self->child;
340 430
341 my ($w, $h) = $chld->size_request; 431 my ($w, $h) = $chld->size_request;
342 432
343 glBegin GL_QUADS; 433 glBegin GL_QUADS;
344 glColor 0, 0, 0; 434 glColor 0, 0, 0;
345 glTexCoord 0, 0; glVertex 0 , 0; 435 glVertex 0 , 0;
346 glTexCoord 0, 1; glVertex 0 , $h + 4; 436 glVertex 0 , $h + 4;
347 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 437 glVertex $w + 4 , $h + 4;
348 glTexCoord 1, 0; glVertex $w + 4 , 0; 438 glVertex $w + 4 , 0;
349 glEnd; 439 glEnd;
350 440
351 $chld->draw; 441 $chld->draw;
352} 442}
353 443
444#############################################################################
445
354package Crossfire::Client::Widget::FancyFrame; 446package CFClient::Widget::FancyFrame;
355 447
356our @ISA = Crossfire::Client::Widget::Frame::; 448our @ISA = CFClient::Widget::Bin::;
357 449
358use SDL::OpenGL; 450use SDL::OpenGL;
359 451
360sub new { 452my @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 $_ } 453 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/ 454 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 455
371sub size_request { 456sub size_request {
372 my ($self) = @_; 457 my ($self) = @_;
458
373 my ($w, $h) = $self->get->size_request; 459 my ($w, $h) = $self->SUPER::size_request;
374 460
375 $h += $self->{txts}->[1]->{height}; 461 $h += $tex[1]->{height};
376 $h += $self->{txts}->[4]->{height}; 462 $h += $tex[4]->{height};
377 $w += $self->{txts}->[2]->{width}; 463 $w += $tex[2]->{width};
378 $w += $self->{txts}->[3]->{width}; 464 $w += $tex[3]->{width};
379 465
380 ($w, $h) 466 ($w, $h)
381} 467}
382 468
383sub size_allocate { 469sub size_allocate {
384 my ($self, $w, $h) = @_; 470 my ($self, $w, $h) = @_;
385 471
386 $self->w ($w); 472 $self->SUPER::size_allocate ($w, $h);
387 $self->h ($h); 473
388 $h -= $self->{txts}->[1]->{height}; 474 $h -= $tex[1]->{height};
389 $h -= $self->{txts}->[4]->{height}; 475 $h -= $tex[4]->{height};
390 $w -= $self->{txts}->[2]->{width}; 476 $w -= $tex[2]->{width};
391 $w -= $self->{txts}->[3]->{width}; 477 $w -= $tex[3]->{width};
392 478
393 $h = $h < 0 ? 0 : $h; 479 $h = $h < 0 ? 0 : $h;
394 $w = $w < 0 ? 0 : $w; 480 $w = $w < 0 ? 0 : $w;
395 warn "CHILD:$w $h\n"; 481
482 my $child = $self->child;
483
396 $self->get->size_allocate ($w, $h); 484 $child->size_allocate ($w, $h);
397 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 485 $child->move ($tex[3]->{width}, $tex[1]->{height});
398} 486}
399 487
400sub _draw { 488sub _draw {
401 my ($self) = @_; 489 my ($self) = @_;
402 490
403 my ($w, $h) = ($self->w, $self->h); 491 my ($w, $h) = ($self->{w}, $self->{h});
404 my ($cw, $ch) = ($self->get->w, $self->get->h); 492 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
405 493
406 glEnable GL_BLEND; 494 glEnable GL_BLEND;
407 glEnable GL_TEXTURE_2D; 495 glEnable GL_TEXTURE_2D;
408 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 497 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
410 498
411 my $top = $self->{txts}->[1]; 499 my $top = $tex[1];
412 glBindTexture GL_TEXTURE_2D, $top->{name}; 500 $top->draw_quad (0, 0, $w, $top->{height});
413 501
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]; 502 my $left = $tex[3];
422 glBindTexture GL_TEXTURE_2D, $left->{name}; 503 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
423 504
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]; 505 my $right = $tex[2];
432 glBindTexture GL_TEXTURE_2D, $right->{name}; 506 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
433 507
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]; 508 my $bottom = $tex[4];
442 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 509 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
443 510
444 glBegin GL_QUADS; 511 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}; 512 glBindTexture GL_TEXTURE_2D, $bg->{name};
453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
454 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
455 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 515 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
456 516
457 my $rep_x = $cw / $bg->{width}; 517 my $rep_x = $cw / $bg->{width};
458 my $rep_y = $ch / $bg->{height}; 518 my $rep_y = $ch / $bg->{height};
459 519
460 glBegin GL_QUADS; 520 $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 521
467 glDisable GL_BLEND; 522 glDisable GL_BLEND;
468 glDisable GL_TEXTURE_2D; 523 glDisable GL_TEXTURE_2D;
469 524
470 $self->get->draw; 525 $self->child->draw;
471 526
472} 527}
473 528
529#############################################################################
530
474package Crossfire::Client::Widget::Table; 531package CFClient::Widget::Table;
475 532
476our @ISA = Crossfire::Client::Widget::Bin::; 533our @ISA = CFClient::Widget::Bin::;
477 534
478use SDL::OpenGL; 535use SDL::OpenGL;
479 536
480sub add { 537sub add {
481 my ($self, $x, $y, $chld) = @_; 538 my ($self, $x, $y, $chld) = @_;
… …
554 611
555 $y += $self->max_row_height ($yi); 612 $y += $self->max_row_height ($yi);
556 } 613 }
557} 614}
558 615
616#############################################################################
617
559package Crossfire::Client::Widget::VBox; 618package CFClient::Widget::VBox;
560 619
561our @ISA = Crossfire::Client::Widget::Container::; 620our @ISA = CFClient::Widget::Container::;
562 621
563use SDL::OpenGL; 622use SDL::OpenGL;
623
624sub size_request {
625 my ($self) = @_;
626
627 my @alloc = map [$_->size_request], @{$self->{children}};
628
629 (
630 (List::Util::max map $_->[0], @alloc),
631 (List::Util::sum map $_->[1], @alloc),
632 )
633}
564 634
565sub size_allocate { 635sub size_allocate {
566 my ($self, $w, $h) = @_; 636 my ($self, $w, $h) = @_;
567 637
568 $self->w ($w); 638 $self->w ($w);
… …
601 $y += $h; 671 $y += $h;
602 } 672 }
603 } 673 }
604} 674}
605 675
606sub _draw { 676#############################################################################
607 my ($self) = @_;
608 677
609 my ($x, $y);
610 for (@{$self->{children} || []}) {
611 $_->draw;
612 $y += $_->h;
613 }
614}
615
616package Crossfire::Client::Widget::Label; 678package CFClient::Widget::Label;
617 679
618our @ISA = Crossfire::Client::Widget::; 680our @ISA = CFClient::Widget::;
619 681
620use SDL::OpenGL; 682use SDL::OpenGL;
621 683
622sub new { 684sub new {
623 my ($class, $x, $y, $z, $height, $text) = @_; 685 my ($class, %arg) = @_;
624 686
625 # TODO: color, and make height, xyz etc. optional 687 # TODO: color, and make height, xyz etc. optional
626 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 688 my $self = $class->SUPER::new (
689 color => [1, 1, 1],
690 height => $::FONTSIZE,
691 text => "",
692 layout => new CFClient::Layout,
693 %arg
694 );
627 695
628 $self->set_text ($text); 696 $self->set_text ($self->{text});
629 697
630 $self 698 $self
631} 699}
632 700
633sub set_text { 701sub set_text {
634 my ($self, $text) = @_; 702 my ($self, $text) = @_;
635 703
636 $self->{text} = $text; 704 $self->{text} = $text;
637 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 705 $self->{layout}->set_markup ($text);
638 706
639 $self->update; 707 delete $self->{texture};
640} 708}
641 709
642sub get_text { 710sub get_text {
643 my ($self, $text) = @_; 711 my ($self, $text) = @_;
644 712
… …
646} 714}
647 715
648sub size_request { 716sub size_request {
649 my ($self) = @_; 717 my ($self) = @_;
650 718
651 ( 719 $self->{layout}->set_width;
720 $self->{layout}->set_height ($self->{height});
721 $self->{layout}->size
722# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
723# (
652 $self->{texture}{width}, 724# $self->{texture}{width},
653 $self->{texture}{height}, 725# $self->{texture}{height},
654 ) 726# )
727# } else {
728# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
729#
730# ($w, $h)
731# }
732}
733
734sub size_allocate {
735 my ($self, $w, $h) = @_;
736
737 $self->SUPER::size_allocate ($w, $h);
738 delete $self->{texture};
655} 739}
656 740
657sub _draw { 741sub _draw {
658 my ($self) = @_; 742 my ($self) = @_;
659 743
660 my $tex = $self->{texture}; 744 my $tex = $self->{texture} ||= do {
745 $self->{layout}->set_width ($self->{w});
746 new_from_layout CFClient::Texture $self->{layout};
747 };
661 748
662 glEnable GL_BLEND; 749 glEnable GL_BLEND;
663 glEnable GL_TEXTURE_2D; 750 glEnable GL_TEXTURE_2D;
664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
666 glBindTexture GL_TEXTURE_2D, $tex->{name};
667 753
668 glColor 1, 0, 0, 1; # TODO color 754 glColor @{$self->{color}};
669 755
670 glBegin GL_QUADS; 756 $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 757
677 glDisable GL_BLEND; 758 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
679} 760}
680 761
762#############################################################################
763
681package Crossfire::Client::Widget::TextEntry; 764package CFClient::Widget::Entry;
682 765
683our @ISA = Crossfire::Client::Widget::Label::; 766our @ISA = CFClient::Widget::Label::;
684 767
685use SDL; 768use SDL;
686use SDL::OpenGL; 769use SDL::OpenGL;
687 770
688sub key_down { 771sub key_down {
689 my ($self, $ev) = @_; 772 my ($self, $ev) = @_;
690 773
691 my $mod = $ev->key_mod; 774 my $mod = $ev->key_mod;
692 my $sym = $ev->key_sym; 775 my $sym = $ev->key_sym;
693 776
694 $ev->set_unicode (1);
695 my $uni = $ev->key_unicode; 777 my $uni = $ev->key_unicode;
696 778
697 my $text = $self->get_text; 779 my $text = $self->get_text;
698 780
699 if ($sym == SDLK_BACKSPACE) { 781 if ($sym == SDLK_BACKSPACE) {
700 substr $text, -1, 1, ''; 782 substr $text, -1, 1, '';
701
702 } elsif ($uni) { 783 } elsif ($uni) {
703 $text .= chr $uni; 784 $text .= chr $uni;
704 } 785 }
786
705 $self->set_text ($text); 787 $self->set_text ($text);
706} 788}
707 789
790sub button_down {
791 my ($self, $ev) = @_;
792
793 $self->focus_in;
794}
795
796sub mouse_motion {
797 my ($self, $ev, $x, $y) = @_;
798 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
799}
800
801sub _draw {
802 my ($self) = @_;
803
804 if ($FOCUS == $self) {
805 glColor 1, 1, 1;
806 } else {
807 glColor 0.7, 0.7, 0.7;
808 }
809
810 glBegin GL_QUADS;
811 glVertex 0 , 0;
812 glVertex 0 , $self->{h} - 1;
813 glVertex $self->{w} - 1, $self->{h} - 1;
814 glVertex $self->{w} - 1, 0;
815 glEnd;
816
817 $self->SUPER::_draw;
818}
819
820#############################################################################
821
708package Crossfire::Client::Widget::MapWidget; 822package CFClient::Widget::MapWidget;
709 823
710use strict; 824use strict;
711 825
712use List::Util qw(min max); 826use List::Util qw(min max);
713 827
714use SDL; 828use SDL;
715use SDL::OpenGL; 829use SDL::OpenGL;
716use SDL::OpenGL::Constants; 830use SDL::OpenGL::Constants;
717 831
718our @ISA = Crossfire::Client::Widget::; 832our @ISA = CFClient::Widget::;
833
834sub new {
835 my $class = shift;
836
837 $class->SUPER::new (
838 z => -1,
839 list => (glGenLists 1),
840 @_
841 )
842}
719 843
720sub key_down { 844sub key_down {
721 print "MAPKEYDOWN\n"; 845 print "MAPKEYDOWN\n";
722} 846}
723 847
724sub key_up { 848sub key_up {
725} 849}
726 850
727sub size_request { 851sub size_request {
728 852 (
853 1 + int $::WIDTH / 32,
854 1 + int $::HEIGHT / 32,
855 )
729} 856}
730 857
731sub size_allocate { 858sub update {
859 my ($self) = @_;
860
861 $self->{need_update} = 1;
732} 862}
733 863
734sub _draw { 864sub _draw {
735 my ($self) = @_; 865 my ($self) = @_;
736 866
867 if (delete $self->{need_update}) {
868 glNewList $self->{list}, GL_COMPILE;
869
737 my $mx = $::CONN->{mapx}; 870 my $mx = $::CONN->{mapx};
738 my $my = $::CONN->{mapy}; 871 my $my = $::CONN->{mapy};
739 872
740 my $map = $::CONN->{map}; 873 my $map = $::CONN->{map};
741 874
742 my ($xofs, $yofs); 875 my ($xofs, $yofs);
743 876
744 my $sw = 1 + int $::WIDTH / 32; 877 my $sw = 1 + int $::WIDTH / 32;
745 my $sh = 1 + int $::HEIGHT / 32; 878 my $sh = 1 + int $::HEIGHT / 32;
746 879
747 if ($::CONN->{mapw} > $sw) { 880 if ($::CONN->{mapw} > $sw) {
748 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 881 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
749 } else { 882 } else {
750 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 883 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
751 } 884 }
752 885
753 if ($::CONN->{maph} > $sh) { 886 if ($::CONN->{maph} > $sh) {
754 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 887 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
755 } else { 888 } else {
756 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 889 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
757 } 890 }
758 891
759 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
760 glEnable GL_BLEND; 893 glEnable GL_BLEND;
761 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
762 895
763 my $sw4 = ($sw + 3) & ~3; 896 my $sw4 = ($sw + 3) & ~3;
764 my $lighting = "\x00" x ($sw4 * $sh); 897 my $darkness = "\x00" x ($sw4 * $sh);
765 898
766 for my $x (0 .. $sw - 1) { 899 for my $x (0 .. $sw - 1) {
900 my $row = $map->[$x + $xofs];
767 for my $y (0 .. $sh - 1) { 901 for my $y (0 .. $sh - 1) {
768 902
769 my $cell = $map->[$x + $xofs][$y + $yofs] 903 my $cell = $row->[$y + $yofs]
770 or next; 904 or next;
771 905
772 my $darkness = $cell->[0] * (1 / 255); 906 my $dark = $cell->[0];
773 if ($darkness < 0) { 907 if ($dark < 0) {
774 $darkness = 0.15; 908 substr $darkness, $y * $sw4 + $x, 1, chr 224;
909 } else {
910 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
775 } 911 }
776 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
777 912
778 for my $num (grep $_, @$cell[1,2,3]) { 913 for my $num (grep $_, @$cell[1,2,3]) {
779 my $tex = $::CONN->{face}[$num]{texture} || next; 914 my $tex = $::CONN->{face}[$num]{texture} || next;
780 915
781 glBindTexture GL_TEXTURE_2D, $tex->{name};
782
783 my $w = $tex->{width}; 916 my $w = $tex->{width};
784 my $h = $tex->{height}; 917 my $h = $tex->{height};
785 918
786 my $px = ($x + 1) * 32 - $w; 919 $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; 920 }
795 } 921 }
796 } 922 }
797 }
798 923
799# if (1) { # higher quality darkness 924# if (1) { # higher quality darkness
800# $lighting =~ s/(.)/$1$1$1/gs; 925# $lighting =~ s/(.)/$1$1$1/gs;
801# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 926# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
802# 927#
… …
804# 929#
805# $lighting = $pb->get_pixels; 930# $lighting = $pb->get_pixels;
806# $lighting =~ s/(.)../$1/gs; 931# $lighting =~ s/(.)../$1/gs;
807# } 932# }
808 933
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; 934 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; 935 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 936
937 $darkness = new CFClient::Texture
938 width => $sw4,
939 height => $sh,
940 data => $darkness,
941 internalformat => GL_ALPHA,
942 format => GL_ALPHA;
943
944 glColor 0.45, 0.45, 0.45, 1;
945 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
946
828 glDisable GL_TEXTURE_2D; 947 glDisable GL_TEXTURE_2D;
829 glDisable GL_BLEND; 948 glDisable GL_BLEND;
949
950 glEndList;
951 }
952
953 glCallList $self->{list};
830} 954}
831 955
832my %DIR = ( 956my %DIR = (
833 SDLK_KP8, [1, "north"], 957 SDLK_KP8, [1, "north"],
834 SDLK_KP9, [2, "northeast"], 958 SDLK_KP9, [2, "northeast"],
… …
878 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1002 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
879 $::CONN->send ("command run_stop"); 1003 $::CONN->send ("command run_stop");
880 } 1004 }
881} 1005}
882 1006
1007#############################################################################
1008
883package Crossfire::Client::Widget::Animator; 1009package CFClient::Widget::Animator;
884 1010
885use SDL::OpenGL; 1011use SDL::OpenGL;
886 1012
887our @ISA = Crossfire::Client::Widget::Bin::; 1013our @ISA = CFClient::Widget::Bin::;
888 1014
889sub moveto { 1015sub moveto {
890 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
891 1017
892 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1018 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
893 $self->{speed} = 0.2; 1019 $self->{speed} = 0.001;
894 $self->{time} = 1; 1020 $self->{time} = 1;
895 1021
896 ::animation_start $self; 1022 ::animation_start $self;
897} 1023}
898 1024
… …
913 1039
914sub _draw { 1040sub _draw {
915 my ($self) = @_; 1041 my ($self) = @_;
916 1042
917 glPushMatrix; 1043 glPushMatrix;
918 glRotate $self->{time} * 10000, 0, 1, 0; 1044 glRotate $self->{time} * 1000, 0, 1, 0;
919 $self->{children}[0]->draw; 1045 $self->{children}[0]->draw;
920 glPopMatrix; 1046 glPopMatrix;
921} 1047}
922 1048
9231; 1049#############################################################################
924 1050
1051package CFClient::Widget::Toplevel;
1052
1053our @ISA = CFClient::Widget::Container::;
1054
1055sub size_request {
1056 ($::WIDTH, $::HEIGHT)
1057}
1058
1059sub size_allocate {
1060 my ($self, $w, $h) = @_;
1061
1062 $self->SUPER::size_allocate ($w, $h);
1063
1064 $_->size_allocate ($_->size_request)
1065 for @{$self->{children}};
1066}
1067
1068sub translate {
1069 my ($self, $x, $y) = @_;
1070
1071 ($x, $y)
1072}
1073
1074sub update {
1075 my ($self) = @_;
1076
1077 $self->size_allocate ($self->size_request);
1078 ::refresh ();
1079}
1080
1081sub add {
1082 my ($self, $widget) = @_;
1083
1084 $self->SUPER::add ($widget);
1085
1086 $widget->size_allocate ($widget->size_request);
1087}
1088
1089sub draw {
1090 my ($self) = @_;
1091
1092 $self->_draw;
1093}
1094
1095#############################################################################
1096
1097package CFClient::Widget;
1098
1099$TOPLEVEL = new CFClient::Widget::Toplevel;
1100
11011
1102

Diff Legend

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