diff --exclude *~ -rwcN sjog-0.5.orig/src/Makefile.am sjog-0.5/src/Makefile.am *** sjog-0.5.orig/src/Makefile.am Fri Aug 3 16:29:27 2001 --- sjog-0.5/src/Makefile.am Tue May 7 09:21:16 2002 *************** *** 28,35 **** sjog_volume_callbacks.c \ sjog_volume_callbacks.h \ sjog_scroll.c \ ! sjog_scroll.h ! sjog_LDADD = @GTK_LIBS@ @GLIB_LIBS@ @X_LIBS@ MAINTAINERCLEANFILES = Makefile.in Makefile --- 28,36 ---- sjog_volume_callbacks.c \ sjog_volume_callbacks.h \ sjog_scroll.c \ ! sjog_scroll.h \ ! sjog_ext.c ! sjog_LDADD = @GTK_LIBS@ @GLIB_LIBS@ @X_LIBS@ -lXxf86vm -lXext MAINTAINERCLEANFILES = Makefile.in Makefile diff --exclude *~ -rwcN sjog-0.5.orig/src/Makefile.in sjog-0.5/src/Makefile.in *** sjog-0.5.orig/src/Makefile.in Tue Aug 14 04:58:19 2001 --- sjog-0.5/src/Makefile.in Tue May 7 09:21:29 2002 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,6 ---- ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 74,83 **** bin_PROGRAMS = sjog ! sjog_SOURCES = sjog.c sjog.h sjog_config.c sjog_config.h sjog_spic.c sjog_spic.h sjog_sonypi.h sjog_sonypi.c sjog_list.c sjog_list.h sjog_list_callbacks.c sjog_list_callbacks.h sjog_brightness.c sjog_brightness.h sjog_brightness_callbacks.c sjog_brightness_callbacks.h sjog_volume.c sjog_volume.h sjog_volume_callbacks.c sjog_volume_callbacks.h sjog_scroll.c sjog_scroll.h ! sjog_LDADD = @GTK_LIBS@ @GLIB_LIBS@ @X_LIBS@ MAINTAINERCLEANFILES = Makefile.in Makefile mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- 74,83 ---- bin_PROGRAMS = sjog ! sjog_SOURCES = sjog.c sjog.h sjog_config.c sjog_config.h sjog_spic.c sjog_spic.h sjog_sonypi.h sjog_sonypi.c sjog_list.c sjog_list.h sjog_list_callbacks.c sjog_list_callbacks.h sjog_brightness.c sjog_brightness.h sjog_brightness_callbacks.c sjog_brightness_callbacks.h sjog_volume.c sjog_volume.h sjog_volume_callbacks.c sjog_volume_callbacks.h sjog_scroll.c sjog_scroll.h sjog_ext.c ! sjog_LDADD = @GTK_LIBS@ @GLIB_LIBS@ @X_LIBS@ -lXxf86vm -lXext MAINTAINERCLEANFILES = Makefile.in Makefile mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs *************** *** 97,103 **** sjog_OBJECTS = sjog.o sjog_config.o sjog_spic.o sjog_sonypi.o \ sjog_list.o sjog_list_callbacks.o sjog_brightness.o \ sjog_brightness_callbacks.o sjog_volume.o sjog_volume_callbacks.o \ ! sjog_scroll.o sjog_DEPENDENCIES = sjog_LDFLAGS = CFLAGS = @CFLAGS@ --- 97,103 ---- sjog_OBJECTS = sjog.o sjog_config.o sjog_spic.o sjog_sonypi.o \ sjog_list.o sjog_list_callbacks.o sjog_brightness.o \ sjog_brightness_callbacks.o sjog_volume.o sjog_volume_callbacks.o \ ! sjog_scroll.o sjog_ext.o sjog_DEPENDENCIES = sjog_LDFLAGS = CFLAGS = @CFLAGS@ *************** *** 210,239 **** @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - sjog.o: sjog.c sjog.h sjog_config.h sjog_list.h sjog_brightness.h \ - sjog_volume.h sjog_scroll.h sjog_spic.h sjog_sonypi.h - sjog_brightness.o: sjog_brightness.c sjog.h sjog_brightness.h \ - sjog_brightness_callbacks.h - sjog_brightness_callbacks.o: sjog_brightness_callbacks.c sjog.h \ - sjog_brightness.h - sjog_config.o: sjog_config.c sjog.h sjog_config.h sjog_list.h - sjog_list.o: sjog_list.c sjog.h sjog_list.h sjog_list_callbacks.h - sjog_list_callbacks.o: sjog_list_callbacks.c sjog_list_callbacks.h \ - sjog_list.h sjog.h - sjog_scroll.o: sjog_scroll.c sjog_scroll.h sjog.h - sjog_sonypi.o: sjog_sonypi.c sjog_sonypi.h sjog.h - sjog_spic.o: sjog_spic.c sjog_spic.h sjog.h - sjog_volume.o: sjog_volume.c sjog.h sjog_volume.h \ - sjog_volume_callbacks.h - sjog_volume_callbacks.o: sjog_volume_callbacks.c sjog.h sjog_volume.h - info-am: info: info-am dvi-am: --- 210,222 ---- @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done info-am: info: info-am dvi-am: diff --exclude *~ -rwcN sjog-0.5.orig/src/sjog_ext.c sjog-0.5/src/sjog_ext.c *** sjog-0.5.orig/src/sjog_ext.c Thu Jan 1 09:00:00 1970 --- sjog-0.5/src/sjog_ext.c Tue May 7 17:04:39 2002 *************** *** 0 **** --- 1,22 ---- + #include + #include + #include + + #include + + extern Display *disp; /* X11 display sjog is running on */ + + sjog_zoom_handler() + { + Display * d; + int ret; + + d = XOpenDisplay(":0"); + if (!d) { + fprintf(stderr, "zoom: cant open display\n"); + return -1; + } + ret = XF86VidModeSelectNextMode(d, 0); + fprintf(stderr, "zoom: mode=%d\n", ret); + XCloseDisplay(d); + } diff --exclude *~ -rwcN sjog-0.5.orig/src/sjog_scroll.c sjog-0.5/src/sjog_scroll.c *** sjog-0.5.orig/src/sjog_scroll.c Tue Aug 7 00:14:57 2001 --- sjog-0.5/src/sjog_scroll.c Wed May 8 23:37:54 2002 *************** *** 166,168 **** --- 166,186 ---- XTestGrabControl(disp, False); } + + + /* Added for U1 */ + void + sjog_button_fakepress(int no) + { + if (disp == NULL) + sjog_scroll_init(); + + XTestGrabControl(disp, True); + + XTestFakeButtonEvent(disp, no, True, CurrentTime); + XTestFakeButtonEvent(disp, no, False, 30); + + XSync(disp, False); + XTestGrabControl(disp, False); + + } diff --exclude *~ -rwcN sjog-0.5.orig/src/sjog_sonypi.c sjog-0.5/src/sjog_sonypi.c *** sjog-0.5.orig/src/sjog_sonypi.c Mon Aug 6 21:38:14 2001 --- sjog-0.5/src/sjog_sonypi.c Wed May 8 19:32:52 2002 *************** *** 106,111 **** --- 106,129 ---- case SONYPI_EVENT_BLUETOOTH_PRESSED: break; */ + case SONYPI_EVENT_BACK_PRESSED: + sjog_button_fakepress(1); + //fprintf(stderr, "back pressed\n"); + break; + case SONYPI_EVENT_LID_OPENED: + fprintf(stderr, "lid opened\n"); + break; + case SONYPI_EVENT_LID_CLOSED: + fprintf(stderr, "lid close\n"); + break; + case SONYPI_EVENT_FNKEY_THUMBPHRASE: + sjog_button_fakepress(2); + //fprintf(stderr, "thumb pressed\n"); + break; + case SONYPI_EVENT_FNKEY_ZOOM: + sjog_zoom_handler(); + //fprintf(stderr, "zoom pressed\n"); + break; } } diff --exclude *~ -rwcN sjog-0.5.orig/src/sjog_sonypi.h sjog-0.5/src/sjog_sonypi.h *** sjog-0.5.orig/src/sjog_sonypi.h Mon Aug 6 21:38:14 2001 --- sjog-0.5/src/sjog_sonypi.h Tue May 7 00:35:19 2002 *************** *** 35,40 **** --- 35,46 ---- #define SONYPI_EVENT_FNKEY_B 30 #define SONYPI_EVENT_BLUETOOTH_PRESSED 31 + #define SONYPI_EVENT_BACK_PRESSED 35 + #define SONYPI_EVENT_LID_CLOSED 36 + #define SONYPI_EVENT_LID_OPENED 37 + #define SONYPI_EVENT_FNKEY_ZOOM 40 + #define SONYPI_EVENT_FNKEY_THUMBPHRASE 41 + gint sonypi_fd; fd_set sonypi_fdset;