Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6384 → Rev 6386

/contrib/sdk/sources/SDL-1.2.2/src/video/menuetos/SDL_menuetevents.c
1,7 → 1,6
#include <kos32sys.h>
#include<menuet/os.h>
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
#include "SDL.h"
#include "SDL_sysevents.h"
#include "SDL_sysvideo.h"
162,29 → 161,21
int i;
SDL_keysym key;
static int ext_code=0;
static uint8_t old_mode=0;
 
static __u8 old_mode=0;
for (;;) {
i=check_os_event();
unsigned int k;
 
i=__menuet__check_for_event();
switch(i)
{
case 0:
return;
case 1:
 
MenuetOS_SDL_RepaintWnd();
break;
 
case 2:
__asm__ __volatile__("int $0x40":"=a"(k):"a"(2));
key.scancode = (k >> 8) & 0xFF;
 
key.scancode = __menuet__getkey();
if (key.scancode == 0xE0 || key.scancode == 0xE1)
{ext_code=key.scancode;break;}
 
if (ext_code == 0xE1 && (key.scancode & 0x7F) == 0x1D) { break;}
if (ext_code == 0xE1 && (key.scancode & 0x7F) == 0x1D) break;
if (ext_code == 0xE1 && key.scancode == 0xC5) {ext_code=0;break;}
key.mod = GetModState();
if (ext_code == 0xE1) key.mod &= ~KMOD_CTRL;
207,7 → 198,7
SDL_PrivateKeyboard(code,&key);
break;
case 3:
if(get_os_button()==1) exit(0);
if(__menuet__get_button_id()==1) exit(0);
break;
case 6: {
int __tmp,mx,my;
/contrib/sdk/sources/SDL-1.2.2/src/video/menuetos/SDL_menuetvideo.c
1,6 → 1,6
#include <stdlib.h>
#include <stdio.h>
#include <kos32sys.h>
#include <menuet/os.h>
#include "SDL.h"
#include "SDL_error.h"
#include "SDL_video.h"
11,25 → 11,6
#include "SDL_menuetvideo.h"
#include <string.h>
 
struct process_table_entry
{
uint32_t cpu_usage;
uint16_t pos_in_windowing_stack;
uint16_t win_stack_val_at_ecx;
uint16_t reserved1;
char name[12];
uint32_t memstart;
uint32_t memused;
uint32_t pid;
uint32_t winx_start,winy_start;
uint32_t winx_size,winy_size;
uint16_t thread_state;
uint16_t reserved2;
uint32_t client_left,client_top,client_width,client_height;
uint8_t window_state;
uint8_t reserved3[1024-71];
};
 
static SDL_VideoDevice * vm_suf=NULL;
static int was_initialized=0;
 
51,15 → 32,22
 
void MenuetOS_SDL_RepaintWnd(void)
{
begin_draw();
sys_create_window(1,1,vm_suf->hidden->win_size_x+9,vm_suf->hidden->win_size_y+get_skinh()+4, (int)vm_suf->hidden->__title, 0x000000,0x34000000);
__menuet__window_redraw(1);
__menuet__define_window(1,1,vm_suf->hidden->win_size_x+9,vm_suf->hidden->win_size_y+get_skinh()+4,
#ifdef KEEP_OBSOLETE_STYLE3
IsStyle4Available?0x34000000:0x33000000
#else
0x34000000
#endif
,0,(int)vm_suf->hidden->__title);
 
// __asm__ __volatile__("int3");
 
if(vm_suf && vm_suf->hidden->__video_buffer)
put_image(1,1,
__menuet__putimage(0,0,
vm_suf->hidden->win_size_x,vm_suf->hidden->win_size_y,
vm_suf->hidden->__video_buffer);
 
end_draw();
__menuet__window_redraw(2);
}
 
static int MenuetOS_AllocHWSurface(_THIS,SDL_Surface * surface)
84,7 → 72,7
{
if(numrects)
{
put_image(1,1,
__menuet__putimage(0,0,
vm_suf->hidden->win_size_x,vm_suf->hidden->win_size_y,
this->hidden->__video_buffer);
}
123,12 → 111,33
current->w=width;
current->h=height;
current->pitch=width*(bpp>>3);
 
char info[100];
sprintf(info, "width = %d, height = %d, pitch = %d, bpp = %d\n", current->w, current->h, current->pitch, bpp);
 
void debug_board_write_byte(const char ch){
__asm__ __volatile__(
"int $0x40"
:
:"a"(63), "b"(1), "c"(ch));
}
 
void debug_board_write_str(const char* str){
while(*str)
debug_board_write_byte(*str++);
}
 
debug_board_write_str(info);
// __asm__ __volatile__("int3");
current->pixels=this->hidden->__video_buffer=realloc(this->hidden->__video_buffer,
current->pitch*current->h);
this->hidden->__lines=(unsigned char **)realloc(this->hidden->__lines,
sizeof(unsigned char *)*current->h);
 
for(ly=0,lx=current->pixels;ly<current->h;ly++,lx+=current->pitch)
this->hidden->__lines[ly]=lx;
 
this->UpdateRects=MenuetOS_DirectUpdate;
this->hidden->win_size_x=width;
this->hidden->win_size_y=height;
141,7 → 150,7
}
else
{
set_wanted_events_mask(0x27);
__menuet__set_bitfield_for_wanted_events(0x27);
was_initialized=1;
MenuetOS_SDL_RepaintWnd();
}
209,7 → 218,8
 
static int MenuetOS_FlipHWSurface(_THIS,SDL_Surface * surface)
{
put_image(1,1,surface->w,surface->h, surface->pixels);
__menuet__putimage(0,0,surface->w,surface->h,
surface->pixels);
return 0;
}